public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/users/skpgkp2/2.33/master] s390x: Update math: redirect roundeven function
@ 2022-09-29 20:18 Sunil Pandey
  0 siblings, 0 replies; 2+ messages in thread
From: Sunil Pandey @ 2022-09-29 20:18 UTC (permalink / raw)
  To: glibc-cvs

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>

^ permalink raw reply	[flat|nested] 2+ messages in thread
* [glibc/users/skpgkp2/2.33/master] s390x: Update math: redirect roundeven function
@ 2022-09-28 19:11 Sunil Pandey
  0 siblings, 0 replies; 2+ messages in thread
From: Sunil Pandey @ 2022-09-28 19:11 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=6646355364893137dd3693d9a4b889a0b810079b

commit 6646355364893137dd3693d9a4b889a0b810079b
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>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-09-29 20:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-29 20:18 [glibc/users/skpgkp2/2.33/master] s390x: Update math: redirect roundeven function Sunil Pandey
  -- strict thread matches above, loose matches on Subject: below --
2022-09-28 19:11 Sunil Pandey

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).