From 4a3d39994e07105fb1bd20ed71d166f6ebb21974 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 31 Dec 2014 19:16:34 +0000 Subject: Clean up powerpc fegetround / __fegetround inlines. The natural fix for some linknamespace test failures, where C90 libm functions call C99 functions, is to make fe* into weak aliases for __fe* and call __fe* from within libm as needed. To do this, the __fe* names need to be available for that purpose - that is, they must not be used for something other than aliases of fe*. On powerpc, however, __fegetround is an inline function in fenv_libc.h, with no corresponding fegetround inline function; fegetround has an equivalent macro expansion in bits/fenvinline.h, but that is disabled if __NO_MATH_INLINES (which is defined for building libm). I see no need for that disabling; it's not even clear that __NO_MATH_INLINES should affect , and the results of fegetround are completely defined so there is no semantic effect of that disabling at all outside glibc. The x86 inline feraiseexcept is conditioned on __USE_EXTERN_INLINES not __NO_MATH_INLINES (but that's an inline function rather than a macro). This patch removes the __NO_MATH_INLINES conditional on that fegetround macro, so resulting in it being expanded inline inside glibc. In turn, this means that direct calls to __fegetround from C99 functions in ldbl-128ibm can be changed to calls to fegetround, so that nofpu fenv_libc.h files don't need to define __fegetround at all and, by changing ldbl-128ibm files to use not , non-e500 nofpu no longer needs an fenv_libc.h file. The other macros in fenvinline.h are left conditional on __NO_MATH_INLINES, although since the only case where this should make a difference is one involving undefined behavior (if the argument to the function is not a valid exception macro). The out-of-line definition for fegetround uses __fegetround (the inline function removed by this patch). So this continues to work, the fenvinline.h header is made to define __fegetround, and then to define fegetround to call __fegetround. Tested for powerpc32 (hard float) that installed stripped shared libraries are unchanged by this patch; also tested that powerpc-nofpu build still works. (This patch does not itself fix any bugs; it simply cleans things up in preparation for separate bug fixes.) * sysdeps/powerpc/bits/fenvinline.h (fegetround): Rename macro to __fegetround and redefine to call __fegetround. Remove condition on [!__NO_MATH_INLINES]. * sysdeps/powerpc/fpu/fenv_libc.h (__fegetround): Remove inline function. * sysdeps/powerpc/nofpu/fenv_libc.h: Remove file. * sysdeps/powerpc/powerpc32/e500/nofpu/fenv_libc.h (__fegetround): Remove macro. * sysdeps/ieee754/ldbl-128ibm/s_llrintl.c: Include instead of . (__llrintl): Call fegetround instead of __fegetround. * sysdeps/ieee754/ldbl-128ibm/s_llroundl.c: Include instead of . * sysdeps/ieee754/ldbl-128ibm/s_lrintl.c: Likewise. (__lrintl): Call fegetround instead of __fegetround. * sysdeps/ieee754/ldbl-128ibm/s_lroundl.c: Include instead of . * sysdeps/ieee754/ldbl-128ibm/s_rintl.c: Likewise. (__rintl): Call fegetround instead of __fegetround. --- ChangeLog | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 4597880d4e..3de34438ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +2014-12-31 Joseph Myers + + * sysdeps/powerpc/bits/fenvinline.h (fegetround): Rename macro to + __fegetround and redefine to call __fegetround. Remove condition + on [!__NO_MATH_INLINES]. + * sysdeps/powerpc/fpu/fenv_libc.h (__fegetround): Remove inline + function. + * sysdeps/powerpc/nofpu/fenv_libc.h: Remove file. + * sysdeps/powerpc/powerpc32/e500/nofpu/fenv_libc.h (__fegetround): + Remove macro. + * sysdeps/ieee754/ldbl-128ibm/s_llrintl.c: Include + instead of . + (__llrintl): Call fegetround instead of __fegetround. + * sysdeps/ieee754/ldbl-128ibm/s_llroundl.c: Include + instead of . + * sysdeps/ieee754/ldbl-128ibm/s_lrintl.c: Likewise. + (__lrintl): Call fegetround instead of __fegetround. + * sysdeps/ieee754/ldbl-128ibm/s_lroundl.c: Include + instead of . + * sysdeps/ieee754/ldbl-128ibm/s_rintl.c: Likewise. + (__rintl): Call fegetround instead of __fegetround. + 2014-12-31 Siddhesh Poyarekar * scripts/gen-posix-conf-vars.awk: Don't use multi-dimensional -- cgit v1.2.3