diff options
Diffstat (limited to 'hw/xfree86/loader/elfloader.c')
| -rw-r--r-- | hw/xfree86/loader/elfloader.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/hw/xfree86/loader/elfloader.c b/hw/xfree86/loader/elfloader.c index 0f34a3a36..18b42b080 100644 --- a/hw/xfree86/loader/elfloader.c +++ b/hw/xfree86/loader/elfloader.c @@ -138,7 +138,7 @@ # if !defined(linux) # error No MAP_ANON? # endif -# if !defined (__AMD64__) || !defined(__linux__) +# if !defined (__amd64__) || !defined(__linux__) # define MMAP_FLAGS (MAP_PRIVATE | MAP_ANON) # else # define MMAP_FLAGS (MAP_PRIVATE | MAP_ANON | MAP_32BIT) @@ -156,7 +156,7 @@ #if defined (__alpha__) || \ defined (__ia64__) || \ - defined (__AMD64__) || \ + defined (__amd64__) || \ (defined (__sparc__) && \ (defined (__arch64__) || \ defined (__sparcv9))) @@ -248,7 +248,7 @@ typedef Elf32_Word Elf_Word; defined(__alpha__) || \ defined(__sparc__) || \ defined(__ia64__) || \ - defined(__AMD64__) + defined(__amd64__) typedef Elf_Rela Elf_Rel_t; #else typedef Elf_Rel Elf_Rel_t; @@ -442,7 +442,7 @@ ElfDelayRelocation(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel) defined(__alpha__) || \ defined(__sparc__) || \ defined(__ia64__) || \ - defined(__AMD64__) + defined(__amd64__) ELFDEBUG(", r_addend 0x%lx", rel->r_addend); # endif ELFDEBUG("\n"); @@ -477,7 +477,7 @@ ElfCOMMONSize(void) size += common->sym->st_size; #if defined(__alpha__) || \ defined(__ia64__) || \ - defined(__AMD64__) || \ + defined(__amd64__) || \ (defined(__sparc__) && \ (defined(__arch64__) || \ defined(__sparcv9))) @@ -501,7 +501,7 @@ ElfCreateCOMMON(ELFModulePtr elffile, LOOKUP *pLookup) size += common->sym->st_size; #if defined(__alpha__) || \ defined(__ia64__) || \ - defined(__AMD64__) || \ + defined(__amd64__) || \ (defined(__sparc__) && \ (defined(__arch64__) || \ defined(__sparcv9))) @@ -556,7 +556,7 @@ ElfCreateCOMMON(ELFModulePtr elffile, LOOKUP *pLookup) offset += common->sym->st_size; #if defined(__alpha__) || \ defined(__ia64__) || \ - defined(__AMD64__) || \ + defined(__amd64__) || \ (defined(__sparc__) && \ (defined(__arch64__) || \ defined(__sparcv9))) @@ -1217,7 +1217,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel, unsigned long *dest64; unsigned short *dest16; #endif -#if defined(__AMD64__) +#if defined(__amd64__) unsigned long *dest64; int *dest32s; #endif @@ -1235,7 +1235,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel, defined(__alpha__) || \ defined(__sparc__) || \ defined(__ia64__) || \ - defined(__AMD64__) + defined(__amd64__) ELFDEBUG("%lx", rel->r_addend); # endif ELFDEBUG("\n"); @@ -1294,7 +1294,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel, break; #endif /* i386 */ -#if defined(__AMD64__) +#if defined(__amd64__) case R_X86_64_32: dest32 = (unsigned int *)(secp + rel->r_offset); # ifdef ELFDEBUG @@ -1351,7 +1351,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel, ELFDEBUG("*dest64=%8.8lx\n", *dest64); # endif break; -#endif /* __AMD64__ */ +#endif /* __amd64__ */ #if defined(__alpha__) case R_ALPHA_NONE: case R_ALPHA_LITUSE: |