Use CPUID_OFFSET instead of FEATURE_OFFSET

diff --git a/ChangeLog b/ChangeLog
index 5f2d25cc85af408c5049221532976862f0e5f30c..69906fa64281a7e7da914a1eb0659a7312c79589 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-02-16  H.J. Lu  <hongjiu.lu@intel.com>
 
+       * sysdeps/i386/i686/multiarch/memcmp.S (memcmp): Use CPUID_OFFSET
+       instead of FEATURE_OFFSET.
+       * sysdeps/i386/i686/multiarch/strcmp.S (strcmp): Likewise.
+                       
        * sysdeps/i386/i686/multiarch/memcmp-sse4.S: Add alignnments.
        Fix one unwind info problem.
 

diff --git a/sysdeps/i386/i686/multiarch/memcmp.S b/sysdeps/i386/i686/multiarch/memcmp.S
index fa7c52a003e666898739abf69bec82ce87738049..cf606a5959ec94c8989b34535ac22a757744efab 100644 (file)
--- a/sysdeps/i386/i686/multiarch/memcmp.S
+++ b/sysdeps/i386/i686/multiarch/memcmp.S
@@ -58,7 +58,7 @@ ENTRY(memcmp)
        testl   $bit_SSSE3, CPUID_OFFSET+index_SSSE3+__cpu_features
        jz      2f
        leal    __memcmp_ssse3, %eax
-       testl   $bit_SSE4_2, FEATURE_OFFSET+index_SSE4_2+__cpu_features
+       testl   $bit_SSE4_2, CPUID_OFFSET+index_SSE4_2+__cpu_features
        jz      2f
        leal    __memcmp_sse4_2, %eax
 2:     ret

diff --git a/sysdeps/i386/i686/multiarch/strcmp.S b/sysdeps/i386/i686/multiarch/strcmp.S
index 79a1fdfd43cc9461fd150652a7f6ed5e093db6eb..7136d47e85fc61fc63b61b625338323f4fbc68ab 100644 (file)
--- a/sysdeps/i386/i686/multiarch/strcmp.S
+++ b/sysdeps/i386/i686/multiarch/strcmp.S
@@ -83,7 +83,7 @@ ENTRY(STRCMP)
        testl   $bit_SSSE3, CPUID_OFFSET+index_SSSE3+__cpu_features
        jz      2f
        leal    __STRCMP_SSSE3, %eax
-       testl   $bit_SSE4_2, FEATURE_OFFSET+index_SSE4_2+__cpu_features
+       testl   $bit_SSE4_2, CPUID_OFFSET+index_SSE4_2+__cpu_features
        jz      2f
        leal    __STRCMP_SSE4_2, %eax
 2:     ret