From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <skpgkp2@sourceware.org>
Received: by sourceware.org (Postfix, from userid 7852)
	id 47BD93858C55; Thu, 29 Sep 2022 20:18:18 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 47BD93858C55
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org;
	s=default; t=1664482698;
	bh=8mnFW9Vr2cgj8bmuCbN1q5DpP5tpK1tZlyL2VARMxf4=;
	h=From:To:Subject:Date:From;
	b=mYoY2ejenFJB5x92hRgM8gwHzYghhaSncBhHFTwALSCgU+RRRD8v2LLNR5ebH9+wY
	 FaDA4ukX3IM8iCRkHA335Ozo1AIlstTOGhV2bIy8t0vn7FF/xLyae7tEDJNdN4SGFs
	 NzYgE23antlp9GoT08ZVamdzkUFzcMk2281TbyDo=
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Sunil Pandey <skpgkp2@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/users/skpgkp2/2.33/master] s390x: Update math: redirect
 roundeven function
X-Act-Checkin: glibc
X-Git-Author: Stefan Liebler <stli@linux.ibm.com>
X-Git-Refname: refs/heads/users/skpgkp2/2.33/master
X-Git-Oldrev: 224c17c70b6b3a12428d30778f1100770717956b
X-Git-Newrev: 46bcc6c0c9234ca463e583ee3808a57a04f01199
Message-Id: <20220929201818.47BD93858C55@sourceware.org>
Date: Thu, 29 Sep 2022 20:18:18 +0000 (GMT)
List-Id: <glibc-cvs.sourceware.org>

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=46bcc6c0c9234ca463e583ee3808a57a04f01199

commit 46bcc6c0c9234ca463e583ee3808a57a04f01199
Author: Stefan Liebler <stli@linux.ibm.com>
Date:   Mon Jun 28 13:01:07 2021 +0200

    s390x: Update math: redirect roundeven function
    
    After recent commit
    447954a206837b5f153869cfeeeab44631c3fac9
    "math: redirect roundeven function", building on
    s390x fails with:
    Error: symbol `__roundevenl' is already defined
    
    Similar to aarch64/riscv fix, this patch redirects target
    specific functions for s390x:
    commit 3213ed770cbc5821920d16caa93c85e92dd7b9f6
    "Update math: redirect roundeven function"
    
    (cherry picked from commit 259a17cc98058d2576511201f85d28cb5d9de2a2)

Diff:
---
 sysdeps/s390/fpu/s_roundeven.c  | 2 +-
 sysdeps/s390/fpu/s_roundevenf.c | 1 +
 sysdeps/s390/fpu/s_roundevenl.c | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sysdeps/s390/fpu/s_roundeven.c b/sysdeps/s390/fpu/s_roundeven.c
index 40b07e054b..0773adfed0 100644
--- a/sysdeps/s390/fpu/s_roundeven.c
+++ b/sysdeps/s390/fpu/s_roundeven.c
@@ -18,6 +18,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #ifdef HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT
+# define NO_MATH_REDIRECT
 # include <math.h>
 # include <libm-alias-double.h>
 
@@ -31,7 +32,6 @@ __roundeven (double x)
   __asm__ ("fidbra %0,4,%1,4" : "=f" (y) : "f" (x));
   return y;
 }
-hidden_def (__roundeven)
 libm_alias_double (__roundeven, roundeven)
 
 #else
diff --git a/sysdeps/s390/fpu/s_roundevenf.c b/sysdeps/s390/fpu/s_roundevenf.c
index d2fbf3d2b6..289785bc4a 100644
--- a/sysdeps/s390/fpu/s_roundevenf.c
+++ b/sysdeps/s390/fpu/s_roundevenf.c
@@ -18,6 +18,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #ifdef HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT
+# define NO_MATH_REDIRECT
 # include <math.h>
 # include <libm-alias-float.h>
 
diff --git a/sysdeps/s390/fpu/s_roundevenl.c b/sysdeps/s390/fpu/s_roundevenl.c
index 29ab7a8616..94b6459ab4 100644
--- a/sysdeps/s390/fpu/s_roundevenl.c
+++ b/sysdeps/s390/fpu/s_roundevenl.c
@@ -18,6 +18,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #ifdef HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT
+# define NO_MATH_REDIRECT
 # include <math.h>
 # include <math_private.h>
 # include <libm-alias-ldouble.h>