| OLD | NEW |
| 1 #define LDSO_ARCH "x32" | 1 #define LDSO_ARCH "x32" |
| 2 | 2 |
| 3 /* FIXME: x32 is very strange in its use of 64-bit relocation types in | 3 /* FIXME: x32 is very strange in its use of 64-bit relocation types in |
| 4 * a 32-bit environment. As long as the memory at reloc_addr is | 4 * a 32-bit environment. As long as the memory at reloc_addr is |
| 5 * zero-filled prior to relocations, just treating 64-bit relocations | 5 * zero-filled prior to relocations, just treating 64-bit relocations |
| 6 * as operating on 32-bit slots should be fine, but this should be | 6 * as operating on 32-bit slots should be fine, but this should be |
| 7 * checked. In particular, R_X86_64_64, R_X86_64_DTPOFF64, and | 7 * checked. In particular, R_X86_64_64, R_X86_64_DTPOFF64, and |
| 8 * R_X86_64_TPOFF64 may need checking. */ | 8 * R_X86_64_TPOFF64 may need checking. */ |
| 9 | 9 |
| 10 /* The R_X86_64_64, R_X86_64_DTPOFF32, and R_X86_64_TPOFF32 reloc types | 10 /* The R_X86_64_64, R_X86_64_DTPOFF32, and R_X86_64_TPOFF32 reloc types |
| 11 * were previously mapped in the switch table form of this file; however, | 11 * were previously mapped in the switch table form of this file; however, |
| 12 * they do not seem to be used/usable for anything. If needed, new | 12 * they do not seem to be used/usable for anything. If needed, new |
| 13 * mappings will have to be added. */ | 13 * mappings will have to be added. */ |
| 14 | 14 |
| 15 #define REL_SYMBOLIC R_X86_64_32 | 15 #define REL_SYMBOLIC R_X86_64_32 |
| 16 #define REL_OFFSET R_X86_64_PC32 | 16 #define REL_OFFSET R_X86_64_PC32 |
| 17 #define REL_GOT R_X86_64_GLOB_DAT | 17 #define REL_GOT R_X86_64_GLOB_DAT |
| 18 #define REL_PLT R_X86_64_JUMP_SLOT | 18 #define REL_PLT R_X86_64_JUMP_SLOT |
| 19 #define REL_RELATIVE R_X86_64_RELATIVE | 19 #define REL_RELATIVE R_X86_64_RELATIVE |
| 20 #define REL_COPY R_X86_64_COPY | 20 #define REL_COPY R_X86_64_COPY |
| 21 #define REL_DTPMOD R_X86_64_DTPMOD64 | 21 #define REL_DTPMOD R_X86_64_DTPMOD64 |
| 22 #define REL_DTPOFF R_X86_64_DTPOFF64 | 22 #define REL_DTPOFF R_X86_64_DTPOFF64 |
| 23 #define REL_TPOFF R_X86_64_TPOFF64 | 23 #define REL_TPOFF R_X86_64_TPOFF64 |
| 24 | 24 |
| 25 #define CRTJMP(pc,sp) __asm__ __volatile__( \ | 25 #define CRTJMP(pc, sp) \ |
| 26 » "mov %1,%%esp ; jmp *%0" : : "r"((uint64_t)(uintptr_t)pc), "r"(sp) : "me
mory" ) | 26 __asm__ __volatile__("mov %1,%%esp ; jmp *%0" \ |
| 27 : \ |
| 28 : "r"((uint64_t)(uintptr_t)pc), "r"(sp) \ |
| 29 : "memory") |
| 27 | 30 |
| 28 #define GETFUNCSYM(fp, sym, got) __asm__ ( \ | 31 #define GETFUNCSYM(fp, sym, got) \ |
| 29 » ".hidden " #sym "\n" \ | 32 __asm__(".hidden " #sym \ |
| 30 » "» lea " #sym "(%%rip),%0\n" \ | 33 "\n" \ |
| 31 » : "=r"(*fp) : : "memory" ) | 34 "» lea " #sym "(%%rip),%0\n" \ |
| 35 : "=r"(*fp) \ |
| 36 : \ |
| 37 : "memory") |
| OLD | NEW |