Fix libm fesetround namespace (bug 17748).

Continuing the fixes for C90 libm functions calling C99 fe* functions,
this patch fixes the case of fesetround by making it a weak alias of
__fesetround and making the affected code call __fesetround.  An
existing __fesetround function in fenv_libc.h for powerpc is renamed
to __fesetround_inline.

Tested for x86_64 (testsuite, and that disassembly of installed shared
libraries is unchanged by the patch).  Also tested for ARM
(soft-float) that fesetround failures disappear from the linknamespace
test results (feupdateenv remains to be addressed to complete fixing
bug 17748).

	[BZ #17748]
	* include/fenv.h (__fesetround): Declare.  Use libm_hidden_proto.
	* math/fesetround.c (fesetround): Rename to __fesetround and
	define as weak alias of __fesetround.  Use libm_hidden_weak.
	* sysdeps/aarch64/fpu/fesetround.c (fesetround): Likewise.
	* sysdeps/alpha/fpu/fesetround.c (fesetround): Likewise.
	* sysdeps/arm/fesetround.c (fesetround): Likewise.
	* sysdeps/hppa/fpu/fesetround.c (fesetround): Likewise.
	* sysdeps/i386/fpu/fesetround.c (fesetround): Likewise.
	* sysdeps/ia64/fpu/fesetround.c (fesetround): Likewise.
	* sysdeps/m68k/fpu/fesetround.c (fesetround): Likewise.
	* sysdeps/mips/fpu/fesetround.c (fesetround): Likewise.
	* sysdeps/powerpc/fpu/fenv_libc.h (__fesetround): Rename to
	__fesetround_inline.
	* sysdeps/powerpc/fpu/fenv_private.h (libc_fesetround_ppc): Call
	__fesetround_inline instead of __fesetround.
	* sysdeps/powerpc/fpu/fesetround.c (fesetround): Rename to
	__fesetround and define as weak alias of __fesetround.  Use
	libm_hidden_weak.  Call __fesetround_inline instead of
	__fesetround.
	* sysdeps/powerpc/nofpu/fesetround.c (fesetround): Rename to
	__fesetround and define as weak alias of __fesetround.  Use
	libm_hidden_weak.
	* sysdeps/powerpc/powerpc32/e500/nofpu/fesetround.c (fesetround):
	Likewise.
	* sysdeps/s390/fpu/fesetround.c (fesetround): Likewise.
	* sysdeps/sh/sh4/fpu/fesetround.c (fesetround): Likewise.
	* sysdeps/sparc/fpu/fesetround.c (fesetround): Likewise.
	* sysdeps/tile/math_private.h (__fesetround): New inline function.
	* sysdeps/x86_64/fpu/fesetround.c (fesetround): Rename to
	__fesetround and define as weak alias of __fesetround.  Use
	libm_hidden_weak.
	* sysdeps/generic/math_private.h (default_libc_fesetround): Call
	__fesetround instead of fesetround.
	(default_libc_feholdexcept_setround): Likewise.
	(libc_feholdsetround_ctx): Likewise.
	(libc_feholdsetround_noex_ctx): Likewise.

diff --git a/ChangeLog b/ChangeLog
index a17679b4153dec69a4a141f3853caa0d512b6ff2..b5aa6e5d8ebcf2fdc73c52ee828a950d4e3955a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,43 @@
 2015-01-06  Joseph Myers  <joseph@codesourcery.com>
 
+       [BZ #17748]
+       * include/fenv.h (__fesetround): Declare.  Use libm_hidden_proto.
+       * math/fesetround.c (fesetround): Rename to __fesetround and
+       define as weak alias of __fesetround.  Use libm_hidden_weak.
+       * sysdeps/aarch64/fpu/fesetround.c (fesetround): Likewise.
+       * sysdeps/alpha/fpu/fesetround.c (fesetround): Likewise.
+       * sysdeps/arm/fesetround.c (fesetround): Likewise.
+       * sysdeps/hppa/fpu/fesetround.c (fesetround): Likewise.
+       * sysdeps/i386/fpu/fesetround.c (fesetround): Likewise.
+       * sysdeps/ia64/fpu/fesetround.c (fesetround): Likewise.
+       * sysdeps/m68k/fpu/fesetround.c (fesetround): Likewise.
+       * sysdeps/mips/fpu/fesetround.c (fesetround): Likewise.
+       * sysdeps/powerpc/fpu/fenv_libc.h (__fesetround): Rename to
+       __fesetround_inline.
+       * sysdeps/powerpc/fpu/fenv_private.h (libc_fesetround_ppc): Call
+       __fesetround_inline instead of __fesetround.
+       * sysdeps/powerpc/fpu/fesetround.c (fesetround): Rename to
+       __fesetround and define as weak alias of __fesetround.  Use
+       libm_hidden_weak.  Call __fesetround_inline instead of
+       __fesetround.
+       * sysdeps/powerpc/nofpu/fesetround.c (fesetround): Rename to
+       __fesetround and define as weak alias of __fesetround.  Use
+       libm_hidden_weak.
+       * sysdeps/powerpc/powerpc32/e500/nofpu/fesetround.c (fesetround):
+       Likewise.
+       * sysdeps/s390/fpu/fesetround.c (fesetround): Likewise.
+       * sysdeps/sh/sh4/fpu/fesetround.c (fesetround): Likewise.
+       * sysdeps/sparc/fpu/fesetround.c (fesetround): Likewise.
+       * sysdeps/tile/math_private.h (__fesetround): New inline function.
+       * sysdeps/x86_64/fpu/fesetround.c (fesetround): Rename to
+       __fesetround and define as weak alias of __fesetround.  Use
+       libm_hidden_weak.
+       * sysdeps/generic/math_private.h (default_libc_fesetround): Call
+       __fesetround instead of fesetround.
+       (default_libc_feholdexcept_setround): Likewise.
+       (libc_feholdsetround_ctx): Likewise.
+       (libc_feholdsetround_noex_ctx): Likewise.
+
        [BZ #17748]
        * include/fenv.h (__fesetenv): Use libm_hidden_proto.
        * math/fesetenv.c (__fesetenv): Use libm_hidden_def.

diff --git a/include/fenv.h b/include/fenv.h
index 1f30baa01659ab85b508c5d597cc7f7ff5b4dcf2..c496d10f48df7cdc92e633550943d7c36f2e7ea7 100644 (file)
--- a/include/fenv.h
+++ b/include/fenv.h
@@ -15,6 +15,7 @@ extern int __fesetenv (const fenv_t *__envp);
 extern int __feupdateenv (const fenv_t *__envp);
 extern __typeof (fegetround) __fegetround;
 extern __typeof (feholdexcept) __feholdexcept;
+extern __typeof (fesetround) __fesetround;
 
 libm_hidden_proto (feraiseexcept)
 libm_hidden_proto (__feraiseexcept)
@@ -25,6 +26,7 @@ libm_hidden_proto (__fegetround)
 libm_hidden_proto (fesetenv)
 libm_hidden_proto (__fesetenv)
 libm_hidden_proto (fesetround)
+libm_hidden_proto (__fesetround)
 libm_hidden_proto (feholdexcept)
 libm_hidden_proto (__feholdexcept)
 libm_hidden_proto (feupdateenv)

diff --git a/math/fesetround.c b/math/fesetround.c
index 0c11cae3de0bbf27dc0955f157fa070a730d98f9..52a811b70531e7212f03dafd2474217c783eefe8 100644 (file)
--- a/math/fesetround.c
+++ b/math/fesetround.c
@@ -20,7 +20,7 @@
 #include <fenv.h>
 
 int
-fesetround (int round)
+__fesetround (int round)
 {
 #ifdef FE_TONEAREST
   return (round == FE_TONEAREST) ? 0 : 1;
@@ -28,5 +28,7 @@ fesetround (int round)
   return 1;    /* Signal we are unable to set the direction.  */
 #endif
 }
-libm_hidden_def (fesetround)
+libm_hidden_def (__fesetround)
+weak_alias (__fesetround, fesetround)
+libm_hidden_weak (fesetround)
 stub_warning (fesetround)

diff --git a/sysdeps/aarch64/fpu/fesetround.c b/sysdeps/aarch64/fpu/fesetround.c
index 915cdd310034ed207b0a5f12d231e4a9546e6a84..257dba13dba6a0be2ce3fd38e22dadee8336da0d 100644 (file)
--- a/sysdeps/aarch64/fpu/fesetround.c
+++ b/sysdeps/aarch64/fpu/fesetround.c
@@ -21,7 +21,7 @@
 #include <fpu_control.h>
 
 int
-fesetround (int round)
+__fesetround (int round)
 {
   if (round & ~_FPU_FPCR_RM_MASK)
     return 1;
@@ -29,4 +29,6 @@ fesetround (int round)
   libc_fesetround_aarch64 (round);
   return 0;
 }
-libm_hidden_def (fesetround)
+libm_hidden_def (__fesetround)
+weak_alias (__fesetround, fesetround)
+libm_hidden_weak (fesetround)

diff --git a/sysdeps/alpha/fpu/fesetround.c b/sysdeps/alpha/fpu/fesetround.c
index b0c8a01de708de56413e07774484d860716dd644..c17b005ede258e0c1244c3b1e0662885be9a20ca 100644 (file)
--- a/sysdeps/alpha/fpu/fesetround.c
+++ b/sysdeps/alpha/fpu/fesetround.c
@@ -20,7 +20,7 @@
 #include <fenv_libc.h>
 
 int
-fesetround (int round)
+__fesetround (int round)
 {
   unsigned long fpcr;
 
@@ -39,4 +39,6 @@ fesetround (int round)
 
   return 0;
 }
-libm_hidden_def (fesetround)
+libm_hidden_def (__fesetround)
+weak_alias (__fesetround, fesetround)
+libm_hidden_weak (fesetround)

diff --git a/sysdeps/arm/fesetround.c b/sysdeps/arm/fesetround.c
index f6a7c794e4f00d2c28044f7816e79ba0a4079dd3..412311c79b182aa032514fe53306d419c45260ea 100644 (file)
--- a/sysdeps/arm/fesetround.c
+++ b/sysdeps/arm/fesetround.c
@@ -21,7 +21,7 @@
 
 
 int
-fesetround (int round)
+__fesetround (int round)
 {
   /* FE_TONEAREST is the only supported rounding mode
      if a VFP unit isn't present.  */
@@ -34,4 +34,6 @@ fesetround (int round)
   libc_fesetround_vfp (round);
   return 0;
 }
-libm_hidden_def (fesetround)
+libm_hidden_def (__fesetround)
+weak_alias (__fesetround, fesetround)
+libm_hidden_weak (fesetround)

diff --git a/sysdeps/generic/math_private.h b/sysdeps/generic/math_private.h
index 3d987383e9ab6f3d8972e69f6c2692b9f961502c..24e2babd61701483f7dea042832c078b630ca2e2 100644 (file)
--- a/sysdeps/generic/math_private.h
+++ b/sysdeps/generic/math_private.h
@@ -415,7 +415,7 @@ default_libc_feholdexcept (fenv_t *e)
 static __always_inline void
 default_libc_fesetround (int r)
 {
-  (void) fesetround (r);
+  (void) __fesetround (r);
 }
 
 #ifndef libc_fesetround
@@ -432,7 +432,7 @@ static __always_inline void
 default_libc_feholdexcept_setround (fenv_t *e, int r)
 {
   __feholdexcept (e);
-  fesetround (r);
+  __fesetround (r);
 }
 
 #ifndef libc_feholdexcept_setround
@@ -599,7 +599,7 @@ libc_feholdsetround_ctx (struct rm_ctx *ctx, int round)
     {
       ctx->updated_status = true;
       __fegetenv (&ctx->env);
-      fesetround (round);
+      __fesetround (round);
     }
 }
 
@@ -619,7 +619,7 @@ libc_feholdsetround_noex_ctx (struct rm_ctx *ctx, int round)
 
   /* Update rounding mode only if different.  */
   if (__glibc_unlikely (round != get_rounding_mode ()))
-    fesetround (round);
+    __fesetround (round);
 }
 
 static __always_inline void

diff --git a/sysdeps/hppa/fpu/fesetround.c b/sysdeps/hppa/fpu/fesetround.c
index 297a62a6bddcc0d183b5127ae99cfb353ed09481..414ef9192fb5ebbc8c816bd687a2651f805669d6 100644 (file)
--- a/sysdeps/hppa/fpu/fesetround.c
+++ b/sysdeps/hppa/fpu/fesetround.c
@@ -20,7 +20,7 @@
 #include <fenv.h>
 
 int
-fesetround (int round)
+__fesetround (int round)
 {
   union { unsigned long long l; unsigned int sw[2]; } s;
 
@@ -37,4 +37,6 @@ fesetround (int round)
   return 0;
 }
 
-libm_hidden_def (fesetround)
+libm_hidden_def (__fesetround)
+weak_alias (__fesetround, fesetround)
+libm_hidden_weak (fesetround)

diff --git a/sysdeps/i386/fpu/fesetround.c b/sysdeps/i386/fpu/fesetround.c
index 3a5b7755b204e78f8ebcb88ce9387ddb21f95ac2..69f8b3efbd1cd5c9acd1a2c7758c5f20031cbe4c 100644 (file)
--- a/sysdeps/i386/fpu/fesetround.c
+++ b/sysdeps/i386/fpu/fesetround.c
@@ -23,7 +23,7 @@
 #include <dl-procinfo.h>
 
 int
-fesetround (int round)
+__fesetround (int round)
 {
   unsigned short int cw;
 
@@ -49,4 +49,6 @@ fesetround (int round)
 
   return 0;
 }
-libm_hidden_def (fesetround)
+libm_hidden_def (__fesetround)
+weak_alias (__fesetround, fesetround)
+libm_hidden_weak (fesetround)

diff --git a/sysdeps/ia64/fpu/fesetround.c b/sysdeps/ia64/fpu/fesetround.c
index 383e1c5b892e045ba18247869683361190f11f6e..7fce0f70449fd4eb43e0277c0eebdf0944c39d39 100644 (file)
--- a/sysdeps/ia64/fpu/fesetround.c
+++ b/sysdeps/ia64/fpu/fesetround.c
@@ -20,7 +20,7 @@
 #include <fenv.h>
 
 int
-fesetround (int round)
+__fesetround (int round)
 {
   fenv_t fpsr;
 
@@ -38,4 +38,6 @@ fesetround (int round)
 
   return 0;
 }
-libm_hidden_def (fesetround)
+libm_hidden_def (__fesetround)
+weak_alias (__fesetround, fesetround)
+libm_hidden_weak (fesetround)

diff --git a/sysdeps/m68k/fpu/fesetround.c b/sysdeps/m68k/fpu/fesetround.c
index b55ff156d435016c1a54db2a5c6be4185de2ff0a..9e6f4346c5968fba485fab253406c90adec558ef 100644 (file)
--- a/sysdeps/m68k/fpu/fesetround.c
+++ b/sysdeps/m68k/fpu/fesetround.c
@@ -20,7 +20,7 @@
 #include <fenv.h>
 
 int
-fesetround (int round)
+__fesetround (int round)
 {
   fexcept_t fpcr;
 
@@ -35,4 +35,6 @@ fesetround (int round)
 
   return 0;
 }
-libm_hidden_def (fesetround);
+libm_hidden_def (__fesetround)
+weak_alias (__fesetround, fesetround)
+libm_hidden_weak (fesetround)

diff --git a/sysdeps/mips/fpu/fesetround.c b/sysdeps/mips/fpu/fesetround.c
index 929d373c24a59019de40155057ce5b18e8e79b6a..61892542a37e6bda6763100899d0bef48fead63a 100644 (file)
--- a/sysdeps/mips/fpu/fesetround.c
+++ b/sysdeps/mips/fpu/fesetround.c
@@ -21,7 +21,7 @@
 #include <fpu_control.h>
 
 int
-fesetround (int round)
+__fesetround (int round)
 {
   fpu_control_t cw;
 
@@ -41,4 +41,6 @@ fesetround (int round)
   return 0;
 }
 
-libm_hidden_def (fesetround)
+libm_hidden_def (__fesetround)
+weak_alias (__fesetround, fesetround)
+libm_hidden_weak (fesetround)

diff --git a/sysdeps/powerpc/fpu/fenv_libc.h b/sysdeps/powerpc/fpu/fenv_libc.h
index c52310ca2f9a66baed439ef1b91cd63813328912..9118d6f4ab1758ca9a6070734986dc6878500643 100644 (file)
--- a/sysdeps/powerpc/fpu/fenv_libc.h
+++ b/sysdeps/powerpc/fpu/fenv_libc.h
@@ -76,7 +76,7 @@ typedef union
 
 
 static inline int
-__fesetround (int round)
+__fesetround_inline (int round)
 {
   if ((unsigned int) round < 2)
     {

diff --git a/sysdeps/powerpc/fpu/fenv_private.h b/sysdeps/powerpc/fpu/fenv_private.h
index 37f629f9657d7b023fb61263f089a314b194e0f3..a87c95cdc91e97005c532a68965d232dd0d8aa25 100644 (file)
--- a/sysdeps/powerpc/fpu/fenv_private.h
+++ b/sysdeps/powerpc/fpu/fenv_private.h
@@ -57,7 +57,7 @@ libc_feholdexcept_ppc (fenv_t *envp)
 static __always_inline void
 libc_fesetround_ppc (int r)
 {
-  __fesetround (r);
+  __fesetround_inline (r);
 }
 
 static __always_inline void

diff --git a/sysdeps/powerpc/fpu/fesetround.c b/sysdeps/powerpc/fpu/fesetround.c
index 99404c9c11b6e8ad5fa31cca1c5e78a223ea7c23..2191852a36ad07a09b7dd8dd46f2383789ee146a 100644 (file)
--- a/sysdeps/powerpc/fpu/fesetround.c
+++ b/sysdeps/powerpc/fpu/fesetround.c
@@ -21,11 +21,13 @@
 
 #undef fesetround
 int
-fesetround (int round)
+__fesetround (int round)
 {
   if ((unsigned int) round > 3)
     return 1;
   else
-    return __fesetround(round);
+    return __fesetround_inline(round);
 }
-libm_hidden_def (fesetround)
+libm_hidden_def (__fesetround)
+weak_alias (__fesetround, fesetround)
+libm_hidden_weak (fesetround)

diff --git a/sysdeps/powerpc/nofpu/fesetround.c b/sysdeps/powerpc/nofpu/fesetround.c
index c62637f3aaf93b9228840fb06bd84ba768f8e4ed..96b387deb7975cc76e60ae852005b033a113fd5f 100644 (file)
--- a/sysdeps/powerpc/nofpu/fesetround.c
+++ b/sysdeps/powerpc/nofpu/fesetround.c
@@ -21,7 +21,7 @@
 #include "soft-supp.h"
 
 int
-fesetround (int round)
+__fesetround (int round)
 {
   if ((unsigned int) round > FE_DOWNWARD)
     return 1;
@@ -31,4 +31,6 @@ fesetround (int round)
 
   return 0;
 }
-libm_hidden_def (fesetround)
+libm_hidden_def (__fesetround)
+weak_alias (__fesetround, fesetround)
+libm_hidden_weak (fesetround)

diff --git a/sysdeps/powerpc/powerpc32/e500/nofpu/fesetround.c b/sysdeps/powerpc/powerpc32/e500/nofpu/fesetround.c
index 64b567541132bdc24885d30e4a6003d36f580cf4..f1e57eb47e44616894857ea6159ac9002aa4f364 100644 (file)
--- a/sysdeps/powerpc/powerpc32/e500/nofpu/fesetround.c
+++ b/sysdeps/powerpc/powerpc32/e500/nofpu/fesetround.c
@@ -19,7 +19,7 @@
 #include <fenv_libc.h>
 
 int
-fesetround (int round)
+__fesetround (int round)
 {
   unsigned long fpescr;
 
@@ -32,4 +32,6 @@ fesetround (int round)
 
   return 0;
 }
-libm_hidden_def (fesetround)
+libm_hidden_def (__fesetround)
+weak_alias (__fesetround, fesetround)
+libm_hidden_weak (fesetround)

diff --git a/sysdeps/s390/fpu/fesetround.c b/sysdeps/s390/fpu/fesetround.c
index 91b1a3c7535a3686803f90e70736e68b0e1537aa..d6eedcee002dad5f26cf28bcf57b4bee3791f28f 100644 (file)
--- a/sysdeps/s390/fpu/fesetround.c
+++ b/sysdeps/s390/fpu/fesetround.c
@@ -21,7 +21,7 @@
 #include <fpu_control.h>
 
 int
-fesetround (int round)
+__fesetround (int round)
 {
   if ((round|FPC_RM_MASK) != FPC_RM_MASK)
     {
@@ -34,4 +34,6 @@ fesetround (int round)
 
   return 0;
 }
-libm_hidden_def (fesetround)
+libm_hidden_def (__fesetround)
+weak_alias (__fesetround, fesetround)
+libm_hidden_weak (fesetround)

diff --git a/sysdeps/sh/sh4/fpu/fesetround.c b/sysdeps/sh/sh4/fpu/fesetround.c
index 2f7e5f73c0b5ef028775c47381e813ce06a3cbc9..0f8213e39217ecb0f14e992491ccf9db5edd59bd 100644 (file)
--- a/sysdeps/sh/sh4/fpu/fesetround.c
+++ b/sysdeps/sh/sh4/fpu/fesetround.c
@@ -21,7 +21,7 @@
 #include <fpu_control.h>
 
 int
-fesetround (int round)
+__fesetround (int round)
 {
   fpu_control_t cw;
 
@@ -40,4 +40,6 @@ fesetround (int round)
 
   return 0;
 }
-libm_hidden_def (fesetround)
+libm_hidden_def (__fesetround)
+weak_alias (__fesetround, fesetround)
+libm_hidden_weak (fesetround)

diff --git a/sysdeps/sparc/fpu/fesetround.c b/sysdeps/sparc/fpu/fesetround.c
index 1ab033a86fb7f674b098b00bb26ca98ee823c1fe..b01447ca7f4b7264be9a836194fec63feb3a2900 100644 (file)
--- a/sysdeps/sparc/fpu/fesetround.c
+++ b/sysdeps/sparc/fpu/fesetround.c
@@ -19,7 +19,7 @@
 #include <fenv.h>
 
 int
-fesetround (int round)
+__fesetround (int round)
 {
   fenv_t tmp;
 
@@ -34,4 +34,6 @@ fesetround (int round)
 
   return 0;
 }
-libm_hidden_def (fesetround)
+libm_hidden_def (__fesetround)
+weak_alias (__fesetround, fesetround)
+libm_hidden_weak (fesetround)

diff --git a/sysdeps/tile/math_private.h b/sysdeps/tile/math_private.h
index 8ff1435f17e4732ecc34b75a9666c780c79b484e..b06e3a321d9cef6ad8a93f7db8b6a7e3002a319c 100644 (file)
--- a/sysdeps/tile/math_private.h
+++ b/sysdeps/tile/math_private.h
@@ -37,5 +37,6 @@ extern inline int feupdateenv (const fenv_t *__e) { return 0; }
 extern inline int fegetround (void)            { return FE_TONEAREST; }
 extern inline int __fegetround (void)          { return FE_TONEAREST; }
 extern inline int fesetround (int __d)         { return 0; }
+extern inline int __fesetround (int __d)       { return 0; }
 
 #endif

diff --git a/sysdeps/x86_64/fpu/fesetround.c b/sysdeps/x86_64/fpu/fesetround.c
index 9cd5d75a86a2fc3ce68b34962933b625ee65cbeb..2a9c351142a159655d98b5bc2942e741f9edd53d 100644 (file)
--- a/sysdeps/x86_64/fpu/fesetround.c
+++ b/sysdeps/x86_64/fpu/fesetround.c
@@ -19,7 +19,7 @@
 #include <fenv.h>
 
 int
-fesetround (int round)
+__fesetround (int round)
 {
   unsigned short int cw;
   int mxcsr;
@@ -43,4 +43,6 @@ fesetround (int round)
 
   return 0;
 }
-libm_hidden_def (fesetround)
+libm_hidden_def (__fesetround)
+weak_alias (__fesetround, fesetround)
+libm_hidden_weak (fesetround)