From c8924f1ff22cb78abc9bb950c3b23d8483ac7bba Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 12 Jan 2018 00:12:57 +0000 Subject: [PATCH] Fix s390 linknamespace fallout of bug 22702 patch. 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. * sysdeps/s390/fpu/feholdexcpt.c (__feholdexcept): Call __fegetenv instead of fegetenv. --- ChangeLog | 5 +++++ sysdeps/s390/fpu/feholdexcpt.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f5147a8f0c..7dea263d92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-01-12 Joseph Myers + + * sysdeps/s390/fpu/feholdexcpt.c (__feholdexcept): Call __fegetenv + instead of fegetenv. + 2018-01-11 Joseph Myers [BZ #22702] diff --git a/sysdeps/s390/fpu/feholdexcpt.c b/sysdeps/s390/fpu/feholdexcpt.c index 21bcbd74fa..5daee5675d 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);