From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7852) id 0C867385735C; Wed, 28 Sep 2022 19:11:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0C867385735C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664392302; bh=34AyDykVMlIqrHEY2T9ocXXxfgKJ+7HXFmujCppbC9o=; h=From:To:Subject:Date:From; b=I+lYTj0Q+iBD6rYEz/eXm5ILhJ8WabEUJDF3MWCHw0qySeAgLSOpIWxS6KpkcJg4t 32SAENtXyb8Y4I8gcbkkM+zSkZ4CBRxnPYH7tG6refRfcmepzXnkozWB64EtOuSXy0 VYa+dXEmOVlncJiDrX1uJrlsRitm4+wDaDGU9Obk= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Sunil Pandey 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 X-Git-Refname: refs/heads/users/skpgkp2/2.33/master X-Git-Oldrev: a2f4d73dc888f890e428e5a735c02397e3779f1a X-Git-Newrev: 6646355364893137dd3693d9a4b889a0b810079b Message-Id: <20220928191142.0C867385735C@sourceware.org> Date: Wed, 28 Sep 2022 19:11:42 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=6646355364893137dd3693d9a4b889a0b810079b commit 6646355364893137dd3693d9a4b889a0b810079b Author: Stefan Liebler 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 @@ . */ #ifdef HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT +# define NO_MATH_REDIRECT # include # include @@ -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 @@ . */ #ifdef HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT +# define NO_MATH_REDIRECT # include # include 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 @@ . */ #ifdef HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT +# define NO_MATH_REDIRECT # include # include # include