Remove sysdeps/alpha/soft-fp directory.

As per <https://sourceware.org/ml/libc-alpha/2014-10/msg00369.html>,
there should not be separate sysdeps/<arch>/soft-fp directories when
those are used by all configurations that use sysdeps/<arch>, 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.

21 files changed, 59 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index c2758fd..8cabe67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+2018-05-23  Joseph Myers  <joseph@codesourcery.com>
+
+	* 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  <fweimer@redhat.com>
 
 	[BZ #19728]
diff --git a/sysdeps/alpha/Implies b/sysdeps/alpha/Implies
index d03783b..18fc4f3 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 533e841..0651414 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 ae8fde7..f9946ab 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
index 689681a..689681a 100644
--- a/sysdeps/alpha/soft-fp/e_sqrtl.c
+++ b/sysdeps/alpha/e_sqrtl.c
diff --git a/sysdeps/alpha/soft-fp/local-soft-fp.h b/sysdeps/alpha/local-soft-fp.h
index d562e08..d562e08 100644
--- a/sysdeps/alpha/soft-fp/local-soft-fp.h
+++ b/sysdeps/alpha/local-soft-fp.h
diff --git a/sysdeps/alpha/soft-fp/ots_add.c b/sysdeps/alpha/ots_add.c
index 5c6fd68..5c6fd68 100644
--- a/sysdeps/alpha/soft-fp/ots_add.c
+++ b/sysdeps/alpha/ots_add.c
diff --git a/sysdeps/alpha/soft-fp/ots_cmp.c b/sysdeps/alpha/ots_cmp.c
index 77e8161..77e8161 100644
--- a/sysdeps/alpha/soft-fp/ots_cmp.c
+++ b/sysdeps/alpha/ots_cmp.c
diff --git a/sysdeps/alpha/soft-fp/ots_cmpe.c b/sysdeps/alpha/ots_cmpe.c
index a1ddcc3..a1ddcc3 100644
--- a/sysdeps/alpha/soft-fp/ots_cmpe.c
+++ b/sysdeps/alpha/ots_cmpe.c
diff --git a/sysdeps/alpha/soft-fp/ots_cvtqux.c b/sysdeps/alpha/ots_cvtqux.c
index d723c46..d723c46 100644
--- a/sysdeps/alpha/soft-fp/ots_cvtqux.c
+++ b/sysdeps/alpha/ots_cvtqux.c
diff --git a/sysdeps/alpha/soft-fp/ots_cvtqx.c b/sysdeps/alpha/ots_cvtqx.c
index 8415177..8415177 100644
--- a/sysdeps/alpha/soft-fp/ots_cvtqx.c
+++ b/sysdeps/alpha/ots_cvtqx.c
diff --git a/sysdeps/alpha/soft-fp/ots_cvttx.c b/sysdeps/alpha/ots_cvttx.c
index 582e22e..582e22e 100644
--- a/sysdeps/alpha/soft-fp/ots_cvttx.c
+++ b/sysdeps/alpha/ots_cvttx.c
diff --git a/sysdeps/alpha/soft-fp/ots_cvtxq.c b/sysdeps/alpha/ots_cvtxq.c
index 567008c..567008c 100644
--- a/sysdeps/alpha/soft-fp/ots_cvtxq.c
+++ b/sysdeps/alpha/ots_cvtxq.c
diff --git a/sysdeps/alpha/soft-fp/ots_cvtxt.c b/sysdeps/alpha/ots_cvtxt.c
index c70cb4b..c70cb4b 100644
--- a/sysdeps/alpha/soft-fp/ots_cvtxt.c
+++ b/sysdeps/alpha/ots_cvtxt.c
diff --git a/sysdeps/alpha/soft-fp/ots_div.c b/sysdeps/alpha/ots_div.c
index 345ae3a..345ae3a 100644
--- a/sysdeps/alpha/soft-fp/ots_div.c
+++ b/sysdeps/alpha/ots_div.c
diff --git a/sysdeps/alpha/soft-fp/ots_mul.c b/sysdeps/alpha/ots_mul.c
index f88764d..f88764d 100644
--- a/sysdeps/alpha/soft-fp/ots_mul.c
+++ b/sysdeps/alpha/ots_mul.c
diff --git a/sysdeps/alpha/soft-fp/ots_nintxq.c b/sysdeps/alpha/ots_nintxq.c
index 0e206dd..0e206dd 100644
--- a/sysdeps/alpha/soft-fp/ots_nintxq.c
+++ b/sysdeps/alpha/ots_nintxq.c
diff --git a/sysdeps/alpha/soft-fp/ots_sub.c b/sysdeps/alpha/ots_sub.c
index 5266268..5266268 100644
--- a/sysdeps/alpha/soft-fp/ots_sub.c
+++ b/sysdeps/alpha/ots_sub.c
diff --git a/sysdeps/alpha/soft-fp/sfp-machine.h b/sysdeps/alpha/sfp-machine.h
index 848881b..848881b 100644
--- a/sysdeps/alpha/soft-fp/sfp-machine.h
+++ b/sysdeps/alpha/sfp-machine.h
diff --git a/sysdeps/alpha/soft-fp/Makefile b/sysdeps/alpha/soft-fp/Makefile
deleted file mode 100644
index 83baa7c..0000000
--- 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 3901287..0000000
--- 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;
-  }
-}