From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 5 Aug 2013 13:06:25 +0000 (-0500)
Subject: Merge remote-tracking branch 'filippov/tags/20130729-xtensa' into staging
X-Git-Tag: v1.6.0-rc2~22
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=64160cd2a3e9a8491ce44aaa9df25cfad48b8666;hp=-c;p=qemu.git

Merge remote-tracking branch 'filippov/tags/20130729-xtensa' into staging

xtensa queue 2013-07-29

* filippov/tags/20130729-xtensa:
  target-xtensa: check register window inline
  target-xtensa: don't generate dead code to access invalid SRs
  tests/tcg/xtensa: Fix out-of-tree build
  target-xtensa: avoid double-stopping at breakpoints
  target-xtensa: add fallthrough markers
  target-xtensa: add extui unit test

Conflicts:
	configure

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

64160cd2a3e9a8491ce44aaa9df25cfad48b8666
diff --combined configure
index 293f1677e,c2059041a..18fa60824
--- a/configure
+++ b/configure
@@@ -231,7 -231,7 +231,7 @@@ libusb="
  usb_redir=""
  glx=""
  zlib="yes"
 -guest_agent="yes"
 +guest_agent=""
  want_tools="yes"
  libiscsi=""
  coroutine=""
@@@ -3444,15 -3444,10 +3444,15 @@@ if test "$softmmu" = yes ; the
        virtfs=no
      fi
    fi
 +fi
 +if [ "$guest_agent" != "no" ]; then
    if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
 -    if [ "$guest_agent" = "yes" ]; then
        tools="qemu-ga\$(EXESUF) $tools"
 -    fi
 +      guest_agent=yes
 +  elif [ "$guest_agent" != yes ]; then
 +      guest_agent=no
 +  else
 +      error_exit "Guest agent is not supported on this platform"
    fi
  fi
  
@@@ -4507,13 -4502,14 +4507,13 @@@ if [ "$dtc_internal" = "yes" ]; the
  fi
  
  # build tree in object directory in case the source is not in the current directory
- DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/qapi-schema"
 -DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/tcg/xtensa"
 -DIRS="$DIRS tests/libqos"
++DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/qapi-schema tests/tcg/xtensa"
  DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw"
  DIRS="$DIRS roms/seabios roms/vgabios"
  DIRS="$DIRS qapi-generated"
  FILES="Makefile tests/tcg/Makefile qdict-test-data.txt"
  FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit"
- FILES="$FILES tests/tcg/lm32/Makefile po/Makefile"
+ FILES="$FILES tests/tcg/lm32/Makefile tests/tcg/xtensa/Makefile po/Makefile"
  FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
  FILES="$FILES pc-bios/spapr-rtas/Makefile"
  FILES="$FILES pc-bios/s390-ccw/Makefile"