[2/2] Use HAS_ARCH_FEATURE with Fast_Rep_String
Commit Message
HAS_ARCH_FEATURE, not HAS_CPU_FEATURE, should be used with
Fast_Rep_String.
[BZ #19762]
* sysdeps/i386/i686/multiarch/bcopy.S (bcopy): Use
HAS_ARCH_FEATURE with Fast_Rep_String.
* sysdeps/i386/i686/multiarch/bzero.S (__bzero): Likewise.
* sysdeps/i386/i686/multiarch/memcpy.S (memcpy): Likewise.
* sysdeps/i386/i686/multiarch/memcpy_chk.S (__memcpy_chk):
Likewise.
* sysdeps/i386/i686/multiarch/memmove_chk.S (__memmove_chk):
Likewise.
* sysdeps/i386/i686/multiarch/mempcpy.S (__mempcpy): Likewise.
* sysdeps/i386/i686/multiarch/mempcpy_chk.S (__mempcpy_chk):
Likewise.
* sysdeps/i386/i686/multiarch/memset.S (memset): Likewise.
* sysdeps/i386/i686/multiarch/memset_chk.S (__memset_chk):
Likewise.
---
sysdeps/i386/i686/multiarch/bcopy.S | 2 +-
sysdeps/i386/i686/multiarch/bzero.S | 2 +-
sysdeps/i386/i686/multiarch/memcpy.S | 2 +-
sysdeps/i386/i686/multiarch/memcpy_chk.S | 2 +-
sysdeps/i386/i686/multiarch/memmove_chk.S | 2 +-
sysdeps/i386/i686/multiarch/mempcpy.S | 2 +-
sysdeps/i386/i686/multiarch/mempcpy_chk.S | 2 +-
sysdeps/i386/i686/multiarch/memset.S | 2 +-
sysdeps/i386/i686/multiarch/memset_chk.S | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
Comments
On Thu, Mar 3, 2016 at 3:52 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> HAS_ARCH_FEATURE, not HAS_CPU_FEATURE, should be used with
> Fast_Rep_String.
>
> [BZ #19762]
> * sysdeps/i386/i686/multiarch/bcopy.S (bcopy): Use
> HAS_ARCH_FEATURE with Fast_Rep_String.
> * sysdeps/i386/i686/multiarch/bzero.S (__bzero): Likewise.
> * sysdeps/i386/i686/multiarch/memcpy.S (memcpy): Likewise.
> * sysdeps/i386/i686/multiarch/memcpy_chk.S (__memcpy_chk):
> Likewise.
> * sysdeps/i386/i686/multiarch/memmove_chk.S (__memmove_chk):
> Likewise.
> * sysdeps/i386/i686/multiarch/mempcpy.S (__mempcpy): Likewise.
> * sysdeps/i386/i686/multiarch/mempcpy_chk.S (__mempcpy_chk):
> Likewise.
> * sysdeps/i386/i686/multiarch/memset.S (memset): Likewise.
> * sysdeps/i386/i686/multiarch/memset_chk.S (__memset_chk):
> Likewise.
> ---
> sysdeps/i386/i686/multiarch/bcopy.S | 2 +-
> sysdeps/i386/i686/multiarch/bzero.S | 2 +-
> sysdeps/i386/i686/multiarch/memcpy.S | 2 +-
> sysdeps/i386/i686/multiarch/memcpy_chk.S | 2 +-
> sysdeps/i386/i686/multiarch/memmove_chk.S | 2 +-
> sysdeps/i386/i686/multiarch/mempcpy.S | 2 +-
> sysdeps/i386/i686/multiarch/mempcpy_chk.S | 2 +-
> sysdeps/i386/i686/multiarch/memset.S | 2 +-
> sysdeps/i386/i686/multiarch/memset_chk.S | 2 +-
> 9 files changed, 9 insertions(+), 9 deletions(-)
>
I will check it in and backport it to 2.22 and 2.23 branches.
@@ -36,7 +36,7 @@ ENTRY(bcopy)
HAS_CPU_FEATURE (SSSE3)
jz 2f
LOAD_FUNC_GOT_EAX (__bcopy_ssse3)
- HAS_CPU_FEATURE (Fast_Rep_String)
+ HAS_ARCH_FEATURE (Fast_Rep_String)
jz 2f
LOAD_FUNC_GOT_EAX (__bcopy_ssse3_rep)
2: ret
@@ -31,7 +31,7 @@ ENTRY(__bzero)
HAS_CPU_FEATURE (SSE2)
jz 2f
LOAD_FUNC_GOT_EAX ( __bzero_sse2)
- HAS_CPU_FEATURE (Fast_Rep_String)
+ HAS_ARCH_FEATURE (Fast_Rep_String)
jz 2f
LOAD_FUNC_GOT_EAX (__bzero_sse2_rep)
2: ret
@@ -38,7 +38,7 @@ ENTRY(memcpy)
HAS_CPU_FEATURE (SSSE3)
jz 2f
LOAD_FUNC_GOT_EAX (__memcpy_ssse3)
- HAS_CPU_FEATURE (Fast_Rep_String)
+ HAS_ARCH_FEATURE (Fast_Rep_String)
jz 2f
LOAD_FUNC_GOT_EAX (__memcpy_ssse3_rep)
2: ret
@@ -39,7 +39,7 @@ ENTRY(__memcpy_chk)
HAS_CPU_FEATURE (SSSE3)
jz 2f
LOAD_FUNC_GOT_EAX (__memcpy_chk_ssse3)
- HAS_CPU_FEATURE (Fast_Rep_String)
+ HAS_ARCH_FEATURE (Fast_Rep_String)
jz 2f
LOAD_FUNC_GOT_EAX (__memcpy_chk_ssse3_rep)
2: ret
@@ -36,7 +36,7 @@ ENTRY(__memmove_chk)
HAS_CPU_FEATURE (SSSE3)
jz 2f
LOAD_FUNC_GOT_EAX (__memmove_chk_ssse3)
- HAS_CPU_FEATURE (Fast_Rep_String)
+ HAS_ARCH_FEATURE (Fast_Rep_String)
jz 2f
LOAD_FUNC_GOT_EAX (__memmove_chk_ssse3_rep)
2: ret
@@ -38,7 +38,7 @@ ENTRY(__mempcpy)
HAS_CPU_FEATURE (SSSE3)
jz 2f
LOAD_FUNC_GOT_EAX (__mempcpy_ssse3)
- HAS_CPU_FEATURE (Fast_Rep_String)
+ HAS_ARCH_FEATURE (Fast_Rep_String)
jz 2f
LOAD_FUNC_GOT_EAX (__mempcpy_ssse3_rep)
2: ret
@@ -39,7 +39,7 @@ ENTRY(__mempcpy_chk)
HAS_CPU_FEATURE (SSSE3)
jz 2f
LOAD_FUNC_GOT_EAX (__mempcpy_chk_ssse3)
- HAS_CPU_FEATURE (Fast_Rep_String)
+ HAS_ARCH_FEATURE (Fast_Rep_String)
jz 2f
LOAD_FUNC_GOT_EAX (__mempcpy_chk_ssse3_rep)
2: ret
@@ -31,7 +31,7 @@ ENTRY(memset)
HAS_CPU_FEATURE (SSE2)
jz 2f
LOAD_FUNC_GOT_EAX (__memset_sse2)
- HAS_CPU_FEATURE (Fast_Rep_String)
+ HAS_ARCH_FEATURE (Fast_Rep_String)
jz 2f
LOAD_FUNC_GOT_EAX (__memset_sse2_rep)
2: ret
@@ -31,7 +31,7 @@ ENTRY(__memset_chk)
HAS_CPU_FEATURE (SSE2)
jz 2f
LOAD_FUNC_GOT_EAX (__memset_chk_sse2)
- HAS_CPU_FEATURE (Fast_Rep_String)
+ HAS_ARCH_FEATURE (Fast_Rep_String)
jz 2f
LOAD_FUNC_GOT_EAX (__memset_chk_sse2_rep)
2: ret