[v1] x86: Fix `#define STRCPY` guard in strcpy-sse2.S

Message ID 20220808032622.3804534-1-goldstein.w.n@gmail.com
State Committed
Commit 312ded0d6339e8c463d0395397b5825401b14f54
Headers
Series [v1] x86: Fix `#define STRCPY` guard in strcpy-sse2.S |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit success Build for i686

Commit Message

Noah Goldstein Aug. 8, 2022, 3:26 a.m. UTC
  `#ifndef STPCPY` is incorrect for checking if `STRCPY` is already
defined.  It doesn't end up mattering as the whole check is
guarded by `#if IS_IN (libc)` but is incorrect none the less.
---
 sysdeps/x86_64/multiarch/strcpy-sse2.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

H.J. Lu Aug. 8, 2022, 2:21 p.m. UTC | #1
On Sun, Aug 7, 2022 at 8:26 PM Noah Goldstein <goldstein.w.n@gmail.com> wrote:
>
> `#ifndef STPCPY` is incorrect for checking if `STRCPY` is already
> defined.  It doesn't end up mattering as the whole check is
> guarded by `#if IS_IN (libc)` but is incorrect none the less.
> ---
>  sysdeps/x86_64/multiarch/strcpy-sse2.S | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sysdeps/x86_64/multiarch/strcpy-sse2.S b/sysdeps/x86_64/multiarch/strcpy-sse2.S
> index e29b411314..d6b9bae5f8 100644
> --- a/sysdeps/x86_64/multiarch/strcpy-sse2.S
> +++ b/sysdeps/x86_64/multiarch/strcpy-sse2.S
> @@ -22,7 +22,7 @@
>
>  # include <sysdep.h>
>
> -# ifndef STPCPY
> +# ifndef STRCPY
>  #  define STRCPY __strcpy_sse2
>  # endif
>
> --
> 2.34.1
>

LGTM.

Thanks.
  

Patch

diff --git a/sysdeps/x86_64/multiarch/strcpy-sse2.S b/sysdeps/x86_64/multiarch/strcpy-sse2.S
index e29b411314..d6b9bae5f8 100644
--- a/sysdeps/x86_64/multiarch/strcpy-sse2.S
+++ b/sysdeps/x86_64/multiarch/strcpy-sse2.S
@@ -22,7 +22,7 @@ 
 
 # include <sysdep.h>
 
-# ifndef STPCPY
+# ifndef STRCPY
 #  define STRCPY __strcpy_sse2
 # endif