From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stli@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1962)
 id 7E775388A029; Tue, 29 Jun 2021 07:14:11 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7E775388A029
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Stefan Liebler <stli@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] s390x: Update math: redirect roundeven function
X-Act-Checkin: glibc
X-Git-Author: Stefan Liebler <stli@linux.ibm.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: c32c868ab8b2b95724550d0130782c0767fc3bab
X-Git-Newrev: 259a17cc98058d2576511201f85d28cb5d9de2a2
Message-Id: <20210629071411.7E775388A029@sourceware.org>
Date: Tue, 29 Jun 2021 07:14:11 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Jun 2021 07:14:11 -0000

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=259a17cc98058d2576511201f85d28cb5d9de2a2

commit 259a17cc98058d2576511201f85d28cb5d9de2a2
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"

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>