mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +08:00
0acb8a2a85
Information about whether the ABI of long double is the same as that of double is split between bits/mathdef.h and bits/wordsize.h. When the ABIs are the same, bits/mathdef.h defines __NO_LONG_DOUBLE_MATH. In addition, in the case where the same glibc binary supports both -mlong-double-64 and -mlong-double-128, bits/wordsize.h defines __LONG_DOUBLE_MATH_OPTIONAL, along with __NO_LONG_DOUBLE_MATH if this particular compilation is with -mlong-double-64. As part of the refactoring I proposed in <https://sourceware.org/ml/libc-alpha/2016-11/msg00745.html>, this patch puts all that information in a single header, bits/long-double.h. It is included from sys/cdefs.h alongside the include of bits/wordsize.h, so other headers generally do not need to include bits/long-double.h directly. Previously, various bits/mathdef.h headers and bits/wordsize.h headers had this long double information (including implicitly in some bits/mathdef.h headers through not having the defines present in the default version). After the patch, it's all in six bits/long-double.h headers. Furthermore, most of those new headers are not architecture-specific. Architectures with optional long double all use the ldbl-opt sysdeps directory, either in the order (ldbl-64-128, ldbl-opt, ldbl-128) or (ldbl-128ibm, ldbl-opt). Thus a generic header for the case where long double = double, and headers in ldbl-128, ldbl-96 and ldbl-opt, suffices to cover every architecture except for cases where long double properties vary between different ABIs sharing a set of installed headers; fortunately all the ldbl-opt cases share a single compiler-predefined macro __LONG_DOUBLE_128__ that can be used to tell whether this compilation is -mlong-double-64 or -mlong-double-128. The two cases where a set of headers is shared between ABIs with different long double properties, MIPS (o32 has long double = double, other ABIs use ldbl-128) and SPARC (32-bit has optional long double, 64-bit has required long double), need their own bits/long-double.h headers. As with bits/wordsize.h, multiple-include protection for this header is generally implicit through the include guards on sys/cdefs.h, and multiple inclusion is harmless in any case. There is one subtlety: the header must not define __LONG_DOUBLE_MATH_OPTIONAL if __NO_LONG_DOUBLE_MATH was defined before its inclusion, because doing so breaks how sysdeps/ieee754/ldbl-opt/nldbl-compat.h defines __NO_LONG_DOUBLE_MATH itself before including system headers. Subject to keeping that working, it would be reasonable to move these macros from defined/undefined #ifdef to always-defined 1/0 #if semantics, but this patch does not attempt to do so, just rearranges where the macros are defined. After this patch, the only use of bits/mathdef.h is the alpha one for modifying complex function ABIs for old GCC. Thus, all versions of the header other than the default and alpha versions are removed, as is the include from math.h. Tested for x86_64 and x86. Also did compilation-only testing with build-many-glibcs.py. * bits/long-double.h: New file. * sysdeps/ieee754/ldbl-128/bits/long-double.h: Likewise. * sysdeps/ieee754/ldbl-96/bits/long-double.h: Likewise. * sysdeps/ieee754/ldbl-opt/bits/long-double.h: Likewise. * sysdeps/mips/bits/long-double.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/long-double.h: Likewise. * math/Makefile (headers): Add bits/long-double.h. * misc/sys/cdefs.h: Include <bits/long-double.h>. * stdlib/strtold.c: Include <bits/long-double.h> instead of <bits/wordsize.h>. * bits/mathdef.h [!_COMPLEX_H]: Do not allow inclusion. [!__NO_LONG_DOUBLE_MATH]: Remove conditional code. * math/math.h: Do not include <bits/mathdef.h>. * sysdeps/aarch64/bits/mathdef.h: Remove file. * sysdeps/alpha/bits/mathdef.h [!_COMPLEX_H]: Do not allow inclusion. * sysdeps/ia64/bits/mathdef.h: Remove file. * sysdeps/m68k/m680x0/bits/mathdef.h: Likewise. * sysdeps/mips/bits/mathdef.h: Likewise. * sysdeps/powerpc/bits/mathdef.h: Likewise. * sysdeps/s390/bits/mathdef.h: Likewise. * sysdeps/sparc/bits/mathdef.h: Likewise. * sysdeps/x86/bits/mathdef.h: Likewise. * sysdeps/s390/s390-32/bits/wordsize.h [!__NO_LONG_DOUBLE_MATH && !__LONG_DOUBLE_MATH_OPTIONAL]: Remove conditional code. * sysdeps/s390/s390-64/bits/wordsize.h [!__NO_LONG_DOUBLE_MATH && !__LONG_DOUBLE_MATH_OPTIONAL]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/wordsize.h [!__NO_LONG_DOUBLE_MATH && !__LONG_DOUBLE_MATH_OPTIONAL]: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h [!__NO_LONG_DOUBLE_MATH && !__LONG_DOUBLE_MATH_OPTIONAL]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/wordsize.h [!__NO_LONG_DOUBLE_MATH && !__LONG_DOUBLE_MATH_OPTIONAL]: Likewise. |
||
|---|---|---|
| .. | ||
| bits | ||
| sys | ||
| acct.c | ||
| ar.h | ||
| brk.c | ||
| bug18240.c | ||
| bug-hsearch1.c | ||
| chflags.c | ||
| chroot.c | ||
| daemon.c | ||
| dirname.c | ||
| efgcvt_r.c | ||
| efgcvt.c | ||
| err.c | ||
| err.h | ||
| error.c | ||
| error.h | ||
| fchflags.c | ||
| fdatasync.c | ||
| fgetxattr.c | ||
| flistxattr.c | ||
| fremovexattr.c | ||
| fsetxattr.c | ||
| fstab.c | ||
| fstab.h | ||
| fsync.c | ||
| ftruncate64.c | ||
| ftruncate.c | ||
| futimes.c | ||
| futimesat.c | ||
| getauxval.c | ||
| getclktck.c | ||
| getdomain.c | ||
| getdtsz.c | ||
| gethostid.c | ||
| gethostname.c | ||
| getloadavg.c | ||
| getpagesize.c | ||
| getpass.c | ||
| getsysstats.c | ||
| getttyent.c | ||
| getusershell.c | ||
| getxattr.c | ||
| gtty.c | ||
| hsearch_r.c | ||
| hsearch.c | ||
| ifunc-impl-list.c | ||
| init-misc.c | ||
| insremque.c | ||
| ioctl.c | ||
| lgetxattr.c | ||
| libgen.h | ||
| listxattr.c | ||
| llistxattr.c | ||
| lremovexattr.c | ||
| lsearch.c | ||
| lsetxattr.c | ||
| lutimes.c | ||
| madvise.c | ||
| makedev.c | ||
| Makefile | ||
| mincore.c | ||
| mkdtemp.c | ||
| mkostemp64.c | ||
| mkostemp.c | ||
| mkostemps64.c | ||
| mkostemps.c | ||
| mkstemp64.c | ||
| mkstemp.c | ||
| mkstemps64.c | ||
| mkstemps.c | ||
| mktemp.c | ||
| mlock.c | ||
| mlockall.c | ||
| mmap64.c | ||
| mmap.c | ||
| mntent_r.c | ||
| mntent.c | ||
| mntent.h | ||
| mprotect.c | ||
| msync.c | ||
| munlock.c | ||
| munlockall.c | ||
| munmap.c | ||
| preadv64.c | ||
| preadv.c | ||
| pselect.c | ||
| ptrace.c | ||
| pwritev64.c | ||
| pwritev.c | ||
| qefgcvt_r.c | ||
| qefgcvt.c | ||
| readv.c | ||
| reboot.c | ||
| regexp.c | ||
| regexp.h | ||
| remap_file_pages.c | ||
| removexattr.c | ||
| revoke.c | ||
| sbrk.c | ||
| search.h | ||
| select.c | ||
| setdomain.c | ||
| setegid.c | ||
| seteuid.c | ||
| sethostid.c | ||
| sethostname.c | ||
| setregid.c | ||
| setreuid.c | ||
| setxattr.c | ||
| sgtty.h | ||
| sstk.c | ||
| stab.h | ||
| stty.c | ||
| swapoff.c | ||
| swapon.c | ||
| sync.c | ||
| syncfs.c | ||
| syscall.c | ||
| syscall.h | ||
| sysexits.h | ||
| syslog.c | ||
| syslog.h | ||
| truncate64.c | ||
| truncate.c | ||
| tsearch.c | ||
| tst-dirname.c | ||
| tst-efgcvt.c | ||
| tst-error1.c | ||
| tst-fdset.c | ||
| tst-hsearch.c | ||
| tst-insremque.c | ||
| tst-makedev.c | ||
| tst-mntent2.c | ||
| tst-mntent-blank-corrupt.c | ||
| tst-mntent-blank-passno.c | ||
| tst-mntent.c | ||
| tst-preadvwritev64.c | ||
| tst-preadvwritev-common.c | ||
| tst-preadvwritev.c | ||
| tst-pselect.c | ||
| tst-tsearch.c | ||
| ttyent.h | ||
| ttyslot.c | ||
| ualarm.c | ||
| usleep.c | ||
| ustat.c | ||
| ustat.h | ||
| utimes.c | ||
| Versions | ||
| vhangup.c | ||
| writev.c | ||