Fix s390 linknamespace fallout of bug 22702 patch [committed]

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Fix s390 linknamespace fallout of bug 22702 patch [committed]

Joseph Myers
My fix for bug 22702 introduced linknamespace test failures on
s390x-linux-gnu and s390-linux-gnu because it made remainder call
__feholdexcept, and the s390 __feholdexcept calls fegetenv, and
remainder is in Unix98 and XPG4.2 but fegetenv isn't.  This patch
makes __feholdexcept call __fegetenv instead to avoid that namespace
issue.

Tested (compilation) with build-many-glibcs.py for s390x-linux-gnu,
where it resolves the test failures.  Committed.

2018-01-12  Joseph Myers  <[hidden email]>

        * sysdeps/s390/fpu/feholdexcpt.c (__feholdexcept): Call __fegetenv
        instead of fegetenv.

diff --git a/sysdeps/s390/fpu/feholdexcpt.c b/sysdeps/s390/fpu/feholdexcpt.c
index 21bcbd7..5daee56 100644
--- a/sysdeps/s390/fpu/feholdexcpt.c
+++ b/sysdeps/s390/fpu/feholdexcpt.c
@@ -24,7 +24,7 @@ int __feholdexcept (fenv_t *envp)
 {
   fexcept_t fpc;
   /* Store the environment.  */
-  fegetenv (envp);
+  __fegetenv (envp);
   /* Clear the current sticky bits as more than one exception
      may be generated.  */
   fpc = envp->__fpc & ~(FPC_FLAGS_MASK | FPC_DXC_MASK);

--
Joseph S. Myers
[hidden email]