]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'filippov/tags/20130729-xtensa' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 5 Aug 2013 13:06:25 +0000 (08:06 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 5 Aug 2013 13:06:25 +0000 (08:06 -0500)
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>
1  2 
configure

diff --cc configure
index 293f1677e6f38250373e06f421a5c6be83acf2af,c2059041afb3b48ffaca09e6909e7aa46388296b..18fa60824bef5ea7c86a3b1981c31fd60ad91b2f
+++ 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"