Merge commit 'eb82284f180196f911fd70ebf0cddfbfdf5af3e3' into upstream-merge

* commit 'eb82284f180196f911fd70ebf0cddfbfdf5af3e3': (38 commits)
  simplify brlapi selection
  simplify curses library selection
  Define and use xen libs in a single place
  indent with 2 spaces sdl tests
  remove sdl_static. Just do the right thing if static is yes
  target_softmmu is undefined at that point
  instead of setup sdl_x11 just add -lX11 to sdl_libs
  Calculate sdl_libs and sdl_flags and use them everywhere
  sdl_config value was always sdl-config
  the else part of this test is obsolete We are testing for sdl = yes inside the else part of the test if sdl = yes
  Use CONFIG_POSIX to simplify Makefile
  Add CONFIG_POSIX
  rename WORDS_BIGENDIAN to HOST_WORDS_BIGENDIAN
  rename DEBUG_EXEC to CONFIG_DEBUG_EXEC
  rename DEBUG_TCG to CONFIG_DEBUG_TCG
  rename HAVE_BYTESWAP_H to CONFIG_BYTESWAP_H
  rename HAVE_GPROF to TARGET_GPROF
  rename HAVE_MACHINE_BSWAP_H to CONFIG_MACHINE_BSWAP_H
  rename HAVE_FNMATCH_H to CONFIG_FNMATCH
  rename HAVE_IOVEC to CONFIG_IOVEC
  ...

Conflicts:
	configure

Signed-off-by: Avi Kivity <avi@redhat.com>

3 files changed, 4 insertions, 4 deletions

diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 08200edaf..6a96e9329 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -528,7 +528,7 @@ typedef union {
     uint64_t q;
 } MMXReg;
 
-#ifdef WORDS_BIGENDIAN
+#ifdef HOST_WORDS_BIGENDIAN
 #define XMM_B(n) _b[15 - (n)]
 #define XMM_W(n) _w[7 - (n)]
 #define XMM_L(n) _l[3 - (n)]
diff --git a/target-i386/exec.h b/target-i386/exec.h
index 3e998d24f..c59c4e872 100644
--- a/target-i386/exec.h
+++ b/target-i386/exec.h
@@ -155,7 +155,7 @@ typedef union {
 /* NOTE: arm is horrible as double 32 bit words are stored in big endian ! */
 typedef union {
     double d;
-#if !defined(WORDS_BIGENDIAN) && !defined(__arm__)
+#if !defined(HOST_WORDS_BIGENDIAN) && !defined(__arm__)
     struct {
         uint32_t lower;
         int32_t upper;
diff --git a/target-i386/translate.c b/target-i386/translate.c
index 380009e39..ff9398575 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -255,7 +255,7 @@ static inline void gen_op_andl_A0_ffff(void)
 
 #endif /* !TARGET_X86_64 */
 
-#if defined(WORDS_BIGENDIAN)
+#if defined(HOST_WORDS_BIGENDIAN)
 #define REG_B_OFFSET (sizeof(target_ulong) - 1)
 #define REG_H_OFFSET (sizeof(target_ulong) - 2)
 #define REG_W_OFFSET (sizeof(target_ulong) - 2)
@@ -7151,7 +7151,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
             break;
         case 4: /* smsw */
             gen_svm_check_intercept(s, pc_start, SVM_EXIT_READ_CR0);
-#if defined TARGET_X86_64 && defined WORDS_BIGENDIAN
+#if defined TARGET_X86_64 && defined HOST_WORDS_BIGENDIAN
             tcg_gen_ld32u_tl(cpu_T[0], cpu_env, offsetof(CPUX86State,cr[0]) + 4);
 #else
             tcg_gen_ld32u_tl(cpu_T[0], cpu_env, offsetof(CPUX86State,cr[0]));