s390: Fix build for -march=z13

Message ID 20230220142356.1180570-1-adhemerval.zanella@linaro.org
State Committed
Commit 8b014a1b1f7aee1e3348db108aeea396359d481e
Delegated to: Arjun Shankar
Headers
Series s390: Fix build for -march=z13 |

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

Adhemerval Zanella Feb. 20, 2023, 2:23 p.m. UTC
  It fixes the build after 7ea510127e2067e and 22999b2f0fb62.

Checked with build for s390x-linux-gnu with -march=z13.
---
 sysdeps/s390/memrchr-vx.S   | 1 +
 sysdeps/s390/strchrnul-vx.S | 1 +
 2 files changed, 2 insertions(+)
  

Comments

Arjun Shankar Feb. 20, 2023, 8:03 p.m. UTC | #1
Hi Adhemerval,

> It fixes the build after 7ea510127e2067e and 22999b2f0fb62.
>
> Checked with build for s390x-linux-gnu with -march=z13.

Thanks! This LGTM, and fixes a build failure on master with Fedora
Rawhide on s390x (which uses -march=z13).

Reviewed-by: Arjun Shankar <arjun@redhat.com>

> ---
>  sysdeps/s390/memrchr-vx.S   | 1 +
>  sysdeps/s390/strchrnul-vx.S | 1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/sysdeps/s390/memrchr-vx.S b/sysdeps/s390/memrchr-vx.S
> index c6c3168668..4080dccfbc 100644
> --- a/sysdeps/s390/memrchr-vx.S
> +++ b/sysdeps/s390/memrchr-vx.S
> @@ -161,6 +161,7 @@ ENTRY(MEMRCHR_Z13)
>  END(MEMRCHR_Z13)
>
>  # if ! HAVE_MEMRCHR_IFUNC
> +libc_hidden_def (__memrchr)
>  strong_alias (MEMRCHR_Z13, __memrchr)
>  weak_alias (__memrchr, memrchr)
>  # endif
> diff --git a/sysdeps/s390/strchrnul-vx.S b/sysdeps/s390/strchrnul-vx.S
> index 07f39426b7..b705979481 100644
> --- a/sysdeps/s390/strchrnul-vx.S
> +++ b/sysdeps/s390/strchrnul-vx.S
> @@ -94,6 +94,7 @@ ENTRY(STRCHRNUL_Z13)
>  END(STRCHRNUL_Z13)
>
>  # if ! HAVE_STRCHRNUL_IFUNC
> +libc_hidden_def (__strchrnul)
>  strong_alias (STRCHRNUL_Z13, __strchrnul)
>  weak_alias (__strchrnul, strchrnul)
>  # endif
> --
> 2.34.1
>
  

Patch

diff --git a/sysdeps/s390/memrchr-vx.S b/sysdeps/s390/memrchr-vx.S
index c6c3168668..4080dccfbc 100644
--- a/sysdeps/s390/memrchr-vx.S
+++ b/sysdeps/s390/memrchr-vx.S
@@ -161,6 +161,7 @@  ENTRY(MEMRCHR_Z13)
 END(MEMRCHR_Z13)
 
 # if ! HAVE_MEMRCHR_IFUNC
+libc_hidden_def (__memrchr)
 strong_alias (MEMRCHR_Z13, __memrchr)
 weak_alias (__memrchr, memrchr)
 # endif
diff --git a/sysdeps/s390/strchrnul-vx.S b/sysdeps/s390/strchrnul-vx.S
index 07f39426b7..b705979481 100644
--- a/sysdeps/s390/strchrnul-vx.S
+++ b/sysdeps/s390/strchrnul-vx.S
@@ -94,6 +94,7 @@  ENTRY(STRCHRNUL_Z13)
 END(STRCHRNUL_Z13)
 
 # if ! HAVE_STRCHRNUL_IFUNC
+libc_hidden_def (__strchrnul)
 strong_alias (STRCHRNUL_Z13, __strchrnul)
 weak_alias (__strchrnul, strchrnul)
 # endif