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-Url: http://git.maquefel.me/?a=commitdiff_plain;h=64160cd2a3e9a8491ce44aaa9df25cfad48b8666;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 --cc configure
index 293f1677e6,c2059041af..18fa60824b
--- a/configure
+++ b/configure
@@@ -4507,7 -4502,8 +4507,7 @@@ 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"