diff options
44 files changed, 211 insertions, 71 deletions
@@ -1,3 +1,70 @@ +2014-12-30 Joseph Myers <joseph@codesourcery.com> + + [BZ #17723] + * include/fenv.h (__feraiseexcept): Use libm_hidden_proto. + * math/fraiseexcpt.c (__feraiseexcept): Use libm_hidden_def. + * sysdeps/aarch64/fpu/fraiseexcpt.c (feraiseexcept): Rename to + __feraiseexcept and define as weak alias of __feraiseexcept. Use + libm_hidden_weak. + * sysdeps/arm/fraiseexcpt.c (feraiseexcept): Likewise. + * sysdeps/hppa/fpu/fraiseexcpt.c (feraiseexcept): Likewise. + * sysdeps/i386/fpu/fraiseexcpt.c (__feraiseexcept): Use + libm_hidden_def. + * sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Rename to + __feraiseexcept and define as weak alias of __feraiseexcept. Use + libm_hidden_weak. + * sysdeps/m68k/coldfire/fpu/fraiseexcpt.c (feraiseexcept): + Likewise. + * sysdeps/microblaze/math_private.h (__feraiseexcept): New macro. + * sysdeps/mips/fpu/fraiseexcpt.c (feraiseexcept): Rename to + __feraiseexcept and define as weak alias of __feraiseexcept. Use + libm_hidden_weak. + * sysdeps/powerpc/fpu/fraiseexcpt.c (__feraiseexcept): Use + libm_hidden_def. + * sysdeps/powerpc/nofpu/fraiseexcpt.c (__feraiseexcept): Likewise. + * sysdeps/powerpc/powerpc32/e500/nofpu/fraiseexcpt.c + (__feraiseexcept): Likewise. + * sysdeps/s390/fpu/fraiseexcpt.c (feraiseexcept): Rename to + __feraiseexcept and define as weak alias of __feraiseexcept. Use + libm_hidden_weak. + * sysdeps/sh/sh4/fpu/fraiseexcpt.c (feraiseexcept): Likewise. + * sysdeps/sparc/fpu/fraiseexcpt.c (__feraiseexcept): Use + libm_hidden_def. + * sysdeps/tile/math_private.h (__feraiseexcept): New macro. + * sysdeps/unix/sysv/linux/alpha/fraiseexcpt.S (__feraiseexcept): + Use libm_hidden_def. + * sysdeps/x86_64/fpu/fraiseexcpt.c (__feraiseexcept): Use + libm_hidden_def. + (feraiseexcept): Define as weak not strong alias. Use + libm_hidden_weak. + * sysdeps/x86/fpu/bits/fenv.h (__feraiseexcept_invalid_divbyzero): + New inline function. Factored out of ... + (feraiseexcept): ... here. Use __feraiseexcept_invalid_divbyzero. + * sysdeps/x86/fpu/include/bits/fenv.h: New file. + * math/e_scalb.c (invalid_fn): Call __feraiseexcept instead of + feraiseexcept. + * math/w_acos.c (__acos): Likewise. + * math/w_asin.c (__asin): Likewise. + * math/w_ilogb.c (__ilogb): Likewise. + * math/w_j0.c (y0): Likewise. + * math/w_j1.c (y1): Likewise. + * math/w_jn.c (yn): Likewise. + * math/w_log.c (__log): Likewise. + * math/w_log10.c (__log10): Likewise. + * sysdeps/aarch64/fpu/feupdateenv.c (feupdateenv): Likewise. + * sysdeps/aarch64/fpu/math_private.h + (libc_feupdateenv_test_aarch64): Likewise. + * sysdeps/alpha/fpu/feupdateenv.c (__feupdateenv): Likewise. + * sysdeps/arm/fenv_private.h (libc_feupdateenv_test_vfp): Likewise. + * sysdeps/arm/feupdateenv.c (feupdateenv): Likewise. + * sysdeps/ia64/fpu/feupdateenv.c (feupdateenv): Likewise. + * sysdeps/m68k/fpu/feupdateenv.c (__feupdateenv): Likewise. + * sysdeps/mips/fpu/feupdateenv.c (feupdateenv): Likewise. + * sysdeps/powerpc/fpu/e_sqrt.c (__slow_ieee754_sqrt): Likewise. + * sysdeps/s390/fpu/feupdateenv.c (feupdateenv): Likewise. + * sysdeps/sh/sh4/fpu/feupdateenv.c (feupdateenv): Likewise. + * sysdeps/sparc/fpu/feupdateenv.c (__feupdateenv): Likewise. + 2014-12-30 H.J. Lu <hongjiu.lu@intel.com> [BZ #17732] @@ -15,7 +15,7 @@ Version 2.21 17522, 17555, 17570, 17571, 17572, 17573, 17574, 17581, 17582, 17583, 17584, 17585, 17589, 17594, 17601, 17608, 17616, 17625, 17630, 17633, 17634, 17647, 17653, 17657, 17664, 17665, 17668, 17682, 17717, 17719, - 17722, 17724, 17725, 17732, 17733, 17744, 17745, 17746, 17747. + 17722, 17723, 17724, 17725, 17732, 17733, 17744, 17745, 17746, 17747. * CVE-2104-7817 The wordexp function could ignore the WRDE_NOCMD flag under certain input conditions resulting in the execution of a shell for diff --git a/include/fenv.h b/include/fenv.h index bd2c99db96..0cfbacd4ab 100644 --- 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); libm_hidden_proto (feraiseexcept) +libm_hidden_proto (__feraiseexcept) libm_hidden_proto (fegetenv) libm_hidden_proto (fegetround) libm_hidden_proto (fesetenv) diff --git a/math/e_scalb.c b/math/e_scalb.c index 146d49e1c3..d315d57681 100644 --- a/math/e_scalb.c +++ b/math/e_scalb.c @@ -27,7 +27,7 @@ invalid_fn (double x, double fn) { if (__rint (fn) != fn) { - feraiseexcept (FE_INVALID); + __feraiseexcept (FE_INVALID); return __nan (""); } else if (fn > 65000.0) diff --git a/math/fraiseexcpt.c b/math/fraiseexcpt.c index 8809af997d..05caf0d187 100644 --- a/math/fraiseexcpt.c +++ b/math/fraiseexcpt.c @@ -30,6 +30,7 @@ __feraiseexcept (int excepts) strong_alias (__feraiseexcept, __old_feraiseexcept) compat_symbol (libm, __old_feraiseexcept, feraiseexcept, GLIBC_2_1); #endif +libm_hidden_def (__feraiseexcept) libm_hidden_ver (__feraiseexcept, feraiseexcept) versioned_symbol (libm, __feraiseexcept, feraiseexcept, GLIBC_2_2); diff --git a/math/w_acos.c b/math/w_acos.c index bb641092f0..e5e79dd2e0 100644 --- a/math/w_acos.c +++ b/math/w_acos.c @@ -29,7 +29,7 @@ __acos (double x) && _LIB_VERSION != _IEEE_) { /* acos(|x|>1) */ - feraiseexcept (FE_INVALID); + __feraiseexcept (FE_INVALID); return __kernel_standard (x, x, 1); } diff --git a/math/w_asin.c b/math/w_asin.c index 9bf9374ec8..2b744467cd 100644 --- a/math/w_asin.c +++ b/math/w_asin.c @@ -29,7 +29,7 @@ __asin (double x) && _LIB_VERSION != _IEEE_) { /* asin(|x|>1) */ - feraiseexcept (FE_INVALID); + __feraiseexcept (FE_INVALID); return __kernel_standard (x, x, 2); } diff --git a/math/w_ilogb.c b/math/w_ilogb.c index 9c0e264483..b2b3108a63 100644 --- a/math/w_ilogb.c +++ b/math/w_ilogb.c @@ -31,7 +31,7 @@ __ilogb (double x) || __builtin_expect (r == INT_MAX, 0)) { __set_errno (EDOM); - feraiseexcept (FE_INVALID); + __feraiseexcept (FE_INVALID); } return r; } diff --git a/math/w_j0.c b/math/w_j0.c index 92a834542a..1ed8c26f1c 100644 --- a/math/w_j0.c +++ b/math/w_j0.c @@ -47,13 +47,13 @@ y0 (double x) if (x < 0.0) { /* d = zero/(x-x) */ - feraiseexcept (FE_INVALID); + __feraiseexcept (FE_INVALID); return __kernel_standard (x, x, 9); } else if (x == 0.0) { /* d = -one/(x-x) */ - feraiseexcept (FE_DIVBYZERO); + __feraiseexcept (FE_DIVBYZERO); return __kernel_standard (x, x, 8); } else if (_LIB_VERSION != _POSIX_) diff --git a/math/w_j1.c b/math/w_j1.c index 37c6d1f4b5..63bac83389 100644 --- a/math/w_j1.c +++ b/math/w_j1.c @@ -47,13 +47,13 @@ y1 (double x) if (x < 0.0) { /* d = zero/(x-x) */ - feraiseexcept (FE_INVALID); + __feraiseexcept (FE_INVALID); return __kernel_standard (x, x, 11); } else if (x == 0.0) { /* d = -one/(x-x) */ - feraiseexcept (FE_DIVBYZERO); + __feraiseexcept (FE_DIVBYZERO); return __kernel_standard (x, x, 10); } else if (_LIB_VERSION != _POSIX_) diff --git a/math/w_jn.c b/math/w_jn.c index 56bd280b1e..fdd2dc70e8 100644 --- a/math/w_jn.c +++ b/math/w_jn.c @@ -47,13 +47,13 @@ yn (int n, double x) if (x < 0.0) { /* d = zero/(x-x) */ - feraiseexcept (FE_INVALID); + __feraiseexcept (FE_INVALID); return __kernel_standard (n, x, 13); } else if (x == 0.0) { /* d = -one/(x-x) */ - feraiseexcept (FE_DIVBYZERO); + __feraiseexcept (FE_DIVBYZERO); return __kernel_standard (n, x, 12); } else if (_LIB_VERSION != _POSIX_) diff --git a/math/w_log.c b/math/w_log.c index 8c90052094..4383e500b3 100644 --- a/math/w_log.c +++ b/math/w_log.c @@ -29,12 +29,12 @@ __log (double x) { if (x == 0.0) { - feraiseexcept (FE_DIVBYZERO); + __feraiseexcept (FE_DIVBYZERO); return __kernel_standard (x, x, 16); /* log(0) */ } else { - feraiseexcept (FE_INVALID); + __feraiseexcept (FE_INVALID); return __kernel_standard (x, x, 17); /* log(x<0) */ } } diff --git a/math/w_log10.c b/math/w_log10.c index 472d2a146d..a0a1843ba6 100644 --- a/math/w_log10.c +++ b/math/w_log10.c @@ -29,12 +29,12 @@ __log10 (double x) { if (x == 0.0) { - feraiseexcept (FE_DIVBYZERO); + __feraiseexcept (FE_DIVBYZERO); return __kernel_standard (x, x, 18); /* log10(0) */ } else { - feraiseexcept (FE_INVALID); + __feraiseexcept (FE_INVALID); return __kernel_standard (x, x, 19); /* log10(x<0) */ } } diff --git a/sysdeps/aarch64/fpu/feupdateenv.c b/sysdeps/aarch64/fpu/feupdateenv.c index ac2f6fe7f8..3c675c3a4e 100644 --- a/sysdeps/aarch64/fpu/feupdateenv.c +++ b/sysdeps/aarch64/fpu/feupdateenv.c @@ -45,7 +45,7 @@ feupdateenv (const fenv_t *envp) _FPU_SETFPSR (fpsr_new); if (excepts & (fpcr_new >> FE_EXCEPT_SHIFT)) - return feraiseexcept (excepts); + return __feraiseexcept (excepts); return 0; } @@ -80,7 +80,7 @@ feupdateenv (const fenv_t *envp) } if (excepts & (fpcr_new >> FE_EXCEPT_SHIFT)) - return feraiseexcept (excepts); + return __feraiseexcept (excepts); return 0; } diff --git a/sysdeps/aarch64/fpu/fraiseexcpt.c b/sysdeps/aarch64/fpu/fraiseexcpt.c index 77c6ca7e89..3be8fa307e 100644 --- a/sysdeps/aarch64/fpu/fraiseexcpt.c +++ b/sysdeps/aarch64/fpu/fraiseexcpt.c @@ -21,7 +21,7 @@ #include <float.h> int -feraiseexcept (int excepts) +__feraiseexcept (int excepts) { int fpsr; const float fp_zero = 0.0; @@ -88,4 +88,6 @@ feraiseexcept (int excepts) return 0; } -libm_hidden_def (feraiseexcept) +libm_hidden_def (__feraiseexcept) +weak_alias (__feraiseexcept, feraiseexcept) +libm_hidden_weak (feraiseexcept) diff --git a/sysdeps/aarch64/fpu/math_private.h b/sysdeps/aarch64/fpu/math_private.h index b13c030193..514339f156 100644 --- a/sysdeps/aarch64/fpu/math_private.h +++ b/sysdeps/aarch64/fpu/math_private.h @@ -159,7 +159,7 @@ libc_feupdateenv_test_aarch64 (const fenv_t *envp, int ex) /* Raise the exceptions if enabled in the new FP state. */ if (__glibc_unlikely (excepts & (new_fpcr >> FE_EXCEPT_SHIFT))) - feraiseexcept (excepts); + __feraiseexcept (excepts); return excepts & ex; } diff --git a/sysdeps/alpha/fpu/feupdateenv.c b/sysdeps/alpha/fpu/feupdateenv.c index af1f6309e3..cd192ca213 100644 --- a/sysdeps/alpha/fpu/feupdateenv.c +++ b/sysdeps/alpha/fpu/feupdateenv.c @@ -33,7 +33,7 @@ __feupdateenv (const fenv_t *envp) /* Raise the saved exception. Incidently for us the implementation defined format of the values in objects of type fexcept_t is the same as the ones specified using the FE_* constants. */ - feraiseexcept (tmp & SWCR_STATUS_MASK); + __feraiseexcept (tmp & SWCR_STATUS_MASK); /* Success. */ return 0; diff --git a/sysdeps/arm/fenv_private.h b/sysdeps/arm/fenv_private.h index 743df18c35..5fca507d92 100644 --- a/sysdeps/arm/fenv_private.h +++ b/sysdeps/arm/fenv_private.h @@ -129,7 +129,7 @@ libc_feupdateenv_test_vfp (const fenv_t *envp, int ex) /* Raise the exceptions if enabled in the new FP state. */ if (__glibc_unlikely (excepts & (new_fpscr >> FE_EXCEPT_SHIFT))) - feraiseexcept (excepts); + __feraiseexcept (excepts); return excepts & ex; } diff --git a/sysdeps/arm/feupdateenv.c b/sysdeps/arm/feupdateenv.c index f9a1f28552..f5d914f6c6 100644 --- a/sysdeps/arm/feupdateenv.c +++ b/sysdeps/arm/feupdateenv.c @@ -46,7 +46,7 @@ feupdateenv (const fenv_t *envp) /* Raise the exceptions if enabled in the new FP state. */ if (excepts & (new_fpscr >> FE_EXCEPT_SHIFT)) - return feraiseexcept (excepts); + return __feraiseexcept (excepts); return 0; } @@ -69,7 +69,7 @@ feupdateenv (const fenv_t *envp) /* Raise the exceptions if enabled in the new FP state. */ if (excepts & (new_fpscr >> FE_EXCEPT_SHIFT)) - return feraiseexcept (excepts); + return __feraiseexcept (excepts); return 0; } diff --git a/sysdeps/arm/fraiseexcpt.c b/sysdeps/arm/fraiseexcpt.c index 91ec86fb06..7c02418acb 100644 --- a/sysdeps/arm/fraiseexcpt.c +++ b/sysdeps/arm/fraiseexcpt.c |