aboutsummaryrefslogtreecommitdiff
path: root/linux-user/elfload.c
diff options
context:
space:
mode:
authormalc <av1474@comtv.ru>2009-07-18 13:10:12 +0400
committermalc <av1474@comtv.ru>2009-07-18 13:16:51 +0400
commit3efa9a672e4a5f7b2d35cf457ea277e997a0f8c6 (patch)
treed3fa4c50d285d96efaa3bf37d081d8d159f5f3bb /linux-user/elfload.c
parentf6548c0a4b751852b9dcb341e3974e049a45a518 (diff)
Avoid name clashes with symbols that leak from system headers
Signed-off-by: malc <av1474@comtv.ru>
Diffstat (limited to 'linux-user/elfload.c')
-rw-r--r--linux-user/elfload.c74
1 files changed, 37 insertions, 37 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 565404c6ef..12d259834f 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -422,35 +422,35 @@ static inline void init_thread(struct target_pt_regs *regs, struct image_info *i
/* Feature masks for the Aux Vector Hardware Capabilities (AT_HWCAP).
See arch/powerpc/include/asm/cputable.h. */
enum {
- PPC_FEATURE_32 = 0x80000000,
- PPC_FEATURE_64 = 0x40000000,
- PPC_FEATURE_601_INSTR = 0x20000000,
- PPC_FEATURE_HAS_ALTIVEC = 0x10000000,
- PPC_FEATURE_HAS_FPU = 0x08000000,
- PPC_FEATURE_HAS_MMU = 0x04000000,
- PPC_FEATURE_HAS_4xxMAC = 0x02000000,
- PPC_FEATURE_UNIFIED_CACHE = 0x01000000,
- PPC_FEATURE_HAS_SPE = 0x00800000,
- PPC_FEATURE_HAS_EFP_SINGLE = 0x00400000,
- PPC_FEATURE_HAS_EFP_DOUBLE = 0x00200000,
- PPC_FEATURE_NO_TB = 0x00100000,
- PPC_FEATURE_POWER4 = 0x00080000,
- PPC_FEATURE_POWER5 = 0x00040000,
- PPC_FEATURE_POWER5_PLUS = 0x00020000,
- PPC_FEATURE_CELL = 0x00010000,
- PPC_FEATURE_BOOKE = 0x00008000,
- PPC_FEATURE_SMT = 0x00004000,
- PPC_FEATURE_ICACHE_SNOOP = 0x00002000,
- PPC_FEATURE_ARCH_2_05 = 0x00001000,
- PPC_FEATURE_PA6T = 0x00000800,
- PPC_FEATURE_HAS_DFP = 0x00000400,
- PPC_FEATURE_POWER6_EXT = 0x00000200,
- PPC_FEATURE_ARCH_2_06 = 0x00000100,
- PPC_FEATURE_HAS_VSX = 0x00000080,
- PPC_FEATURE_PSERIES_PERFMON_COMPAT = 0x00000040,
-
- PPC_FEATURE_TRUE_LE = 0x00000002,
- PPC_FEATURE_PPC_LE = 0x00000001,
+ QEMU_PPC_FEATURE_32 = 0x80000000,
+ QEMU_PPC_FEATURE_64 = 0x40000000,
+ QEMU_PPC_FEATURE_601_INSTR = 0x20000000,
+ QEMU_PPC_FEATURE_HAS_ALTIVEC = 0x10000000,
+ QEMU_PPC_FEATURE_HAS_FPU = 0x08000000,
+ QEMU_PPC_FEATURE_HAS_MMU = 0x04000000,
+ QEMU_PPC_FEATURE_HAS_4xxMAC = 0x02000000,
+ QEMU_PPC_FEATURE_UNIFIED_CACHE = 0x01000000,
+ QEMU_PPC_FEATURE_HAS_SPE = 0x00800000,
+ QEMU_PPC_FEATURE_HAS_EFP_SINGLE = 0x00400000,
+ QEMU_PPC_FEATURE_HAS_EFP_DOUBLE = 0x00200000,
+ QEMU_PPC_FEATURE_NO_TB = 0x00100000,
+ QEMU_PPC_FEATURE_POWER4 = 0x00080000,
+ QEMU_PPC_FEATURE_POWER5 = 0x00040000,
+ QEMU_PPC_FEATURE_POWER5_PLUS = 0x00020000,
+ QEMU_PPC_FEATURE_CELL = 0x00010000,
+ QEMU_PPC_FEATURE_BOOKE = 0x00008000,
+ QEMU_PPC_FEATURE_SMT = 0x00004000,
+ QEMU_PPC_FEATURE_ICACHE_SNOOP = 0x00002000,
+ QEMU_PPC_FEATURE_ARCH_2_05 = 0x00001000,
+ QEMU_PPC_FEATURE_PA6T = 0x00000800,
+ QEMU_PPC_FEATURE_HAS_DFP = 0x00000400,
+ QEMU_PPC_FEATURE_POWER6_EXT = 0x00000200,
+ QEMU_PPC_FEATURE_ARCH_2_06 = 0x00000100,
+ QEMU_PPC_FEATURE_HAS_VSX = 0x00000080,
+ QEMU_PPC_FEATURE_PSERIES_PERFMON_COMPAT = 0x00000040,
+
+ QEMU_PPC_FEATURE_TRUE_LE = 0x00000002,
+ QEMU_PPC_FEATURE_PPC_LE = 0x00000001,
};
#define ELF_HWCAP get_elf_hwcap()
@@ -464,14 +464,14 @@ static uint32_t get_elf_hwcap(void)
Altivec/FP/SPE support. Anything else is just a bonus. */
#define GET_FEATURE(flag, feature) \
do {if (e->insns_flags & flag) features |= feature; } while(0)
- GET_FEATURE(PPC_64B, PPC_FEATURE_64);
- GET_FEATURE(PPC_FLOAT, PPC_FEATURE_HAS_FPU);
- GET_FEATURE(PPC_ALTIVEC, PPC_FEATURE_HAS_ALTIVEC);
- GET_FEATURE(PPC_SPE, PPC_FEATURE_HAS_SPE);
- GET_FEATURE(PPC_SPE_SINGLE, PPC_FEATURE_HAS_EFP_SINGLE);
- GET_FEATURE(PPC_SPE_DOUBLE, PPC_FEATURE_HAS_EFP_DOUBLE);
- GET_FEATURE(PPC_BOOKE, PPC_FEATURE_BOOKE);
- GET_FEATURE(PPC_405_MAC, PPC_FEATURE_HAS_4xxMAC);
+ GET_FEATURE(PPC_64B, QEMU_PPC_FEATURE_64);
+ GET_FEATURE(PPC_FLOAT, QEMU_PPC_FEATURE_HAS_FPU);
+ GET_FEATURE(PPC_ALTIVEC, QEMU_PPC_FEATURE_HAS_ALTIVEC);
+ GET_FEATURE(PPC_SPE, QEMU_PPC_FEATURE_HAS_SPE);
+ GET_FEATURE(PPC_SPE_SINGLE, QEMU_PPC_FEATURE_HAS_EFP_SINGLE);
+ GET_FEATURE(PPC_SPE_DOUBLE, QEMU_PPC_FEATURE_HAS_EFP_DOUBLE);
+ GET_FEATURE(PPC_BOOKE, QEMU_PPC_FEATURE_BOOKE);
+ GET_FEATURE(PPC_405_MAC, QEMU_PPC_FEATURE_HAS_4xxMAC);
#undef GET_FEATURE
return features;