diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-02-03 23:22:53 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-02-03 23:22:53 +0000 |
| commit | 9a1d92541ff2e864aab682d66fba7ea2555ef13b (patch) | |
| tree | a5b3b673f66207a42c5f53618a328d934b08d8fc /sysdeps/i386/i686/multiarch/memchr.S | |
| parent | 65dc3b75044cc4847e8c523c22daec12fa51702f (diff) | |
| download | glibc-9a1d92541ff2e864aab682d66fba7ea2555ef13b.tar.gz glibc-9a1d92541ff2e864aab682d66fba7ea2555ef13b.tar.xz glibc-9a1d92541ff2e864aab682d66fba7ea2555ef13b.zip | |
Consistently use macros for x86 PIC thunks.
Diffstat (limited to 'sysdeps/i386/i686/multiarch/memchr.S')
| -rw-r--r-- | sysdeps/i386/i686/multiarch/memchr.S | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sysdeps/i386/i686/multiarch/memchr.S b/sysdeps/i386/i686/multiarch/memchr.S index 163a83e17b..b71b55e7c6 100644 --- a/sysdeps/i386/i686/multiarch/memchr.S +++ b/sysdeps/i386/i686/multiarch/memchr.S @@ -1,5 +1,5 @@ /* Multiple versions of memchr - Copyright (C) 2011 Free Software Foundation, Inc. + Copyright (C) 2011-2012 Free Software Foundation, Inc. Contributed by Intel Corporation. This file is part of the GNU C Library. @@ -22,15 +22,6 @@ #include <init-arch.h> #ifndef NOT_IN_libc - .section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits - .globl __i686.get_pc_thunk.bx - .hidden __i686.get_pc_thunk.bx - .p2align 4 - .type __i686.get_pc_thunk.bx,@function -__i686.get_pc_thunk.bx: - movl (%esp), %ebx - ret - # define CFI_POP(REG) \ cfi_adjust_cfa_offset (-4); \ cfi_restore (REG) @@ -44,8 +35,7 @@ ENTRY(__memchr) .type __memchr, @gnu_indirect_function pushl %ebx CFI_PUSH (%ebx) - call __i686.get_pc_thunk.bx - addl $_GLOBAL_OFFSET_TABLE_, %ebx + LOAD_PIC_REG(bx) cmpl $0, KIND_OFFSET+__cpu_features@GOTOFF(%ebx) jne 1f call __init_cpu_features |