diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sysdeps/x86/fpu/bits/fenv.h | 2 | ||||
| -rw-r--r-- | sysdeps/x86/fpu/include/bits/fenv.h | 9 |
3 files changed, 19 insertions, 0 deletions
@@ -1,3 +1,11 @@ +2017-06-23 Joseph Myers <joseph@codesourcery.com> + + * sysdeps/x86/fpu/bits/fenv.h [_LIBC] (__feraiseexcept_renamed): + Do not declare. + * sysdeps/x86/fpu/include/bits/fenv.h [_LIBC && + __USE_EXTERN_INLINES] (__feraiseexcept_renamed): Declare here, + redirected to __GI_feraiseexcept if [SHARED && IS_IN (libm)]. + 2017-06-23 H.J. Lu <hongjiu.lu@intel.com> * sysdeps/x86_64/multiarch/memcmp-avx2-movbe.S (between_2_3): diff --git a/sysdeps/x86/fpu/bits/fenv.h b/sysdeps/x86/fpu/bits/fenv.h index fd7327902c..e6fcf9431b 100644 --- a/sysdeps/x86/fpu/bits/fenv.h +++ b/sysdeps/x86/fpu/bits/fenv.h @@ -120,7 +120,9 @@ femode_t; __BEGIN_DECLS /* Optimized versions. */ +#ifndef _LIBC extern int __REDIRECT_NTH (__feraiseexcept_renamed, (int), feraiseexcept); +#endif __extern_always_inline void __NTH (__feraiseexcept_invalid_divbyzero (int __excepts)) { diff --git a/sysdeps/x86/fpu/include/bits/fenv.h b/sysdeps/x86/fpu/include/bits/fenv.h index a39b6fa85d..aa61666fc3 100644 --- a/sysdeps/x86/fpu/include/bits/fenv.h +++ b/sysdeps/x86/fpu/include/bits/fenv.h @@ -17,6 +17,15 @@ <http://www.gnu.org/licenses/>. */ #ifndef _BITS_FENV_H + +#if defined _LIBC && defined __USE_EXTERN_INLINES +# if defined SHARED && IS_IN (libm) +extern int __REDIRECT_NTH (__feraiseexcept_renamed, (int), __GI_feraiseexcept); +# else +extern int __REDIRECT_NTH (__feraiseexcept_renamed, (int), feraiseexcept); +# endif +#endif + #include_next <bits/fenv.h> # ifndef _ISOMAC |