summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-07-29 10:48:07 +0300
committerAvi Kivity <avi@redhat.com>2009-07-29 10:48:07 +0300
commit1e3fecb259b740c40ece94c6b458e712d513f6be (patch)
tree4bb77aa3bde1669adb05336cf50010800314020f /cpu-all.h
parentMerge commit 'dfe5fff3eaab1285cd1565fa0a33e5acd13b279c' into upstream-merge (diff)
parentsimplify brlapi selection (diff)
downloadqemu-kvm-1e3fecb259b740c40ece94c6b458e712d513f6be.tar.gz
qemu-kvm-1e3fecb259b740c40ece94c6b458e712d513f6be.tar.bz2
qemu-kvm-1e3fecb259b740c40ece94c6b458e712d513f6be.zip
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>
Diffstat (limited to 'cpu-all.h')
-rw-r--r--cpu-all.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/cpu-all.h b/cpu-all.h
index d8891f835..5c6c0512e 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -27,7 +27,7 @@
* WORDS_ALIGNED : if defined, the host cpu can only make word aligned
* memory accesses.
*
- * WORDS_BIGENDIAN : if defined, the host cpu is big endian and
+ * HOST_WORDS_BIGENDIAN : if defined, the host cpu is big endian and
* otherwise little endian.
*
* (TARGET_WORDS_ALIGNED : same for target cpu (not supported yet))
@@ -37,7 +37,7 @@
#include "softfloat.h"
-#if defined(WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)
+#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)
#define BSWAP_NEEDED
#endif
@@ -123,7 +123,7 @@ typedef union {
endian ! */
typedef union {
float64 d;
-#if defined(WORDS_BIGENDIAN) \
+#if defined(HOST_WORDS_BIGENDIAN) \
|| (defined(__arm__) && !defined(__VFP_FP__) && !defined(CONFIG_SOFTFLOAT))
struct {
uint32_t upper;
@@ -141,7 +141,7 @@ typedef union {
#ifdef TARGET_SPARC
typedef union {
float128 q;
-#if defined(WORDS_BIGENDIAN) \
+#if defined(HOST_WORDS_BIGENDIAN) \
|| (defined(__arm__) && !defined(__VFP_FP__) && !defined(CONFIG_SOFTFLOAT))
struct {
uint32_t upmost;
@@ -221,7 +221,7 @@ static inline void stb_p(void *ptr, int v)
/* NOTE: on arm, putting 2 in /proc/sys/debug/alignment so that the
kernel handles unaligned load/stores may give better results, but
it is a system wide setting : bad */
-#if defined(WORDS_BIGENDIAN) || defined(WORDS_ALIGNED)
+#if defined(HOST_WORDS_BIGENDIAN) || defined(WORDS_ALIGNED)
/* conservative code for little endian unaligned accesses */
static inline int lduw_le_p(const void *ptr)
@@ -398,7 +398,7 @@ static inline void stfq_le_p(void *ptr, float64 v)
}
#endif
-#if !defined(WORDS_BIGENDIAN) || defined(WORDS_ALIGNED)
+#if !defined(HOST_WORDS_BIGENDIAN) || defined(WORDS_ALIGNED)
static inline int lduw_be_p(const void *ptr)
{