Merge commit 'origin/upstream' into test

Conflicts:
	configure
	linux-user/main.c

diff --cc Makefile
Simple merge

diff --cc Makefile.target
Simple merge

diff --cc block.c
Simple merge

diff --cc block.h
Simple merge

diff --cc configure
index 63e7ad9,15b7856..be6b45a
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1181,44 -1163,44 +1194,45 @@@ els
    binsuffix="/bin"
  fi
  
 -echo "Install prefix    $prefix"
 -echo "BIOS directory    $prefix$datasuffix"
 -echo "binary directory  $prefix$binsuffix"
 +echo "Install prefix     $prefix"
 +echo "BIOS directory     $prefix$datasuffix"
 +echo "binary directory   $prefix$binsuffix"
  if test "$mingw32" = "no" ; then
- echo "Manual directory   $prefix$mansuffix"
- echo "ELF interp prefix  $interp_prefix"
- fi
- echo "Source path        $source_path"
- echo "C compiler         $cc"
- echo "Host C compiler    $host_cc"
- echo "ARCH_CFLAGS        $ARCH_CFLAGS"
- echo "make               $make"
- echo "install            $install"
- echo "host CPU           $cpu"
- echo "host big endian    $bigendian"
- echo "target list        $target_list"
- echo "gprof enabled      $gprof"
- echo "sparse enabled     $sparse"
- echo "profiler           $profiler"
- echo "static build       $static"
- echo "-Werror enabled    $werror"
+ echo "Manual directory  $prefix$mansuffix"
+ echo "ELF interp prefix $interp_prefix"
+ fi
+ echo "Source path       $source_path"
+ echo "C compiler        $cc"
+ echo "Host C compiler   $host_cc"
+ echo "ARCH_CFLAGS       $ARCH_CFLAGS"
+ echo "make              $make"
+ echo "install           $install"
+ echo "host CPU          $cpu"
+ echo "host big endian   $bigendian"
+ echo "target list       $target_list"
+ echo "gprof enabled     $gprof"
+ echo "sparse enabled    $sparse"
+ echo "strip binaries    $strip_opt"
+ echo "profiler          $profiler"
+ echo "static build      $static"
+ echo "-Werror enabled   $werror"
  if test "$darwin" = "yes" ; then
 -    echo "Cocoa support     $cocoa"
 +    echo "Cocoa support      $cocoa"
  fi
 -echo "SDL support       $sdl"
 +echo "SDL support        $sdl"
  if test "$sdl" != "no" ; then
 -    echo "SDL static link   $sdl_static"
 -fi
 -echo "curses support    $curses"
 -echo "mingw32 support   $mingw32"
 -echo "Audio drivers     $audio_drv_list"
 -echo "Extra audio cards $audio_card_list"
 -echo "Mixer emulation   $mixemu"
 -echo "VNC TLS support   $vnc_tls"
 +    echo "SDL static link    $sdl_static"
 +fi
 +echo "curses support     $curses"
 +echo "atfile support     $atfile"
 +echo "mingw32 support    $mingw32"
 +echo "Audio drivers      $audio_drv_list"
 +echo "Extra audio cards  $audio_card_list"
 +echo "Mixer emulation    $mixemu"
 +echo "VNC TLS support    $vnc_tls"
  if test "$vnc_tls" = "yes" ; then
 -    echo "    TLS CFLAGS    $vnc_tls_cflags"
 -    echo "    TLS LIBS      $vnc_tls_libs"
 +    echo "    TLS CFLAGS     $vnc_tls_cflags"
 +    echo "    TLS LIBS       $vnc_tls_libs"
  fi
  echo "VNC SASL support  $vnc_sasl"
  if test "$vnc_sasl" = "yes" ; then

diff --cc exec.c
Simple merge

diff --cc linux-user/main.c
index d637395,3b9dfc7..fc33b85
--- 1/linux-user/main.c
--- 2/linux-user/main.c
+++ b/linux-user/main.c
@@@ -38,13 -37,10 +38,15 @@@
  
  #define DEBUG_LOGFILE "/tmp/qemu.log"
  
 -char *exec_path;
 +const char *exec_path;
 +
 +#if defined(CONFIG_USE_GUEST_BASE)
 +unsigned long mmap_min_addr = 0;
 +unsigned long guest_base = 0;
 +#endif
  
+ int singlestep;
+ 
  static const char *interp_prefix = CONFIG_QEMU_PREFIX;
  const char *qemu_uname_release = CONFIG_UNAME_RELEASE;
  
@@@ -2412,14 -2360,10 +2415,16 @@@ 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")) {
              do_strace = 1;
          } else

diff --cc target-arm/translate.c
Simple merge

diff --cc tcg/x86_64/tcg-target.c
Simple merge