[PATCH] s390x: Update math: redirect roundeven function

[PATCH] s390x: Update math: redirect roundeven function

[Stefan Liebler]

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"
---
 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>
-- 
2.31.1

Re: [PATCH] s390x: Update math: redirect roundeven function

[Florian Weimer]

* Stefan Liebler via Libc-alpha:

> 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"

Please push this as the s390x maintainer.  Thanks. 8-)

Florian

Re: [PATCH] s390x: Update math: redirect roundeven function

[Stefan Liebler]

On 28/06/2021 13:08, Florian Weimer wrote:
> * Stefan Liebler via Libc-alpha:
> 
>> 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"
> 
> Please push this as the s390x maintainer.  Thanks. 8-)
> 
> Florian
> 
Sure. I've just want to give others a short period of time to give
feedback before committing.

Committed now.

Thanks,
Stefan