Consistently use macros for x86 PIC thunks.

[glibc.git] / sysdeps / i386 / i686 / multiarch / wcsrchr.S

diff --git a/sysdeps/i386/i686/multiarch/wcsrchr.S b/sysdeps/i386/i686/multiarch/wcsrchr.S
index 8240063dd6a63b50478fb8262043f67aea1f7b9c..7fb9885143d31e10645bacc298881a7e17c7a3a0 100644 (file)
--- a/sysdeps/i386/i686/multiarch/wcsrchr.S
+++ b/sysdeps/i386/i686/multiarch/wcsrchr.S
@@ -1,5 +1,5 @@
 /* Multiple versions of wcsrchr
-   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,23 +22,13 @@
 #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
-
        .text
 ENTRY(wcsrchr)
        .type   wcsrchr, @gnu_indirect_function
        pushl   %ebx
        cfi_adjust_cfa_offset (4)
        cfi_rel_offset (ebx, 0)
-       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