diff options
author | Joseph Myers <joseph@codesourcery.com> | 2018-08-28 20:48:49 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2018-08-28 20:48:49 +0000 |
commit | ff6b24501f70da7d6375d6f5929262b9509db39e (patch) | |
tree | cee9b22e4bf7880c23718a20e63dc64f659e79d4 /sysdeps/sparc/fpu | |
parent | regex: Add test tst-regcomp-truncated [BZ #23578] (diff) | |
download | glibc-ff6b24501f70da7d6375d6f5929262b9509db39e.tar.gz glibc-ff6b24501f70da7d6375d6f5929262b9509db39e.tar.bz2 glibc-ff6b24501f70da7d6375d6f5929262b9509db39e.zip |
Split fenv_private.h out of math_private.h more consistently.
On some architectures, the parts of math_private.h relating to the
floating-point environment are in a separate file fenv_private.h
included from math_private.h. As this is purely an
architecture-specific convention used by several architectures,
however, all such architectures still need their own math_private.h,
even if it has nothing to do beyond #include <fenv_private.h> and
peculiarity of including the i386 file directly instead of having a
shared file in sysdeps/x86.
This patch makes the fenv_private.h name an architecture-independent
convention in glibc. The include of fenv_private.h from
math_private.h becomes architecture-independent (until callers are
updated to include fenv_private.h directly so the include from
math_private.h is no longer needed). Some architecture math_private.h
headers are removed if no longer needed, or renamed to fenv_private.h
if all they define belongs in that header; architecture fenv_private.h
headers now do require #include_next <fenv_private.h>. The i386
fenv_private.h file moves to sysdeps/x86/fpu/ to reflect how it is
actually shared with x86_64. The generic math_private.h gets a new
include of <stdbool.h>, as needed for bool in some prototypes in that
header (previously that was indirectly included via include/fenv.h,
which now only gets included too late in math_private.h, after those
prototypes).
Tested for x86_64 and x86, and tested with build-many-glibcs.py that
installed stripped shared libraries are unchanged by the patch.
* sysdeps/aarch64/fpu/fenv_private.h: New file. Based on ....
* sysdeps/aarch64/fpu/math_private.h: ... this file. All contents
moved to fenv_private.h except for ...
(TOINT_INTRINSICS): Kept in math_private.h.
(roundtoint): Likewise.
(converttoint): Likewise.
* sysdeps/arm/fenv_private.h: Change multiple-include guard to
[ARM_FENV_PRIVATE_H]. Include next <fenv_private.h>.
* sysdeps/arm/math_private.h: Remove.
* sysdeps/generic/fenv_private.h: New file. Contents moved from
....
* sysdeps/generic/math_private.h: ... this file. Include
<stdbool.h>. Do not include <fenv.h> or <get-rounding-mode.h>.
Include <fenv_private.h>. Remove functions and macros moved to
fenv_private.h.
* sysdeps/i386/fpu/math_private.h: Remove.
* sysdeps/mips/math_private.h: Move to ....
* sysdeps/mips/fpu/fenv_private.h: ... here. Change
multiple-include guard to [MIPS_FENV_PRIVATE_H]. Remove
[__mips_hard_float] conditional. Include next <fenv_private.h>.
* sysdeps/powerpc/fpu/fenv_private.h: Change multiple-include
guard to [POWERPC_FENV_PRIVATE_H]. Include next <fenv_private.h>.
* sysdeps/powerpc/fpu/math_private.h: Do not include
<fenv_private.h>.
* sysdeps/riscv/rvf/math_private.h: Move to ....
* sysdeps/riscv/rvf/fenv_private.h: ... here. Change
multiple-include guard to [RISCV_FENV_PRIVATE_H]. Include next
<fenv_private.h>.
* sysdeps/sparc/fpu/fenv_private.h: Change multiple-include guard
to [SPARC_FENV_PRIVATE_H]. Include next <fenv_private.h>.
* sysdeps/sparc/fpu/math_private.h: Remove.
* sysdeps/i386/fpu/fenv_private.h: Move to ....
* sysdeps/x86/fpu/fenv_private.h: ... here. Change
multiple-include guard to [X86_FENV_PRIVATE_H]. Include next
<fenv_private.h>.
* sysdeps/x86_64/fpu/math_private.h: Do not include
<sysdeps/i386/fpu/fenv_private.h>.
Diffstat (limited to 'sysdeps/sparc/fpu')
-rw-r--r-- | sysdeps/sparc/fpu/fenv_private.h | 8 | ||||
-rw-r--r-- | sysdeps/sparc/fpu/math_private.h | 7 |
2 files changed, 5 insertions, 10 deletions
diff --git a/sysdeps/sparc/fpu/fenv_private.h b/sysdeps/sparc/fpu/fenv_private.h index 29b5d123cf..dbd1001ccb 100644 --- a/sysdeps/sparc/fpu/fenv_private.h +++ b/sysdeps/sparc/fpu/fenv_private.h @@ -1,5 +1,5 @@ -#ifndef FENV_PRIVATE_H -#define FENV_PRIVATE_H 1 +#ifndef SPARC_FENV_PRIVATE_H +#define SPARC_FENV_PRIVATE_H 1 #include <fenv.h> @@ -179,4 +179,6 @@ libc_feholdsetround_sparc_ctx (struct rm_ctx *ctx, int round) #define libc_feholdsetroundf_ctx libc_feholdsetround_sparc_ctx #define libc_feholdsetroundl_ctx libc_feholdsetround_sparc_ctx -#endif /* FENV_PRIVATE_H */ +#include_next <fenv_private.h> + +#endif /* SPARC_FENV_PRIVATE_H */ diff --git a/sysdeps/sparc/fpu/math_private.h b/sysdeps/sparc/fpu/math_private.h deleted file mode 100644 index 27946cec7b..0000000000 --- a/sysdeps/sparc/fpu/math_private.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef SPARC_MATH_PRIVATE_H -#define SPARC_MATH_PRIVATE_H 1 - -#include "fenv_private.h" -#include_next <math_private.h> - -#endif /* SPARC_MATH_PRIVATE_H */ |