diff options
| -rw-r--r-- | elf.h | 2 | ||||
| -rw-r--r-- | linux-user/elfload.c | 74 | ||||
| -rw-r--r-- | linux-user/signal.c | 8 | ||||
| -rw-r--r-- | loader.c | 3 |
4 files changed, 46 insertions, 41 deletions
@@ -454,7 +454,9 @@ typedef struct { #define R_PPC_SECTOFF_HI 35 #define R_PPC_SECTOFF_HA 36 /* Keep this the last entry. */ +#ifndef R_PPC_NUM #define R_PPC_NUM 37 +#endif /* ARM specific declarations */ 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; diff --git a/linux-user/signal.c b/linux-user/signal.c index 93c2ebe1ea..c8150ee082 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -3533,12 +3533,12 @@ struct target_mcontext { varies depending on whether we're PPC64 or not: PPC64 splits them apart; PPC32 stuffs them together. */ #if defined(TARGET_PPC64) -#define NVRREG 34 +#define QEMU_NVRREG 34 #else -#define NVRREG 33 +#define QEMU_NVRREG 33 #endif - ppc_avr_t altivec[NVRREG]; -#undef NVRREG + ppc_avr_t altivec[QEMU_NVRREG]; +#undef QEMU_NVRREG } mc_vregs __attribute__((__aligned__(16))); }; @@ -272,6 +272,9 @@ static void *load_at(int fd, int offset, int size) return ptr; } +#ifdef ELF_CLASS +#undef ELF_CLASS +#endif #define ELF_CLASS ELFCLASS32 #include "elf.h" |