aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog27
-rw-r--r--include/fenv.h2
-rw-r--r--math/feholdexcpt.c6
-rw-r--r--sysdeps/aarch64/fpu/feholdexcpt.c6
-rw-r--r--sysdeps/alpha/fpu/feholdexcpt.c6
-rw-r--r--sysdeps/arm/feholdexcpt.c6
-rw-r--r--sysdeps/generic/math_private.h4
-rw-r--r--sysdeps/hppa/fpu/feholdexcpt.c6
-rw-r--r--sysdeps/i386/fpu/feholdexcpt.c6
-rw-r--r--sysdeps/ia64/fpu/feholdexcpt.c6
-rw-r--r--sysdeps/m68k/fpu/feholdexcpt.c6
-rw-r--r--sysdeps/mips/fpu/feholdexcpt.c6
-rw-r--r--sysdeps/powerpc/fpu/feholdexcpt.c6
-rw-r--r--sysdeps/powerpc/nofpu/feholdexcpt.c6
-rw-r--r--sysdeps/powerpc/powerpc32/e500/nofpu/feholdexcpt.c6
-rw-r--r--sysdeps/s390/fpu/feholdexcpt.c6
-rw-r--r--sysdeps/sh/sh4/fpu/feholdexcpt.c6
-rw-r--r--sysdeps/sparc/fpu/feholdexcpt.c6
-rw-r--r--sysdeps/x86_64/fpu/feholdexcpt.c6
19 files changed, 95 insertions, 34 deletions
diff --git a/ChangeLog b/ChangeLog
index 2afd2b297e..ecb3b44839 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2015-01-05 Joseph Myers <joseph@codesourcery.com>
+
+ [BZ #17748]
+ * include/fenv.h (__feholdexcept): Declare. Use
+ libm_hidden_proto.
+ * math/feholdexcpt.c (feholdexcept): Rename to __feholdexcept and
+ define as weak alias of __feholdexcept. Use libm_hidden_weak.
+ * sysdeps/aarch64/fpu/feholdexcpt.c (feholdexcept): Likewise.
+ * sysdeps/alpha/fpu/feholdexcpt.c (feholdexcept): Likewise.
+ * sysdeps/arm/feholdexcpt.c (feholdexcept): Likewise.
+ * sysdeps/hppa/fpu/feholdexcpt.c (feholdexcept): Likewise.
+ * sysdeps/i386/fpu/feholdexcpt.c (feholdexcept): Likewise.
+ * sysdeps/ia64/fpu/feholdexcpt.c (feholdexcept): Likewise.
+ * sysdeps/m68k/fpu/feholdexcpt.c (feholdexcept): Likewise.
+ * sysdeps/mips/fpu/feholdexcpt.c (feholdexcept): Likewise.
+ * sysdeps/powerpc/fpu/feholdexcpt.c (feholdexcept): Likewise.
+ * sysdeps/powerpc/nofpu/feholdexcpt.c (feholdexcept): Likewise.
+ * sysdeps/powerpc/powerpc32/e500/nofpu/feholdexcpt.c
+ (feholdexcept): Likewise.
+ * sysdeps/s390/fpu/feholdexcpt.c (feholdexcept): Likewise.
+ * sysdeps/sh/sh4/fpu/feholdexcpt.c (feholdexcept): Likewise.
+ * sysdeps/sparc/fpu/feholdexcpt.c (feholdexcept): Likewise.
+ * sysdeps/x86_64/fpu/feholdexcpt.c (feholdexcept): Likewise.
+ * sysdeps/generic/math_private.h (default_libc_feholdexcept): Use
+ __feholdexcept instead of feholdexcept.
+ (default_libc_feholdexcept_setround): Likewise.
+
2015-01-05 Steve Ellcey <sellcey@imgtec.com>
* sysdeps/mips/memcpy.S: Add support for mips32r6/mips64r6.
diff --git a/include/fenv.h b/include/fenv.h
index b29b246089..0a74fa02fe 100644
--- a/include/fenv.h
+++ b/include/fenv.h
@@ -14,6 +14,7 @@ extern int __fegetenv (fenv_t *__envp);
extern int __fesetenv (const fenv_t *__envp);
extern int __feupdateenv (const fenv_t *__envp);
extern __typeof (fegetround) __fegetround;
+extern __typeof (feholdexcept) __feholdexcept;
libm_hidden_proto (feraiseexcept)
libm_hidden_proto (__feraiseexcept)
@@ -24,6 +25,7 @@ libm_hidden_proto (__fegetround)
libm_hidden_proto (fesetenv)
libm_hidden_proto (fesetround)
libm_hidden_proto (feholdexcept)
+libm_hidden_proto (__feholdexcept)
libm_hidden_proto (feupdateenv)
libm_hidden_proto (fetestexcept)
libm_hidden_proto (feclearexcept)
diff --git a/math/feholdexcpt.c b/math/feholdexcpt.c
index c107daf222..53cb13cb49 100644
--- a/math/feholdexcpt.c
+++ b/math/feholdexcpt.c
@@ -20,10 +20,12 @@
#include <fenv.h>
int
-feholdexcept (fenv_t *envp)
+__feholdexcept (fenv_t *envp)
{
/* No exception traps to disable and no state to save. */
return 0;
}
-libm_hidden_def (feholdexcept)
+libm_hidden_def (__feholdexcept)
+weak_alias (__feholdexcept, feholdexcept)
+libm_hidden_weak (feholdexcept)
stub_warning (feholdexcept)
diff --git a/sysdeps/aarch64/fpu/feholdexcpt.c b/sysdeps/aarch64/fpu/feholdexcpt.c
index 41988045d5..6c2e3f90d1 100644
--- a/sysdeps/aarch64/fpu/feholdexcpt.c
+++ b/sysdeps/aarch64/fpu/feholdexcpt.c
@@ -20,9 +20,11 @@
#include <math_private.h>
int
-feholdexcept (fenv_t *envp)
+__feholdexcept (fenv_t *envp)
{
libc_feholdexcept_aarch64 (envp);
return 0;
}
-libm_hidden_def (feholdexcept)
+libm_hidden_def (__feholdexcept)
+weak_alias (__feholdexcept, feholdexcept)
+libm_hidden_weak (feholdexcept)
diff --git a/sysdeps/alpha/fpu/feholdexcpt.c b/sysdeps/alpha/fpu/feholdexcpt.c
index 0cb28da5a0..d226046858 100644
--- a/sysdeps/alpha/fpu/feholdexcpt.c
+++ b/sysdeps/alpha/fpu/feholdexcpt.c
@@ -20,7 +20,7 @@
#include <fenv_libc.h>
int
-feholdexcept (fenv_t *envp)
+__feholdexcept (fenv_t *envp)
{
/* Save the current state. */
fegetenv(envp);
@@ -30,4 +30,6 @@ feholdexcept (fenv_t *envp)
return 0;
}
-libm_hidden_def (feholdexcept)
+libm_hidden_def (__feholdexcept)
+weak_alias (__feholdexcept, feholdexcept)
+libm_hidden_weak (feholdexcept)
diff --git a/sysdeps/arm/feholdexcpt.c b/sysdeps/arm/feholdexcpt.c
index ed7fc5f60c..9d4a72425c 100644
--- a/sysdeps/arm/feholdexcpt.c
+++ b/sysdeps/arm/feholdexcpt.c
@@ -21,7 +21,7 @@
int
-feholdexcept (fenv_t *envp)
+__feholdexcept (fenv_t *envp)
{
/* Fail if a VFP unit isn't present. */
if (!ARM_HAVE_VFP)
@@ -30,4 +30,6 @@ feholdexcept (fenv_t *envp)
libc_feholdexcept_vfp (envp);
return 0;
}
-libm_hidden_def (feholdexcept)
+libm_hidden_def (__feholdexcept)
+weak_alias (__feholdexcept, feholdexcept)
+libm_hidden_weak (feholdexcept)
diff --git a/sysdeps/generic/math_private.h b/sysdeps/generic/math_private.h
index 2b07f20a6f..3a080d8721 100644
--- a/sysdeps/generic/math_private.h
+++ b/sysdeps/generic/math_private.h
@@ -399,7 +399,7 @@ extern long double __gamma_productl (long double x, long double x_eps,
static __always_inline void
default_libc_feholdexcept (fenv_t *e)
{
- (void) feholdexcept (e);
+ (void) __feholdexcept (e);
}
#ifndef libc_feholdexcept
@@ -431,7 +431,7 @@ default_libc_fesetround (int r)
static __always_inline void
default_libc_feholdexcept_setround (fenv_t *e, int r)
{
- feholdexcept (e);
+ __feholdexcept (e);
fesetround (r);
}
diff --git a/sysdeps/hppa/fpu/feholdexcpt.c b/sysdeps/hppa/fpu/feholdexcpt.c
index da2f586c5d..94eba37441 100644
--- a/sysdeps/hppa/fpu/feholdexcpt.c
+++ b/sysdeps/hppa/fpu/feholdexcpt.c
@@ -21,7 +21,7 @@
#include <string.h>
int
-feholdexcept (fenv_t *envp)
+__feholdexcept (fenv_t *envp)
{
union { unsigned long long buf[4]; fenv_t env; } clear;
unsigned long long *bufptr;
@@ -50,4 +50,6 @@ feholdexcept (fenv_t *envp)
return 0;
}
-libm_hidden_def (feholdexcept)
+libm_hidden_def (__feholdexcept)
+weak_alias (__feholdexcept, feholdexcept)
+libm_hidden_weak (feholdexcept)
diff --git a/sysdeps/i386/fpu/feholdexcpt.c b/sysdeps/i386/fpu/feholdexcpt.c
index 7890248baf..f6db2badbb 100644
--- a/sysdeps/i386/fpu/feholdexcpt.c
+++ b/sysdeps/i386/fpu/feholdexcpt.c
@@ -23,7 +23,7 @@
#include <dl-procinfo.h>
int
-feholdexcept (fenv_t *envp)
+__feholdexcept (fenv_t *envp)
{
/* Store the environment. Recall that fnstenv has a side effect of
masking all exceptions. Then clear all exceptions. */
@@ -45,4 +45,6 @@ feholdexcept (fenv_t *envp)
return 0;
}
-libm_hidden_def (feholdexcept)
+libm_hidden_def (__feholdexcept)
+weak_alias (__feholdexcept, feholdexcept)
+libm_hidden_weak (feholdexcept)
diff --git a/sysdeps/ia64/fpu/feholdexcpt.c b/sysdeps/ia64/fpu/feholdexcpt.c
index f2738ceb34..6b3d69ab3c 100644
--- a/sysdeps/ia64/fpu/feholdexcpt.c
+++ b/sysdeps/ia64/fpu/feholdexcpt.c
@@ -20,7 +20,7 @@
#include <fenv.h>
int
-feholdexcept (fenv_t *envp)
+__feholdexcept (fenv_t *envp)
{
fenv_t fpsr;
/* Save the current state. */
@@ -38,4 +38,6 @@ feholdexcept (fenv_t *envp)
/* Success. */
return 0;
}
-libm_hidden_def (feholdexcept)
+libm_hidden_def (__feholdexcept)
+weak_alias (__feholdexcept, feholdexcept)
+libm_hidden_weak (feholdexcept)
diff --git a/sysdeps/m68k/fpu/feholdexcpt.c b/sysdeps/m68k/fpu/feholdexcpt.c
index 4ebbb0c26b..db33c94d78 100644
--- a/sysdeps/m68k/fpu/feholdexcpt.c
+++ b/sysdeps/m68k/fpu/feholdexcpt.c
@@ -20,7 +20,7 @@
#include <fenv.h>
int
-feholdexcept (fenv_t *envp)
+__feholdexcept (fenv_t *envp)
{
fexcept_t fpcr, fpsr;
@@ -42,4 +42,6 @@ feholdexcept (fenv_t *envp)
return 0;
}
-libm_hidden_def (feholdexcept);
+libm_hidden_def (__feholdexcept)
+weak_alias (__feholdexcept, feholdexcept)
+libm_hidden_weak (feholdexcept)
diff --git a/sysdeps/mips/fpu/feholdexcpt.c b/sysdeps/mips/fpu/feholdexcpt.c
index 911bbe33ec..69e34e8a30 100644
--- a/sysdeps/mips/fpu/feholdexcpt.c
+++ b/sysdeps/mips/fpu/feholdexcpt.c
@@ -21,7 +21,7 @@
#include <fpu_control.h>
int
-feholdexcept (fenv_t *envp)
+__feholdexcept (fenv_t *envp)
{
fpu_control_t cw;
@@ -36,4 +36,6 @@ feholdexcept (fenv_t *envp)
return 0;
}
-libm_hidden_def (feholdexcept)
+libm_hidden_def (__feholdexcept)
+weak_alias (__feholdexcept, feholdexcept)
+libm_hidden_weak (feholdexcept)
diff --git a/sysdeps/powerpc/fpu/feholdexcpt.c b/sysdeps/powerpc/fpu/feholdexcpt.c
index 080e587a59..f556d6d041 100644
--- a/sysdeps/powerpc/fpu/feholdexcpt.c
+++ b/sysdeps/powerpc/fpu/feholdexcpt.c
@@ -21,7 +21,7 @@
#define _FPU_MASK_ALL (_FPU_MASK_ZM | _FPU_MASK_OM | _FPU_MASK_UM | _FPU_MASK_XM | _FPU_MASK_IM)
int
-feholdexcept (fenv_t *envp)
+__feholdexcept (fenv_t *envp)
{
fenv_union_t old, new;
@@ -46,4 +46,6 @@ feholdexcept (fenv_t *envp)
return 0;
}
-libm_hidden_def (feholdexcept)
+libm_hidden_def (__feholdexcept)
+weak_alias (__feholdexcept, feholdexcept)
+libm_hidden_weak (feholdexcept)
diff --git a/sysdeps/powerpc/nofpu/feholdexcpt.c b/sysdeps/powerpc/nofpu/feholdexcpt.c
index dc14c07c7f..5bb18a82a9 100644
--- a/sysdeps/powerpc/nofpu/feholdexcpt.c
+++ b/sysdeps/powerpc/nofpu/feholdexcpt.c
@@ -22,7 +22,7 @@
#include "soft-supp.h"
int
-feholdexcept (fenv_t *envp)
+__feholdexcept (fenv_t *envp)
{
fenv_union_t u;
@@ -40,4 +40,6 @@ feholdexcept (fenv_t *envp)
return 0;
}
-libm_hidden_def (feholdexcept)
+libm_hidden_def (__feholdexcept)
+weak_alias (__feholdexcept, feholdexcept)
+libm_hidden_weak (feholdexcept)
diff --git a/sysdeps/powerpc/powerpc32/e500/nofpu/feholdexcpt.c b/sysdeps/powerpc/powerpc32/e500/nofpu/feholdexcpt.c
index 7a59eccff9..158f91e477 100644
--- a/sysdeps/powerpc/powerpc32/e500/nofpu/feholdexcpt.c
+++ b/sysdeps/powerpc/powerpc32/e500/nofpu/feholdexcpt.c
@@ -22,7 +22,7 @@
#include <sys/prctl.h>
int
-feholdexcept (fenv_t *envp)
+__feholdexcept (fenv_t *envp)
{
fenv_union_t u;
INTERNAL_SYSCALL_DECL (err);
@@ -54,4 +54,6 @@ feholdexcept (fenv_t *envp)
return 0;
}
-libm_hidden_def (feholdexcept)
+libm_hidden_def (__feholdexcept)
+weak_alias (__feholdexcept, feholdexcept)
+libm_hidden_weak (feholdexcept)
diff --git a/sysdeps/s390/fpu/feholdexcpt.c b/sysdeps/s390/fpu/feholdexcpt.c
index 721d3814c9..1cbe4b1f58 100644
--- a/sysdeps/s390/fpu/feholdexcpt.c
+++ b/sysdeps/s390/fpu/feholdexcpt.c
@@ -20,7 +20,7 @@
#include <fenv_libc.h>
#include <fpu_control.h>
-int feholdexcept (fenv_t *envp)
+int __feholdexcept (fenv_t *envp)
{
fexcept_t fpc;
/* Store the environment. */
@@ -32,4 +32,6 @@ int feholdexcept (fenv_t *envp)
_FPU_SETCW ((fpc & ~(FE_ALL_EXCEPT << FPC_EXCEPTION_MASK_SHIFT)));
return 0;
}
-libm_hidden_def (feholdexcept)
+libm_hidden_def (__feholdexcept)
+weak_alias (__feholdexcept, feholdexcept)
+libm_hidden_weak (feholdexcept)
diff --git a/sysdeps/sh/sh4/fpu/feholdexcpt.c b/sysdeps/sh/sh4/fpu/feholdexcpt.c
index 47b8c1ee9c..b2d7ed2f0f 100644
--- a/sysdeps/sh/sh4/fpu/feholdexcpt.c
+++ b/sysdeps/sh/sh4/fpu/feholdexcpt.c
@@ -20,7 +20,7 @@
#include <fpu_control.h>
int
-feholdexcept (fenv_t *envp)
+__feholdexcept (fenv_t *envp)
{
fpu_control_t temp;
@@ -39,4 +39,6 @@ feholdexcept (fenv_t *envp)
/* Success. */
return 0;
}
-libm_hidden_def (feholdexcept)
+libm_hidden_def (__feholdexcept)
+weak_alias (__feholdexcept, feholdexcept)
+libm_hidden_weak (feholdexcept)
diff --git a/sysdeps/sparc/fpu/feholdexcpt.c b/sysdeps/sparc/fpu/feholdexcpt.c
index 0fef47ae87..4c9ac07ce7 100644
--- a/sysdeps/sparc/fpu/feholdexcpt.c
+++ b/sysdeps/sparc/fpu/feholdexcpt.c
@@ -19,7 +19,7 @@
#include <fenv.h>
int
-feholdexcept (fenv_t *envp)
+__feholdexcept (fenv_t *envp)
{
fenv_t tmp;
@@ -32,4 +32,6 @@ feholdexcept (fenv_t *envp)
return 0;
}
-libm_hidden_def (feholdexcept)
+libm_hidden_def (__feholdexcept)
+weak_alias (__feholdexcept, feholdexcept)
+libm_hidden_weak (feholdexcept)
diff --git a/sysdeps/x86_64/fpu/feholdexcpt.c b/sysdeps/x86_64/fpu/feholdexcpt.c
index 010521c981..615b702135 100644
--- a/sysdeps/x86_64/fpu/feholdexcpt.c
+++ b/sysdeps/x86_64/fpu/feholdexcpt.c
@@ -19,7 +19,7 @@
#include <fenv.h>
int
-feholdexcept (fenv_t *envp)
+__feholdexcept (fenv_t *envp)
{
unsigned int mxcsr;
@@ -36,4 +36,6 @@ feholdexcept (fenv_t *envp)
return 0;
}
-libm_hidden_def (feholdexcept)
+libm_hidden_def (__feholdexcept)
+weak_alias (__feholdexcept, feholdexcept)
+libm_hidden_weak (feholdexcept)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 20:15:13 +0000