From 11de3a3371c18b6fe955d4b43071656baf4b8804 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 14 May 2012 15:17:30 -0700 Subject: [PATCH] Update elf_machine_load_address for x32 --- ChangeLog | 5 +++++ sysdeps/x86_64/dl-machine.h | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6fbcc32..7c487bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2012-05-14 H.J. Lu + * sysdeps/x86_64/dl-machine.h (elf_machine_load_address): Remove + the `q' suffix from lea and replace .quad with ASM_ADDR. + +2012-05-14 H.J. Lu + * sysdeps/unix/sysv/linux/x86_64/sysdep.h (PTR_MANGLE): Remove the `q' suffix from xor/rol instructions. Use $2*LP_SIZE+1 instead of $17. diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h index 32814b1..9c27ecf 100644 --- a/sysdeps/x86_64/dl-machine.h +++ b/sysdeps/x86_64/dl-machine.h @@ -72,10 +72,10 @@ elf_machine_load_address (void) load offset which is zero if the binary was loaded at the address it is prelinked for. */ - asm ("leaq _dl_start(%%rip), %0\n\t" - "subq 1f(%%rip), %0\n\t" + asm ("lea _dl_start(%%rip), %0\n\t" + "sub 1f(%%rip), %0\n\t" ".section\t.data.rel.ro\n" - "1:\t.quad _dl_start\n\t" + "1:\t" ASM_ADDR " _dl_start\n\t" ".previous\n\t" : "=r" (addr) : : "cc"); -- 2.7.4