diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-02-05 14:34:14 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-02-05 14:34:14 +0000 |
| commit | d8e0ca509a83e832123f6ab508fce620159fb2dc (patch) | |
| tree | ec8f395a1d980e9fde309174980190102f139121 | |
| parent | b1da7dd99dcffe28d02a6515a9dc8cca3205a497 (diff) | |
| download | glibc-d8e0ca509a83e832123f6ab508fce620159fb2dc.tar.gz glibc-d8e0ca509a83e832123f6ab508fce620159fb2dc.tar.xz glibc-d8e0ca509a83e832123f6ab508fce620159fb2dc.zip | |
Use macro for PIC setup in inline asm.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sysdeps/i386/sysdep.h | 20 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/sysdep.h | 11 |
3 files changed, 28 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index 22d6682dbd..1925407e9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-02-05 Joseph Myers <joseph@codesourcery.com> + + * sysdeps/i386/sysdep.h (SETUP_PIC_REG_STR, LOAD_PIC_REG_STR): + Define. + * sysdeps/unix/sysv/linux/i386/sysdep.h (check_consistency): Use + LOAD_PIC_REG_STR. + 2012-02-03 Joseph Myers <joseph@codesourcery.com> * sysdeps/i386/sysdep.h (GET_PC_THUNK, GET_PC_THUNK_STR): Define. diff --git a/sysdeps/i386/sysdep.h b/sysdeps/i386/sysdep.h index a31f5e7726..2c0aafa75b 100644 --- a/sysdeps/i386/sysdep.h +++ b/sysdeps/i386/sysdep.h @@ -156,4 +156,24 @@ GET_PC_THUNK(reg): \ #define atom_text_section .section ".text.atom", "ax" +#else /* __ASSEMBLER__ */ + +# define SETUP_PIC_REG_STR(reg) \ + ".ifndef " GET_PC_THUNK_STR (reg) "\n" \ + ".section .gnu.linkonce.t." GET_PC_THUNK_STR (reg) ",\"ax\",@progbits\n" \ + ".globl " GET_PC_THUNK_STR (reg) "\n" \ + ".hidden " GET_PC_THUNK_STR (reg) "\n" \ + ".p2align 4\n" \ + ".type " GET_PC_THUNK_STR (reg) ",@function\n" \ +GET_PC_THUNK_STR (reg) ":" \ + "movl (%%esp), %%e" #reg "\n" \ + "ret\n" \ + ".size " GET_PC_THUNK_STR (reg) ", . - " GET_PC_THUNK_STR (reg) "\n" \ + ".previous\n" \ + ".endif\n" \ + "call " GET_PC_THUNK_STR (reg) + +# define LOAD_PIC_REG_STR(reg) \ + SETUP_PIC_REG_STR (reg) "\naddl $_GLOBAL_OFFSET_TABLE_, %%e" #reg + #endif /* __ASSEMBLER__ */ diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h index 90660fdde7..1dded7a7eb 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep.h +++ b/sysdeps/unix/sysv/linux/i386/sysdep.h @@ -514,20 +514,11 @@ asm (".L__X'%ebx = 1\n\t" # define check_consistency() \ ({ int __res; \ __asm__ __volatile__ \ - ("call "GET_PC_THUNK_STR(cx)";" \ - "addl $_GLOBAL_OFFSET_TABLE_, %%ecx;" \ + (LOAD_PIC_REG_STR (cx) ";" \ "subl %%ebx, %%ecx;" \ "je 1f;" \ "ud2;" \ "1:\n" \ - ".section .gnu.linkonce.t."GET_PC_THUNK_STR(cx)",\"ax\",@progbits;" \ - ".globl "GET_PC_THUNK_STR(cx)";" \ - ".hidden "GET_PC_THUNK_STR(cx)";" \ - ".type "GET_PC_THUNK_STR(cx)",@function;" \ - GET_PC_THUNK_STR(cx)":" \ - "movl (%%esp), %%ecx;" \ - "ret;" \ - ".previous" \ : "=c" (__res)); \ __res; }) #endif |