Merge branch 'linux-user-for-upstream' into master-merge2

Conflicts:

	linux-user/main.c

diff --cc exec.c
Simple merge

diff --cc linux-user/main.c
index 97828b1,2885b29..380049f
--- 1/linux-user/main.c
--- 2/linux-user/main.c
+++ b/linux-user/main.c
@@@ -2372,10 -2407,12 +2411,14 @@@ int main(int argc, char **argv, char **
  #endif
                  exit(1);
              }
+ #if defined(CONFIG_USE_GUEST_BASE)
+         } else if (!strcmp(r, "B")) {
+            guest_base = strtol(argv[optind++], NULL, 0);
+ #endif
          } else if (!strcmp(r, "drop-ld-preload")) {
 -            (void) envlist_unsetenv(envlist, "LD_PRELOAD");
 +            drop_ld_preload = 1;
 +        } else if (!strcmp(r, "keep-ld-preload")) {
 +            drop_ld_preload = 0;
          } else if (!strcmp(r, "singlestep")) {
              singlestep = 1;
          } else if (!strcmp(r, "strace")) {
@@@ -2479,7 -2541,16 +2554,16 @@@
      }
      target_argv[target_argc] = NULL;
  
-     if (loader_exec(filename, target_argv+argskip, target_environ, regs, info) != 0) {
+     memset(ts, 0, sizeof(TaskState));
+     init_task_state(ts);
+     /* build Task State */
+     ts->info = info;
+     ts->bprm = &bprm;
+     env->opaque = ts;
+     task_settid(ts);
+ 
 -    if (loader_exec(filename, target_argv, target_environ, regs,
++    if (loader_exec(filename, target_argv+argskip, target_environ, regs,
+         info, &bprm) != 0) {
          printf("Error loading %s\n", filename);
          _exit(1);
      }

diff --cc linux-user/syscall.c
Simple merge