Merge branch 'upstream' into maemo-test

Conflicts:

	linux-user/syscall.c
	target-arm/helper.c

diff --cc Makefile
Simple merge

diff --cc Makefile.target
Simple merge

diff --cc configure
index 4ad3af4,819817a..6b81b52
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1139,60 -1156,63 +1187,65 @@@ 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 "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
+     echo "    SASL CFLAGS    $vnc_sasl_cflags"
+     echo "    SASL LIBS      $vnc_sasl_libs"
+ fi
  if test -n "$sparc_cpu"; then
 -    echo "Target Sparc Arch $sparc_cpu"
 +    echo "Target Sparc Arch  $sparc_cpu"
  fi
 -echo "kqemu support     $kqemu"
 -echo "brlapi support    $brlapi"
 -echo "Documentation     $build_docs"
 +echo "kqemu support      $kqemu"
 +echo "brlapi support     $brlapi"
 +echo "Documentation      $build_docs"
  [ ! -z "$uname_release" ] && \
 -echo "uname -r          $uname_release"
 -echo "NPTL support      $nptl"
 -echo "vde support       $vde"
 -echo "AIO support       $aio"
 -echo "Install blobs     $blobs"
 -echo "KVM support       $kvm"
 -echo "fdt support       $fdt"
 +echo "uname -r           $uname_release"
 +echo "NPTL support       $nptl"
 +echo "vde support        $vde"
 +echo "AIO support        $aio"
 +echo "Install blobs      $blobs"
 +echo "KVM support        $kvm"
 +echo "fdt support        $fdt"
 +echo "GUEST_BASE support $guest_base"
  
  if test $sdl_too_old = "yes"; then
  echo "-> Your SDL version is too old - please upgrade to have SDL support"

diff --cc cpu-all.h
Simple merge

diff --cc hw/omap_clk.c
Simple merge

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

diff --cc linux-user/qemu.h
Simple merge

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

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

diff --cc target-arm/cpu.h
Simple merge

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