Use PIC only if SHARED is defined.

For ia32, we can avoid PIC in IFUNC functions in static library.

diff --git a/ChangeLog b/ChangeLog
index 0a3df8adf8b24925ead4db6fc58d001b17fdb902..072af87db761caf0453334ddb4f361f5d8c38e19 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * sysdeps/i386/i686/multiarch/strcspn.S (STRCSPN): Use PIC
+       only if SHARED is defined.
+       * sysdeps/i386/i686/multiarch/strspn.S (strspn): Likewise.
+
 2009-08-03  Jim Meyering  <meyering@redhat.com>
 
        * sysdeps/i386/configure.in: Use AC_HEADER_CHECK.

diff --git a/sysdeps/i386/i686/multiarch/strcspn.S b/sysdeps/i386/i686/multiarch/strcspn.S
index ca9c3f57c1b7f31e5c9479f846d267a9cbd887ce..73e7eb45a8812d45cf0e15ce098bbd73b8b77bef 100644 (file)
--- a/sysdeps/i386/i686/multiarch/strcspn.S
+++ b/sysdeps/i386/i686/multiarch/strcspn.S
@@ -42,6 +42,7 @@
    define multiple versions for strpbrk in static library since we
    need strpbrk before the initialization happened.  */
 #if (defined SHARED || !defined USE_AS_STRPBRK) && !defined NOT_IN_libc
+# ifdef SHARED
        .section        .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits
        .globl  __i686.get_pc_thunk.bx
        .hidden __i686.get_pc_thunk.bx
@@ -71,6 +72,20 @@ ENTRY(STRCSPN)
        cfi_restore (ebx)
        ret
 END(STRCSPN)
+# else
+       .text
+ENTRY(STRCSPN)
+       .type   STRCSPN, @gnu_indirect_function
+       cmpl    $0, KIND_OFFSET+__cpu_features
+       jne     1f
+       call    __init_cpu_features
+1:     leal    STRCSPN_IA32, %eax
+       testl   $(1<<20), CPUID_OFFSET+COMMON_CPUID_INDEX_1*CPUID_SIZE+CPUID_ECX_OFFSET+__cpu_features
+       jz      2f
+       leal    STRCSPN_SSE42, %eax
+2:     ret
+END(STRCSPN)
+# endif
 
 # undef ENTRY
 # define ENTRY(name) \

diff --git a/sysdeps/i386/i686/multiarch/strspn.S b/sysdeps/i386/i686/multiarch/strspn.S
index f11d3eaf6ab2e9474d937e5a7e2794bfa3ea3c1d..f306d2d1fb8a7d0d3956b09fced45474ac36914b 100644 (file)
--- a/sysdeps/i386/i686/multiarch/strspn.S
+++ b/sysdeps/i386/i686/multiarch/strspn.S
@@ -27,6 +27,7 @@
 
 /* Define multiple versions only for the definition in libc.  */
 #ifndef NOT_IN_libc
+# ifdef SHARED
        .section        .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits
        .globl  __i686.get_pc_thunk.bx
        .hidden __i686.get_pc_thunk.bx
@@ -56,6 +57,20 @@ ENTRY(strspn)
        cfi_restore (ebx)
        ret
 END(strspn)
+# else
+       .text
+ENTRY(strspn)
+       .type   strspn, @gnu_indirect_function
+       cmpl    $0, KIND_OFFSET+__cpu_features
+       jne     1f
+       call    __init_cpu_features
+1:     leal    __strspn_ia32, %eax
+       testl   $(1<<20), CPUID_OFFSET+COMMON_CPUID_INDEX_1*CPUID_SIZE+CPUID_ECX_OFFSET+__cpu_features
+       jz      2f
+       leal    __strspn_sse42, %eax
+2:     ret
+END(strspn)
+# endif
 
 # undef ENTRY
 # define ENTRY(name) \