8116321f65
Concluding the fixes for C90 libm functions calling C99 fe* functions, this patch fixes the case of feupdateenv by making it a weak alias for __feupdateenv and making the affected code call __feupdateenv. Tested for x86_64 (testsuite, and that installed stripped shared libraries are unchanged by the patch). Also tested for ARM (soft-float) that the math.h linknamespace tests now pass. [BZ #17748] * include/fenv.h (__feupdateenv): Use libm_hidden_proto. * math/feupdateenv.c (__feupdateenv): Use libm_hidden_def. * sysdeps/aarch64/fpu/feupdateenv.c (feupdateenv): Rename to __feupdateenv and define as weak alias of __feupdateenv. Use libm_hidden_weak. * sysdeps/alpha/fpu/feupdateenv.c (__feupdateenv): Use libm_hidden_def. * sysdeps/arm/feupdateenv.c (feupdateenv): Rename to __feupdateenv and define as weak alias of __feupdateenv. Use libm_hidden_weak. * sysdeps/hppa/fpu/feupdateenv.c (feupdateenv): Likewise. * sysdeps/i386/fpu/feupdateenv.c (__feupdateenv): Use libm_hidden_def. * sysdeps/ia64/fpu/feupdateenv.c (feupdateenv): Rename to __feupdateenv and define as weak alias of __feupdateenv. Use libm_hidden_weak. * sysdeps/m68k/fpu/feupdateenv.c (__feupdateenv): Use libm_hidden_def. * sysdeps/mips/fpu/feupdateenv.c (feupdateenv): Rename to __feupdateenv and define as weak alias of __feupdateenv. Use libm_hidden_weak. * sysdeps/powerpc/fpu/feupdateenv.c (__feupdateenv): Use libm_hidden_def. * sysdeps/powerpc/nofpu/feupdateenv.c (__feupdateenv): Likewise. * sysdeps/powerpc/powerpc32/e500/nofpu/feupdateenv.c (__feupdateenv): Likewise. * sysdeps/s390/fpu/feupdateenv.c (feupdateenv): Rename to __feupdateenv and define as weak alias of __feupdateenv. Use libm_hidden_weak. * sysdeps/sh/sh4/fpu/feupdateenv.c (feupdateenv): Likewise. * sysdeps/sparc/fpu/feupdateenv.c (__feupdateenv): Use libm_hidden_def. * sysdeps/tile/math_private.h (__feupdateenv): New inline function. * sysdeps/x86_64/fpu/feupdateenv.c (__feupdateenv): Use libm_hidden_def. * sysdeps/generic/math_private.h (default_libc_feupdateenv): Call __feupdateenv instead of feupdateenv. (default_libc_feupdateenv_test): Likewise. (libc_feresetround_ctx): Likewise.
90 lines
2.3 KiB
C
90 lines
2.3 KiB
C
/* Copyright (C) 2009-2015 Free Software Foundation, Inc.
|
|
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public License as
|
|
published by the Free Software Foundation; either version 2.1 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <fenv.h>
|
|
#include <fpu_control.h>
|
|
|
|
int
|
|
__feupdateenv (const fenv_t *envp)
|
|
{
|
|
fpu_control_t fpcr;
|
|
fpu_control_t fpcr_new;
|
|
fpu_control_t updated_fpcr;
|
|
fpu_fpsr_t fpsr;
|
|
fpu_fpsr_t fpsr_new;
|
|
int excepts;
|
|
|
|
_FPU_GETCW (fpcr);
|
|
_FPU_GETFPSR (fpsr);
|
|
excepts = fpsr & FE_ALL_EXCEPT;
|
|
|
|
if ((envp != FE_DFL_ENV) && (envp != FE_NOMASK_ENV))
|
|
{
|
|
fpcr_new = envp->__fpcr;
|
|
fpsr_new = envp->__fpsr | excepts;
|
|
|
|
if (fpcr != fpcr_new)
|
|
_FPU_SETCW (fpcr_new);
|
|
|
|
if (fpsr != fpsr_new)
|
|
_FPU_SETFPSR (fpsr_new);
|
|
|
|
if (excepts & (fpcr_new >> FE_EXCEPT_SHIFT))
|
|
return __feraiseexcept (excepts);
|
|
|
|
return 0;
|
|
}
|
|
|
|
fpcr_new = fpcr & _FPU_RESERVED;
|
|
fpsr_new = fpsr & (_FPU_FPSR_RESERVED | FE_ALL_EXCEPT);
|
|
|
|
if (envp == FE_DFL_ENV)
|
|
{
|
|
fpcr_new |= _FPU_DEFAULT;
|
|
fpsr_new |= _FPU_FPSR_DEFAULT;
|
|
}
|
|
else
|
|
{
|
|
fpcr_new |= _FPU_FPCR_IEEE;
|
|
fpsr_new |= _FPU_FPSR_IEEE;
|
|
}
|
|
|
|
_FPU_SETFPSR (fpsr_new);
|
|
|
|
if (fpcr != fpcr_new)
|
|
{
|
|
_FPU_SETCW (fpcr_new);
|
|
|
|
/* Trapping exceptions are optional in AArch64; the relevant enable
|
|
bits in FPCR are RES0 hence the absence of support can be detected
|
|
by reading back the FPCR and comparing with the required value. */
|
|
_FPU_GETCW (updated_fpcr);
|
|
|
|
if (fpcr_new & ~updated_fpcr)
|
|
return 1;
|
|
}
|
|
|
|
if (excepts & (fpcr_new >> FE_EXCEPT_SHIFT))
|
|
return __feraiseexcept (excepts);
|
|
|
|
return 0;
|
|
}
|
|
libm_hidden_def (__feupdateenv)
|
|
weak_alias (__feupdateenv, feupdateenv)
|
|
libm_hidden_weak (feupdateenv)
|