From 2834fb46109a8a7c9161eb8d0d9ddc707a717144 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 23 May 2018 17:29:20 +0000 Subject: [PATCH] Remove sysdeps/alpha/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/alpha/soft-fp directory accordingly, merging its contents into sysdeps/alpha. Tested with build-many-glibcs.py that installed stripped shared libraries for alpha-linux-gnu are unchanged by this patch. * sysdeps/alpha/Implies: Remove alpha/soft-fp. * sysdeps/alpha/Makefile [$(subdir) = soft-fp] (sysdep_routines): Add functions moved from .... [$(subdir) = math] (CPPFLAGS): Add -I../soft-fp. Moved from .... * sysdeps/alpha/soft-fp/Makefile: ... here. Remove file. * sysdeps/alpha/Versions (libc): Add GLIBC_2.3.4 symbols moved from .... * sysdeps/alpha/soft-fp/Versions: ... here. Remove file. * sysdeps/alpha/soft-fp/e_sqrtl.c: Move to .... * sysdeps/alpha/e_sqrtl.c: ... here. * sysdeps/alpha/soft-fp/local-soft-fp.h: Move to .... * sysdeps/alpha/local-soft-fp.h: ... here. * sysdeps/alpha/soft-fp/ots_add.c: Move to .... * sysdeps/alpha/ots_add.c: ... here. * sysdeps/alpha/soft-fp/ots_cmp.c: Move to .... * sysdeps/alpha/ots_cmp.c: ... here. * sysdeps/alpha/soft-fp/ots_cmpe.c: Move to .... * sysdeps/alpha/ots_cmpe.c: ... here. * sysdeps/alpha/soft-fp/ots_cvtqux.c: Move to .... * sysdeps/alpha/ots_cvtqux.c: ... here. * sysdeps/alpha/soft-fp/ots_cvtqx.c: Move to .... * sysdeps/alpha/ots_cvtqx.c: ... here. * sysdeps/alpha/soft-fp/ots_cvttx.c: Move to .... * sysdeps/alpha/ots_cvttx.c: ... here. * sysdeps/alpha/soft-fp/ots_cvtxq.c: Move to .... * sysdeps/alpha/ots_cvtxq.c: ... here. * sysdeps/alpha/soft-fp/ots_cvtxt.c: Move to .... * sysdeps/alpha/ots_cvtxt.c: ... here. * sysdeps/alpha/soft-fp/ots_div.c: Move to .... * sysdeps/alpha/ots_div.c: ... here. * sysdeps/alpha/soft-fp/ots_mul.c: Move to .... * sysdeps/alpha/ots_mul.c: ... here. * sysdeps/alpha/soft-fp/ots_nintxq.c: Move to .... * sysdeps/alpha/ots_nintxq.c: ... here. * sysdeps/alpha/soft-fp/ots_sub.c: Move to .... * sysdeps/alpha/ots_sub.c: ... here. * sysdeps/alpha/soft-fp/sfp-machine.h: Move to .... * sysdeps/alpha/sfp-machine.h: ... here. --- ChangeLog | 41 +++++++++++++++++++++ sysdeps/alpha/Implies | 1 - sysdeps/alpha/Makefile | 12 ++++++ sysdeps/alpha/Versions | 6 +++ sysdeps/alpha/{soft-fp => }/e_sqrtl.c | 0 sysdeps/alpha/{soft-fp => }/local-soft-fp.h | 0 sysdeps/alpha/{soft-fp => }/ots_add.c | 0 sysdeps/alpha/{soft-fp => }/ots_cmp.c | 0 sysdeps/alpha/{soft-fp => }/ots_cmpe.c | 0 sysdeps/alpha/{soft-fp => }/ots_cvtqux.c | 0 sysdeps/alpha/{soft-fp => }/ots_cvtqx.c | 0 sysdeps/alpha/{soft-fp => }/ots_cvttx.c | 0 sysdeps/alpha/{soft-fp => }/ots_cvtxq.c | 0 sysdeps/alpha/{soft-fp => }/ots_cvtxt.c | 0 sysdeps/alpha/{soft-fp => }/ots_div.c | 0 sysdeps/alpha/{soft-fp => }/ots_mul.c | 0 sysdeps/alpha/{soft-fp => }/ots_nintxq.c | 0 sysdeps/alpha/{soft-fp => }/ots_sub.c | 0 sysdeps/alpha/{soft-fp => }/sfp-machine.h | 0 sysdeps/alpha/soft-fp/Makefile | 11 ------ sysdeps/alpha/soft-fp/Versions | 8 ---- 21 files changed, 59 insertions(+), 20 deletions(-) rename sysdeps/alpha/{soft-fp => }/e_sqrtl.c (100%) rename sysdeps/alpha/{soft-fp => }/local-soft-fp.h (100%) rename sysdeps/alpha/{soft-fp => }/ots_add.c (100%) rename sysdeps/alpha/{soft-fp => }/ots_cmp.c (100%) rename sysdeps/alpha/{soft-fp => }/ots_cmpe.c (100%) rename sysdeps/alpha/{soft-fp => }/ots_cvtqux.c (100%) rename sysdeps/alpha/{soft-fp => }/ots_cvtqx.c (100%) rename sysdeps/alpha/{soft-fp => }/ots_cvttx.c (100%) rename sysdeps/alpha/{soft-fp => }/ots_cvtxq.c (100%) rename sysdeps/alpha/{soft-fp => }/ots_cvtxt.c (100%) rename sysdeps/alpha/{soft-fp => }/ots_div.c (100%) rename sysdeps/alpha/{soft-fp => }/ots_mul.c (100%) rename sysdeps/alpha/{soft-fp => }/ots_nintxq.c (100%) rename sysdeps/alpha/{soft-fp => }/ots_sub.c (100%) rename sysdeps/alpha/{soft-fp => }/sfp-machine.h (100%) delete mode 100644 sysdeps/alpha/soft-fp/Makefile delete mode 100644 sysdeps/alpha/soft-fp/Versions diff --git a/ChangeLog b/ChangeLog index c2758fdec6..8cabe673ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,44 @@ +2018-05-23 Joseph Myers + + * sysdeps/alpha/Implies: Remove alpha/soft-fp. + * sysdeps/alpha/Makefile [$(subdir) = soft-fp] (sysdep_routines): + Add functions moved from .... + [$(subdir) = math] (CPPFLAGS): Add -I../soft-fp. Moved from .... + * sysdeps/alpha/soft-fp/Makefile: ... here. Remove file. + * sysdeps/alpha/Versions (libc): Add GLIBC_2.3.4 symbols moved + from .... + * sysdeps/alpha/soft-fp/Versions: ... here. Remove file. + * sysdeps/alpha/soft-fp/e_sqrtl.c: Move to .... + * sysdeps/alpha/e_sqrtl.c: ... here. + * sysdeps/alpha/soft-fp/local-soft-fp.h: Move to .... + * sysdeps/alpha/local-soft-fp.h: ... here. + * sysdeps/alpha/soft-fp/ots_add.c: Move to .... + * sysdeps/alpha/ots_add.c: ... here. + * sysdeps/alpha/soft-fp/ots_cmp.c: Move to .... + * sysdeps/alpha/ots_cmp.c: ... here. + * sysdeps/alpha/soft-fp/ots_cmpe.c: Move to .... + * sysdeps/alpha/ots_cmpe.c: ... here. + * sysdeps/alpha/soft-fp/ots_cvtqux.c: Move to .... + * sysdeps/alpha/ots_cvtqux.c: ... here. + * sysdeps/alpha/soft-fp/ots_cvtqx.c: Move to .... + * sysdeps/alpha/ots_cvtqx.c: ... here. + * sysdeps/alpha/soft-fp/ots_cvttx.c: Move to .... + * sysdeps/alpha/ots_cvttx.c: ... here. + * sysdeps/alpha/soft-fp/ots_cvtxq.c: Move to .... + * sysdeps/alpha/ots_cvtxq.c: ... here. + * sysdeps/alpha/soft-fp/ots_cvtxt.c: Move to .... + * sysdeps/alpha/ots_cvtxt.c: ... here. + * sysdeps/alpha/soft-fp/ots_div.c: Move to .... + * sysdeps/alpha/ots_div.c: ... here. + * sysdeps/alpha/soft-fp/ots_mul.c: Move to .... + * sysdeps/alpha/ots_mul.c: ... here. + * sysdeps/alpha/soft-fp/ots_nintxq.c: Move to .... + * sysdeps/alpha/ots_nintxq.c: ... here. + * sysdeps/alpha/soft-fp/ots_sub.c: Move to .... + * sysdeps/alpha/ots_sub.c: ... here. + * sysdeps/alpha/soft-fp/sfp-machine.h: Move to .... + * sysdeps/alpha/sfp-machine.h: ... here. + 2018-05-23 Florian Weimer [BZ #19728] diff --git a/sysdeps/alpha/Implies b/sysdeps/alpha/Implies index d03783b127..18fc4f339d 100644 --- a/sysdeps/alpha/Implies +++ b/sysdeps/alpha/Implies @@ -4,4 +4,3 @@ ieee754/ldbl-128 ieee754/dbl-64/wordsize-64 ieee754/dbl-64 ieee754/flt-32 -alpha/soft-fp diff --git a/sysdeps/alpha/Makefile b/sysdeps/alpha/Makefile index 533e841766..0651414b03 100644 --- a/sysdeps/alpha/Makefile +++ b/sysdeps/alpha/Makefile @@ -60,3 +60,15 @@ sysdep-CFLAGS += -mieee -mfp-rounding-mode=d # libc.so requires about 16k for the small data area, which is well # below the 64k maximum. pic-ccflag = -fpic + +# Software floating-point emulation. + +ifeq ($(subdir),soft-fp) +sysdep_routines += ots_add ots_sub ots_mul ots_div ots_cmp ots_cmpe \ + ots_cvtxq ots_cvtqx ots_cvtqux ots_cvttx ots_cvtxt ots_nintxq \ + fraiseexcpt +endif + +ifeq ($(subdir),math) +CPPFLAGS += -I../soft-fp +endif diff --git a/sysdeps/alpha/Versions b/sysdeps/alpha/Versions index ae8fde7b23..f9946abf14 100644 --- a/sysdeps/alpha/Versions +++ b/sysdeps/alpha/Versions @@ -4,6 +4,12 @@ libc { __divqu; __remqu; __divqs; __remqs; __divlu; __remlu; __divls; __remls; __divl; __reml; __divq; __remq; __divqu; __remqu; } + GLIBC_2.3.4 { + _OtsAddX; _OtsSubX; _OtsMulX; _OtsDivX; + _OtsEqlX; _OtsNeqX; _OtsLssX; _OtsLeqX; _OtsGtrX; _OtsGeqX; + _OtsCvtQX; _OtsCvtQUX; _OtsCvtXQ; _OtsNintXQ; + _OtsConvertFloatTX; _OtsConvertFloatXT; + } } libm { GLIBC_2.0 { diff --git a/sysdeps/alpha/soft-fp/e_sqrtl.c b/sysdeps/alpha/e_sqrtl.c similarity index 100% rename from sysdeps/alpha/soft-fp/e_sqrtl.c rename to sysdeps/alpha/e_sqrtl.c diff --git a/sysdeps/alpha/soft-fp/local-soft-fp.h b/sysdeps/alpha/local-soft-fp.h similarity index 100% rename from sysdeps/alpha/soft-fp/local-soft-fp.h rename to sysdeps/alpha/local-soft-fp.h diff --git a/sysdeps/alpha/soft-fp/ots_add.c b/sysdeps/alpha/ots_add.c similarity index 100% rename from sysdeps/alpha/soft-fp/ots_add.c rename to sysdeps/alpha/ots_add.c diff --git a/sysdeps/alpha/soft-fp/ots_cmp.c b/sysdeps/alpha/ots_cmp.c similarity index 100% rename from sysdeps/alpha/soft-fp/ots_cmp.c rename to sysdeps/alpha/ots_cmp.c diff --git a/sysdeps/alpha/soft-fp/ots_cmpe.c b/sysdeps/alpha/ots_cmpe.c similarity index 100% rename from sysdeps/alpha/soft-fp/ots_cmpe.c rename to sysdeps/alpha/ots_cmpe.c diff --git a/sysdeps/alpha/soft-fp/ots_cvtqux.c b/sysdeps/alpha/ots_cvtqux.c similarity index 100% rename from sysdeps/alpha/soft-fp/ots_cvtqux.c rename to sysdeps/alpha/ots_cvtqux.c diff --git a/sysdeps/alpha/soft-fp/ots_cvtqx.c b/sysdeps/alpha/ots_cvtqx.c similarity index 100% rename from sysdeps/alpha/soft-fp/ots_cvtqx.c rename to sysdeps/alpha/ots_cvtqx.c diff --git a/sysdeps/alpha/soft-fp/ots_cvttx.c b/sysdeps/alpha/ots_cvttx.c similarity index 100% rename from sysdeps/alpha/soft-fp/ots_cvttx.c rename to sysdeps/alpha/ots_cvttx.c diff --git a/sysdeps/alpha/soft-fp/ots_cvtxq.c b/sysdeps/alpha/ots_cvtxq.c similarity index 100% rename from sysdeps/alpha/soft-fp/ots_cvtxq.c rename to sysdeps/alpha/ots_cvtxq.c diff --git a/sysdeps/alpha/soft-fp/ots_cvtxt.c b/sysdeps/alpha/ots_cvtxt.c similarity index 100% rename from sysdeps/alpha/soft-fp/ots_cvtxt.c rename to sysdeps/alpha/ots_cvtxt.c diff --git a/sysdeps/alpha/soft-fp/ots_div.c b/sysdeps/alpha/ots_div.c similarity index 100% rename from sysdeps/alpha/soft-fp/ots_div.c rename to sysdeps/alpha/ots_div.c diff --git a/sysdeps/alpha/soft-fp/ots_mul.c b/sysdeps/alpha/ots_mul.c similarity index 100% rename from sysdeps/alpha/soft-fp/ots_mul.c rename to sysdeps/alpha/ots_mul.c diff --git a/sysdeps/alpha/soft-fp/ots_nintxq.c b/sysdeps/alpha/ots_nintxq.c similarity index 100% rename from sysdeps/alpha/soft-fp/ots_nintxq.c rename to sysdeps/alpha/ots_nintxq.c diff --git a/sysdeps/alpha/soft-fp/ots_sub.c b/sysdeps/alpha/ots_sub.c similarity index 100% rename from sysdeps/alpha/soft-fp/ots_sub.c rename to sysdeps/alpha/ots_sub.c diff --git a/sysdeps/alpha/soft-fp/sfp-machine.h b/sysdeps/alpha/sfp-machine.h similarity index 100% rename from sysdeps/alpha/soft-fp/sfp-machine.h rename to sysdeps/alpha/sfp-machine.h diff --git a/sysdeps/alpha/soft-fp/Makefile b/sysdeps/alpha/soft-fp/Makefile deleted file mode 100644 index 83baa7c49d..0000000000 --- a/sysdeps/alpha/soft-fp/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Software floating-point emulation. - -ifeq ($(subdir),soft-fp) -sysdep_routines += ots_add ots_sub ots_mul ots_div ots_cmp ots_cmpe \ - ots_cvtxq ots_cvtqx ots_cvtqux ots_cvttx ots_cvtxt ots_nintxq \ - fraiseexcpt -endif - -ifeq ($(subdir),math) -CPPFLAGS += -I../soft-fp -endif diff --git a/sysdeps/alpha/soft-fp/Versions b/sysdeps/alpha/soft-fp/Versions deleted file mode 100644 index 3901287115..0000000000 --- a/sysdeps/alpha/soft-fp/Versions +++ /dev/null @@ -1,8 +0,0 @@ -libc { - GLIBC_2.3.4 { - _OtsAddX; _OtsSubX; _OtsMulX; _OtsDivX; - _OtsEqlX; _OtsNeqX; _OtsLssX; _OtsLeqX; _OtsGtrX; _OtsGeqX; - _OtsCvtQX; _OtsCvtQUX; _OtsCvtXQ; _OtsNintXQ; - _OtsConvertFloatTX; _OtsConvertFloatXT; - } -}