From 8f145c77123a565b816f918969e0e35ee5b89153 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 22 May 2018 17:23:34 +0000 Subject: [PATCH] Remove sysdeps/aarch64/soft-fp directory. As per , there should not be separate sysdeps//soft-fp directories when those are used by all configurations that use sysdeps/, and, more generally, should not be sysdeps/foo/Implies files pointing to a subdirectory foo/bar. This patch eliminates the sysdeps/aarch64/soft-fp directory accordingly, merging its contents into sysdeps/aarch64. Tested with build-many-glibcs.py that installed stripped shared libraries for aarch64 configurations are unchanged by this patch. * sysdeps/aarch64/Implies: Remove aarch64/soft-fp. * sysdeps/aarch64/Makefile [$(subdir) = math] (CPPFLAGS): Add -I../soft-fp. Moved from .... * sysdeps/aarch64/soft-fp/Makefile: ... here. Remove file. * sysdeps/aarch64/soft-fp/e_sqrtl.c: Move to .... * sysdeps/aarch64/e_sqrtl.c: ... here. * sysdeps/aarch64/soft-fp/sfp-machine.h: Move to .... * sysdeps/aarch64/sfp-machine.h: ... here. --- ChangeLog | 9 +++++++++ sysdeps/aarch64/Implies | 1 - sysdeps/aarch64/Makefile | 4 ++++ sysdeps/aarch64/{soft-fp => }/e_sqrtl.c | 0 sysdeps/aarch64/{soft-fp => }/sfp-machine.h | 0 sysdeps/aarch64/soft-fp/Makefile | 3 --- 6 files changed, 13 insertions(+), 4 deletions(-) rename sysdeps/aarch64/{soft-fp => }/e_sqrtl.c (100%) rename sysdeps/aarch64/{soft-fp => }/sfp-machine.h (100%) delete mode 100644 sysdeps/aarch64/soft-fp/Makefile diff --git a/ChangeLog b/ChangeLog index f11b1c2bc3..252b0993dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2018-05-22 Joseph Myers + * sysdeps/aarch64/Implies: Remove aarch64/soft-fp. + * sysdeps/aarch64/Makefile [$(subdir) = math] (CPPFLAGS): Add + -I../soft-fp. Moved from .... + * sysdeps/aarch64/soft-fp/Makefile: ... here. Remove file. + * sysdeps/aarch64/soft-fp/e_sqrtl.c: Move to .... + * sysdeps/aarch64/e_sqrtl.c: ... here. + * sysdeps/aarch64/soft-fp/sfp-machine.h: Move to .... + * sysdeps/aarch64/sfp-machine.h: ... here. + * sysdeps/ieee754/dbl-64/k_rem_pio2.c (__kernel_rem_pio2): Ignore -Wmaybe-uninitialized around access to fq[0]. * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f): diff --git a/sysdeps/aarch64/Implies b/sysdeps/aarch64/Implies index e5adf4d63c..a1d5e2e742 100644 --- a/sysdeps/aarch64/Implies +++ b/sysdeps/aarch64/Implies @@ -3,4 +3,3 @@ ieee754/ldbl-128 ieee754/dbl-64/wordsize-64 ieee754/dbl-64 ieee754/flt-32 -aarch64/soft-fp diff --git a/sysdeps/aarch64/Makefile b/sysdeps/aarch64/Makefile index 5f3e20371a..94baaf52dd 100644 --- a/sysdeps/aarch64/Makefile +++ b/sysdeps/aarch64/Makefile @@ -12,3 +12,7 @@ endif ifeq ($(subdir),gmon) CFLAGS-mcount.c += -mgeneral-regs-only endif + +ifeq ($(subdir),math) +CPPFLAGS += -I../soft-fp +endif diff --git a/sysdeps/aarch64/soft-fp/e_sqrtl.c b/sysdeps/aarch64/e_sqrtl.c similarity index 100% rename from sysdeps/aarch64/soft-fp/e_sqrtl.c rename to sysdeps/aarch64/e_sqrtl.c diff --git a/sysdeps/aarch64/soft-fp/sfp-machine.h b/sysdeps/aarch64/sfp-machine.h similarity index 100% rename from sysdeps/aarch64/soft-fp/sfp-machine.h rename to sysdeps/aarch64/sfp-machine.h diff --git a/sysdeps/aarch64/soft-fp/Makefile b/sysdeps/aarch64/soft-fp/Makefile deleted file mode 100644 index ada13e8b70..0000000000 --- a/sysdeps/aarch64/soft-fp/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(subdir),math) -CPPFLAGS += -I../soft-fp -endif