Commit 3efa9a672e4a5f7b2d35cf457ea277e997a0f8c6
1 parent
f6548c0a
Avoid name clashes with symbols that leak from system headers
Signed-off-by: malc <av1474@comtv.ru>
Showing
4 changed files
with
46 additions
and
41 deletions
elf.h
linux-user/elfload.c
| ... | ... | @@ -422,35 +422,35 @@ static inline void init_thread(struct target_pt_regs *regs, struct image_info *i |
| 422 | 422 | /* Feature masks for the Aux Vector Hardware Capabilities (AT_HWCAP). |
| 423 | 423 | See arch/powerpc/include/asm/cputable.h. */ |
| 424 | 424 | enum { |
| 425 | - PPC_FEATURE_32 = 0x80000000, | |
| 426 | - PPC_FEATURE_64 = 0x40000000, | |
| 427 | - PPC_FEATURE_601_INSTR = 0x20000000, | |
| 428 | - PPC_FEATURE_HAS_ALTIVEC = 0x10000000, | |
| 429 | - PPC_FEATURE_HAS_FPU = 0x08000000, | |
| 430 | - PPC_FEATURE_HAS_MMU = 0x04000000, | |
| 431 | - PPC_FEATURE_HAS_4xxMAC = 0x02000000, | |
| 432 | - PPC_FEATURE_UNIFIED_CACHE = 0x01000000, | |
| 433 | - PPC_FEATURE_HAS_SPE = 0x00800000, | |
| 434 | - PPC_FEATURE_HAS_EFP_SINGLE = 0x00400000, | |
| 435 | - PPC_FEATURE_HAS_EFP_DOUBLE = 0x00200000, | |
| 436 | - PPC_FEATURE_NO_TB = 0x00100000, | |
| 437 | - PPC_FEATURE_POWER4 = 0x00080000, | |
| 438 | - PPC_FEATURE_POWER5 = 0x00040000, | |
| 439 | - PPC_FEATURE_POWER5_PLUS = 0x00020000, | |
| 440 | - PPC_FEATURE_CELL = 0x00010000, | |
| 441 | - PPC_FEATURE_BOOKE = 0x00008000, | |
| 442 | - PPC_FEATURE_SMT = 0x00004000, | |
| 443 | - PPC_FEATURE_ICACHE_SNOOP = 0x00002000, | |
| 444 | - PPC_FEATURE_ARCH_2_05 = 0x00001000, | |
| 445 | - PPC_FEATURE_PA6T = 0x00000800, | |
| 446 | - PPC_FEATURE_HAS_DFP = 0x00000400, | |
| 447 | - PPC_FEATURE_POWER6_EXT = 0x00000200, | |
| 448 | - PPC_FEATURE_ARCH_2_06 = 0x00000100, | |
| 449 | - PPC_FEATURE_HAS_VSX = 0x00000080, | |
| 450 | - PPC_FEATURE_PSERIES_PERFMON_COMPAT = 0x00000040, | |
| 451 | - | |
| 452 | - PPC_FEATURE_TRUE_LE = 0x00000002, | |
| 453 | - PPC_FEATURE_PPC_LE = 0x00000001, | |
| 425 | + QEMU_PPC_FEATURE_32 = 0x80000000, | |
| 426 | + QEMU_PPC_FEATURE_64 = 0x40000000, | |
| 427 | + QEMU_PPC_FEATURE_601_INSTR = 0x20000000, | |
| 428 | + QEMU_PPC_FEATURE_HAS_ALTIVEC = 0x10000000, | |
| 429 | + QEMU_PPC_FEATURE_HAS_FPU = 0x08000000, | |
| 430 | + QEMU_PPC_FEATURE_HAS_MMU = 0x04000000, | |
| 431 | + QEMU_PPC_FEATURE_HAS_4xxMAC = 0x02000000, | |
| 432 | + QEMU_PPC_FEATURE_UNIFIED_CACHE = 0x01000000, | |
| 433 | + QEMU_PPC_FEATURE_HAS_SPE = 0x00800000, | |
| 434 | + QEMU_PPC_FEATURE_HAS_EFP_SINGLE = 0x00400000, | |
| 435 | + QEMU_PPC_FEATURE_HAS_EFP_DOUBLE = 0x00200000, | |
| 436 | + QEMU_PPC_FEATURE_NO_TB = 0x00100000, | |
| 437 | + QEMU_PPC_FEATURE_POWER4 = 0x00080000, | |
| 438 | + QEMU_PPC_FEATURE_POWER5 = 0x00040000, | |
| 439 | + QEMU_PPC_FEATURE_POWER5_PLUS = 0x00020000, | |
| 440 | + QEMU_PPC_FEATURE_CELL = 0x00010000, | |
| 441 | + QEMU_PPC_FEATURE_BOOKE = 0x00008000, | |
| 442 | + QEMU_PPC_FEATURE_SMT = 0x00004000, | |
| 443 | + QEMU_PPC_FEATURE_ICACHE_SNOOP = 0x00002000, | |
| 444 | + QEMU_PPC_FEATURE_ARCH_2_05 = 0x00001000, | |
| 445 | + QEMU_PPC_FEATURE_PA6T = 0x00000800, | |
| 446 | + QEMU_PPC_FEATURE_HAS_DFP = 0x00000400, | |
| 447 | + QEMU_PPC_FEATURE_POWER6_EXT = 0x00000200, | |
| 448 | + QEMU_PPC_FEATURE_ARCH_2_06 = 0x00000100, | |
| 449 | + QEMU_PPC_FEATURE_HAS_VSX = 0x00000080, | |
| 450 | + QEMU_PPC_FEATURE_PSERIES_PERFMON_COMPAT = 0x00000040, | |
| 451 | + | |
| 452 | + QEMU_PPC_FEATURE_TRUE_LE = 0x00000002, | |
| 453 | + QEMU_PPC_FEATURE_PPC_LE = 0x00000001, | |
| 454 | 454 | }; |
| 455 | 455 | |
| 456 | 456 | #define ELF_HWCAP get_elf_hwcap() |
| ... | ... | @@ -464,14 +464,14 @@ static uint32_t get_elf_hwcap(void) |
| 464 | 464 | Altivec/FP/SPE support. Anything else is just a bonus. */ |
| 465 | 465 | #define GET_FEATURE(flag, feature) \ |
| 466 | 466 | do {if (e->insns_flags & flag) features |= feature; } while(0) |
| 467 | - GET_FEATURE(PPC_64B, PPC_FEATURE_64); | |
| 468 | - GET_FEATURE(PPC_FLOAT, PPC_FEATURE_HAS_FPU); | |
| 469 | - GET_FEATURE(PPC_ALTIVEC, PPC_FEATURE_HAS_ALTIVEC); | |
| 470 | - GET_FEATURE(PPC_SPE, PPC_FEATURE_HAS_SPE); | |
| 471 | - GET_FEATURE(PPC_SPE_SINGLE, PPC_FEATURE_HAS_EFP_SINGLE); | |
| 472 | - GET_FEATURE(PPC_SPE_DOUBLE, PPC_FEATURE_HAS_EFP_DOUBLE); | |
| 473 | - GET_FEATURE(PPC_BOOKE, PPC_FEATURE_BOOKE); | |
| 474 | - GET_FEATURE(PPC_405_MAC, PPC_FEATURE_HAS_4xxMAC); | |
| 467 | + GET_FEATURE(PPC_64B, QEMU_PPC_FEATURE_64); | |
| 468 | + GET_FEATURE(PPC_FLOAT, QEMU_PPC_FEATURE_HAS_FPU); | |
| 469 | + GET_FEATURE(PPC_ALTIVEC, QEMU_PPC_FEATURE_HAS_ALTIVEC); | |
| 470 | + GET_FEATURE(PPC_SPE, QEMU_PPC_FEATURE_HAS_SPE); | |
| 471 | + GET_FEATURE(PPC_SPE_SINGLE, QEMU_PPC_FEATURE_HAS_EFP_SINGLE); | |
| 472 | + GET_FEATURE(PPC_SPE_DOUBLE, QEMU_PPC_FEATURE_HAS_EFP_DOUBLE); | |
| 473 | + GET_FEATURE(PPC_BOOKE, QEMU_PPC_FEATURE_BOOKE); | |
| 474 | + GET_FEATURE(PPC_405_MAC, QEMU_PPC_FEATURE_HAS_4xxMAC); | |
| 475 | 475 | #undef GET_FEATURE |
| 476 | 476 | |
| 477 | 477 | return features; | ... | ... |
linux-user/signal.c
| ... | ... | @@ -3533,12 +3533,12 @@ struct target_mcontext { |
| 3533 | 3533 | varies depending on whether we're PPC64 or not: PPC64 splits |
| 3534 | 3534 | them apart; PPC32 stuffs them together. */ |
| 3535 | 3535 | #if defined(TARGET_PPC64) |
| 3536 | -#define NVRREG 34 | |
| 3536 | +#define QEMU_NVRREG 34 | |
| 3537 | 3537 | #else |
| 3538 | -#define NVRREG 33 | |
| 3538 | +#define QEMU_NVRREG 33 | |
| 3539 | 3539 | #endif |
| 3540 | - ppc_avr_t altivec[NVRREG]; | |
| 3541 | -#undef NVRREG | |
| 3540 | + ppc_avr_t altivec[QEMU_NVRREG]; | |
| 3541 | +#undef QEMU_NVRREG | |
| 3542 | 3542 | } mc_vregs __attribute__((__aligned__(16))); |
| 3543 | 3543 | }; |
| 3544 | 3544 | ... | ... |