powerpc64*: fix the order of implied sysdeps directories

The creation of the divergent sysdeps directory for powerpc64le

commit 2f7f3cd8cd302bb10908c86f3f7b349df0a78e6a
Author: Paul E. Murphy <murphyp@linux.vnet.ibm.com>
Date:   Fri Jul 15 18:04:40 2016 -0500

    powerpc64le: Create divergent sysdep directory for powerpc64le.

allowed float128 to be enabled for powerpc64le (little-endian) and not
for powerpc64 (big-endian).  Since the only intended difference between
them was the presence or absence of the float128 interface, the sysdeps
directory for powerpc64le explicitly reused the files from powerpc64
(through the use of Implies files).

Although this works, it also means that files under the powerpc64
directory might be preferred over files under powerpc64le.  For
instance, on a build for powerpc64le with target set to power9, a file
from powerpc64/power5 might get built, even though a file with the same
name exists in powerpc64le/power8.  That happens because the processor
hierarchy was only defined in the sysdeps directory for powerpc64 (and
borrowed by powerpc64le).

This patch fixes this behavior, by creating new subdirectories under
powerpc64 (i.e.: powerpc64/be and powerpc64/le) and creating new Implies
files to provide the hierarchy of processors for powerpc64 and
powerpc64le separately.  These changes have no effect on installed,
stripped binaries (which remain unchanged).

Tested that installed stripped binaries are unchanged and that there are
no regressions on powerpc64 and powerpc64le.

116 files changed, 258 insertions, 60 deletions

diff --git a/ChangeLog b/ChangeLog
index 6501e19ec6..5f2c1d1b04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,161 @@
+2018-04-27  Gabriel F. T. Gomes  <gabriel@inconstante.eti.br>
+
+	* sysdeps/powerpc/preconfigure [machine == powerpc64] (machine): Define
+	to powerpc/powerpc64/be for big-endian.
+	[machine == powerpc64le]: Define to powerpc/powerpc64/le for
+	little-endian.
+
+	* sysdeps/powerpc/powerpc64/power4/Implies: Move to powerpc64/be.
+	* sysdeps/powerpc/powerpc64/power4/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power4/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power4/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power5+/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power5+/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power5+/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power5+/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power5/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power5/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power5/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power5/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power6/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power6/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power6/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power6/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power6x/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power6x/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power6x/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power6x/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power7/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power7/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power7/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power7/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power8/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power8/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power8/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power8/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power9/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power9/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power9/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power9/multiarch/Implies: Likewise.
+
+	* sysdeps/powerpc/powerpc64/be/power4/Implies: Move from powerpc64 and
+	adjusted to imply powerpc64 and older processors on powerpc64/be.
+	* sysdeps/powerpc/powerpc64/be/power4/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power4/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power4/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power5+/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power5+/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power5+/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power5+/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power5/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power5/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power5/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power5/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power6/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power6/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power6/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power6/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power6x/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power6x/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power6x/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power6x/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power7/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power7/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power7/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power7/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power8/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power8/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power8/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power8/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power9/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power9/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power9/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/power9/multiarch/Implies: Likewise.
+
+	* sysdeps/powerpc/powerpc64/970/Implies: Move to powerpc64/be.
+	* sysdeps/powerpc/powerpc64/be/970/Implies: Move from powerpc64/be.
+	* sysdeps/powerpc/powerpc64/be/a2/Implies: New file.
+	* sysdeps/powerpc/powerpc64/be/cell/Implies: Likewise.
+
+	* sysdeps/powerpc/powerpc64/be/Implies: New file.
+	* sysdeps/powerpc/powerpc64/be/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/be/multiarch/Implies: Likewise.
+
+	* sysdeps/powerpc/powerpc64le/Implies: Move to powerpc64/le.
+	* sysdeps/powerpc/powerpc64le/Implies-before: Likewise.
+	* sysdeps/powerpc/powerpc64le/Makefile: Likewise.
+	* sysdeps/powerpc/powerpc64le/configure: Likewise.
+	* sysdeps/powerpc/powerpc64le/configure.ac: Likewise.
+	* sysdeps/powerpc/powerpc64le/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64le/fpu/e_sqrtf128.c: Likewise.
+	* sysdeps/powerpc/powerpc64le/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64le/fpu/sfp-machine.h: Likewise.
+	* sysdeps/powerpc/powerpc64le/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64le/power9/fpu/e_sqrtf128.c: Likewise.
+
+	* sysdeps/powerpc/powerpc64/le/Implies: Move from powerpc64le.
+	* sysdeps/powerpc/powerpc64/le/Implies-before: Likewise.
+	* sysdeps/powerpc/powerpc64/le/Makefile: Likewise.
+	* sysdeps/powerpc/powerpc64/le/configure: Likewise.
+	* sysdeps/powerpc/powerpc64/le/configure.ac: Likewise.
+	* sysdeps/powerpc/powerpc64/le/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/le/fpu/e_sqrtf128.c: Likewise.
+	* sysdeps/powerpc/powerpc64/le/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/le/fpu/sfp-machine.h: Likewise.
+	* sysdeps/powerpc/powerpc64/le/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/le/power9/fpu/e_sqrtf128.c: Likewise.
+
+	* sysdeps/powerpc/powerpc64le/power7/Implies: Move to powerpc64/le.
+	* sysdeps/powerpc/powerpc64le/power7/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64le/power7/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64le/power7/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64le/power8/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64le/power8/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64le/power8/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64le/power8/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64le/power9/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64le/power9/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64le/power9/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64le/power9/multiarch/Implies: Likewise.
+
+	* sysdeps/powerpc/powerpc64/le/power7/Implies: Move from powerpc64le
+	and adjusted to imply olders processors.
+	* sysdeps/powerpc/powerpc64/le/power7/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/le/power7/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/le/power7/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/le/power8/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/le/power8/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/le/power8/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/le/power8/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/le/power9/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/le/power9/fpu/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/le/power9/fpu/multiarch/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/le/power9/multiarch/Implies: Likewise.
+
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64le/Implies: Move to
+	powerpc64/le.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64le/float128-abi.h: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64le/fpu/Implies: Likewise.
+
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/le/Implies: Move from
+	powerpc64le.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/le/float128-abi.h: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/le/fpu/Implies: Likewise.
+
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/970/Implies: Move to
+	powerpc64/be.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/a2/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/cell/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/cell/fpu/Implies: Likewise.
+
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/be/970/Implies: Move from
+	powerpc64 and adjusted.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/be/a2/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/be/cell/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/be/cell/fpu/Implies:
+	Likewise.
+
 2018-04-27  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/tile: Remove.
diff --git a/sysdeps/powerpc/powerpc64/970/Implies b/sysdeps/powerpc/powerpc64/970/Implies
deleted file mode 100644
index bedb20b65c..0000000000
--- a/sysdeps/powerpc/powerpc64/970/Implies
+++ /dev/null
@@ -1,2 +0,0 @@
-powerpc/powerpc64/power4/fpu
-powerpc/powerpc64/power4
diff --git a/sysdeps/powerpc/powerpc64/be/970/Implies b/sysdeps/powerpc/powerpc64/be/970/Implies
new file mode 100644
index 0000000000..ac431fa96e
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/970/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/power4
diff --git a/sysdeps/powerpc/powerpc64le/Implies b/sysdeps/powerpc/powerpc64/be/Implies
index a105a325f7..a105a325f7 100644
--- a/sysdeps/powerpc/powerpc64le/Implies
+++ b/sysdeps/powerpc/powerpc64/be/Implies
diff --git a/sysdeps/powerpc/powerpc64/be/a2/Implies b/sysdeps/powerpc/powerpc64/be/a2/Implies
new file mode 100644
index 0000000000..6c02123791
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/a2/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/a2
diff --git a/sysdeps/powerpc/powerpc64/be/cell/Implies b/sysdeps/powerpc/powerpc64/be/cell/Implies
new file mode 100644
index 0000000000..d6b89b15d3
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/cell/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/cell
diff --git a/sysdeps/powerpc/powerpc64/power4/fpu/Implies b/sysdeps/powerpc/powerpc64/be/fpu/Implies
index c1f617b7da..c1f617b7da 100644
--- a/sysdeps/powerpc/powerpc64/power4/fpu/Implies
+++ b/sysdeps/powerpc/powerpc64/be/fpu/Implies
diff --git a/sysdeps/powerpc/powerpc64/power4/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/fpu/multiarch/Implies
index 8d6531a174..8d6531a174 100644
--- a/sysdeps/powerpc/powerpc64/power4/fpu/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64/be/fpu/multiarch/Implies
diff --git a/sysdeps/powerpc/powerpc64/power4/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/multiarch/Implies
index 30edcf7f9d..30edcf7f9d 100644
--- a/sysdeps/powerpc/powerpc64/power4/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64/be/multiarch/Implies
diff --git a/sysdeps/powerpc/powerpc64/power4/Implies b/sysdeps/powerpc/powerpc64/be/power4/Implies
index a372141bb7..6d067e28ec 100644
--- a/sysdeps/powerpc/powerpc64/power4/Implies
+++ b/sysdeps/powerpc/powerpc64/be/power4/Implies
@@ -1,2 +1,3 @@
+powerpc/powerpc64/power4
 powerpc/power4/fpu
 powerpc/power4
diff --git a/sysdeps/powerpc/powerpc64le/fpu/Implies b/sysdeps/powerpc/powerpc64/be/power4/fpu/Implies
index c1f617b7da..c1f617b7da 100644
--- a/sysdeps/powerpc/powerpc64le/fpu/Implies
+++ b/sysdeps/powerpc/powerpc64/be/power4/fpu/Implies
diff --git a/sysdeps/powerpc/powerpc64le/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power4/fpu/multiarch/Implies
index 8d6531a174..8d6531a174 100644
--- a/sysdeps/powerpc/powerpc64le/fpu/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64/be/power4/fpu/multiarch/Implies
diff --git a/sysdeps/powerpc/powerpc64le/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power4/multiarch/Implies
index 30edcf7f9d..30edcf7f9d 100644
--- a/sysdeps/powerpc/powerpc64le/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64/be/power4/multiarch/Implies
diff --git a/sysdeps/powerpc/powerpc64/be/power5+/Implies b/sysdeps/powerpc/powerpc64/be/power5+/Implies
new file mode 100644
index 0000000000..03852149d4
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power5+/Implies
@@ -0,0 +1,5 @@
+powerpc/powerpc64/power5+
+powerpc/power5+/fpu
+powerpc/power5+
+powerpc/powerpc64/be/power5/fpu
+powerpc/powerpc64/be/power5
diff --git a/sysdeps/powerpc/powerpc64/be/power5+/fpu/Implies b/sysdeps/powerpc/powerpc64/be/power5+/fpu/Implies
new file mode 100644
index 0000000000..25f20b1d8e
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power5+/fpu/Implies
@@ -0,0 +1,2 @@
+powerpc/powerpc64/power5+/fpu
+powerpc/powerpc64/be/power5/fpu
diff --git a/sysdeps/powerpc/powerpc64/be/power5+/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power5+/fpu/multiarch/Implies
new file mode 100644
index 0000000000..5985565e0f
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power5+/fpu/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/be/power5/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/be/power5+/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power5+/multiarch/Implies
new file mode 100644
index 0000000000..818920343d
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power5+/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/be/power5/multiarch
diff --git a/sysdeps/powerpc/powerpc64/be/power5/Implies b/sysdeps/powerpc/powerpc64/be/power5/Implies
new file mode 100644
index 0000000000..e50a23b357
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power5/Implies
@@ -0,0 +1,3 @@
+powerpc/powerpc64/power5
+powerpc/powerpc64/be/power4/fpu
+powerpc/powerpc64/be/power4
diff --git a/sysdeps/powerpc/powerpc64/be/power5/fpu/Implies b/sysdeps/powerpc/powerpc64/be/power5/fpu/Implies
new file mode 100644
index 0000000000..58ab3b7abb
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power5/fpu/Implies
@@ -0,0 +1,2 @@
+powerpc/powerpc64/power5/fpu
+powerpc/powerpc64/be/power4/fpu/
diff --git a/sysdeps/powerpc/powerpc64/be/power5/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power5/fpu/multiarch/Implies
new file mode 100644
index 0000000000..f2fffcb96f
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power5/fpu/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/be/power4/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/be/power5/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power5/multiarch/Implies
new file mode 100644
index 0000000000..a9cda70bcd
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power5/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/be/power4/multiarch
diff --git a/sysdeps/powerpc/powerpc64/be/power6/Implies b/sysdeps/powerpc/powerpc64/be/power6/Implies
new file mode 100644
index 0000000000..c0e0be57b6
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power6/Implies
@@ -0,0 +1,3 @@
+powerpc/powerpc64/power6
+powerpc/powerpc64/be/power5+/fpu
+powerpc/powerpc64/be/power5+
diff --git a/sysdeps/powerpc/powerpc64/be/power6/fpu/Implies b/sysdeps/powerpc/powerpc64/be/power6/fpu/Implies
new file mode 100644
index 0000000000..a16a96e9eb
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power6/fpu/Implies
@@ -0,0 +1,2 @@
+powerpc/powerpc64/power6/fpu
+powerpc/powerpc64/be/power5+/fpu
diff --git a/sysdeps/powerpc/powerpc64/be/power6/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power6/fpu/multiarch/Implies
new file mode 100644
index 0000000000..ef0f432215
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power6/fpu/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/be/power5+/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/be/power6/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power6/multiarch/Implies
new file mode 100644
index 0000000000..9510043332
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power6/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/be/power5+/multiarch
diff --git a/sysdeps/powerpc/powerpc64/be/power6x/Implies b/sysdeps/powerpc/powerpc64/be/power6x/Implies
new file mode 100644
index 0000000000..018c999e10
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power6x/Implies
@@ -0,0 +1,3 @@
+powerpc/powerpc64/power6x
+powerpc/powerpc64/be/power6/fpu
+powerpc/powerpc64/be/power6
diff --git a/sysdeps/powerpc/powerpc64/be/power6x/fpu/Implies b/sysdeps/powerpc/powerpc64/be/power6x/fpu/Implies
new file mode 100644
index 0000000000..4d1744c0b4
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power6x/fpu/Implies
@@ -0,0 +1,2 @@
+powerpc/powerpc64/power6x/fpu
+powerpc/powerpc64/be/power6/fpu
diff --git a/sysdeps/powerpc/powerpc64/be/power6x/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power6x/fpu/multiarch/Implies
new file mode 100644
index 0000000000..6da6f27f08
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power6x/fpu/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/be/power6/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/be/power6x/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power6x/multiarch/Implies
new file mode 100644
index 0000000000..86cbf9e528
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power6x/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/be/power6/multiarch
diff --git a/sysdeps/powerpc/powerpc64/be/power7/Implies b/sysdeps/powerpc/powerpc64/be/power7/Implies
new file mode 100644
index 0000000000..b1853f1873
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power7/Implies
@@ -0,0 +1,3 @@
+powerpc/powerpc64/power7
+powerpc/powerpc64/be/power6/fpu
+powerpc/powerpc64/be/power6
diff --git a/sysdeps/powerpc/powerpc64/be/power7/fpu/Implies b/sysdeps/powerpc/powerpc64/be/power7/fpu/Implies
new file mode 100644
index 0000000000..33830fe120
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power7/fpu/Implies
@@ -0,0 +1,2 @@
+powerpc/powerpc64/power7/fpu
+powerpc/powerpc64/be/power6/fpu
diff --git a/sysdeps/powerpc/powerpc64/be/power7/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power7/fpu/multiarch/Implies
new file mode 100644
index 0000000000..6da6f27f08
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power7/fpu/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/be/power6/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/be/power7/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power7/multiarch/Implies
new file mode 100644
index 0000000000..86cbf9e528
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power7/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/be/power6/multiarch
diff --git a/sysdeps/powerpc/powerpc64/be/power8/Implies b/sysdeps/powerpc/powerpc64/be/power8/Implies
new file mode 100644
index 0000000000..cdaa47e809
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power8/Implies
@@ -0,0 +1,3 @@
+powerpc/powerpc64/power8
+powerpc/powerpc64/be/power7/fpu
+powerpc/powerpc64/be/power7
diff --git a/sysdeps/powerpc/powerpc64/be/power8/fpu/Implies b/sysdeps/powerpc/powerpc64/be/power8/fpu/Implies
new file mode 100644
index 0000000000..72e9f54efc
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power8/fpu/Implies
@@ -0,0 +1,2 @@
+powerpc/powerpc64/power8/fpu
+powerpc/powerpc64/be/power7/fpu/
diff --git a/sysdeps/powerpc/powerpc64/be/power8/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power8/fpu/multiarch/Implies
new file mode 100644
index 0000000000..babe3de793
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power8/fpu/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/be/power7/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/be/power8/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power8/multiarch/Implies
new file mode 100644
index 0000000000..8ec7fa2c54
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power8/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/be/power7/multiarch
diff --git a/sysdeps/powerpc/powerpc64/be/power9/Implies b/sysdeps/powerpc/powerpc64/be/power9/Implies
new file mode 100644
index 0000000000..9b40c0f58c
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power9/Implies
@@ -0,0 +1,3 @@
+powerpc/powerpc64/power9
+powerpc/powerpc64/be/power8/fpu
+powerpc/powerpc64/be/power8
diff --git a/sysdeps/powerpc/powerpc64/be/power9/fpu/Implies b/sysdeps/powerpc/powerpc64/be/power9/fpu/Implies
new file mode 100644
index 0000000000..bdec0f9295
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power9/fpu/Implies
@@ -0,0 +1,2 @@
+powerpc/powerpc64/power9/fpu
+powerpc/powerpc64/be/power8/fpu
diff --git a/sysdeps/powerpc/powerpc64/be/power9/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power9/fpu/multiarch/Implies
new file mode 100644
index 0000000000..93e2a02716
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power9/fpu/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/be/power8/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/be/power9/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power9/multiarch/Implies
new file mode 100644
index 0000000000..8bea6abe00
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power9/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/be/power8/multiarch
diff --git a/sysdeps/powerpc/powerpc64/le/Implies b/sysdeps/powerpc/powerpc64/le/Implies
new file mode 100644
index 0000000000..a105a325f7
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/le/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64
diff --git a/sysdeps/powerpc/powerpc64le/Implies-before b/sysdeps/powerpc/powerpc64/le/Implies-before
index 48065141a9..48065141a9 100644
--- a/sysdeps/powerpc/powerpc64le/Implies-before
+++ b/sysdeps/powerpc/powerpc64/le/Implies-before
diff --git a/sysdeps/powerpc/powerpc64le/Makefile b/sysdeps/powerpc/powerpc64/le/Makefile
index 14d39e28b1..14d39e28b1 100644
--- a/sysdeps/powerpc/powerpc64le/Makefile
+++ b/sysdeps/powerpc/powerpc64/le/Makefile
diff --git a/sysdeps/powerpc/powerpc64le/configure b/sysdeps/powerpc/powerpc64/le/configure
index 66bb5dcc1a..66bb5dcc1a 100644
--- a/sysdeps/powerpc/powerpc64le/configure
+++ b/sysdeps/powerpc/powerpc64/le/configure
diff --git a/sysdeps/powerpc/powerpc64le/configure.ac b/sysdeps/powerpc/powerpc64/le/configure.ac
index 20a49d89e8..20a49d89e8 100644
--- a/sysdeps/powerpc/powerpc64le/configure.ac
+++ b/sysdeps/powerpc/powerpc64/le/configure.ac
diff --git a/sysdeps/powerpc/powerpc64/le/fpu/Implies b/sysdeps/powerpc/powerpc64/le/fpu/Implies
new file mode 100644
index 0000000000..c1f617b7da
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/le/fpu/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/fpu
diff --git a/sysdeps/powerpc/powerpc64le/fpu/e_sqrtf128.c b/sysdeps/powerpc/powerpc64/le/fpu/e_sqrtf128.c
index 0ff897bef3..0ff897bef3 100644
--- a/sysdeps/powerpc/powerpc64le/fpu/e_sqrtf128.c
+++ b/sysdeps/powerpc/powerpc64/le/fpu/e_sqrtf128.c
diff --git a/sysdeps/powerpc/powerpc64/le/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/le/fpu/multiarch/Implies
new file mode 100644
index 0000000000..8d6531a174
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/le/fpu/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64le/fpu/sfp-machine.h b/sysdeps/powerpc/powerpc64/le/fpu/sfp-machine.h
index fac5dd0347..fac5dd0347 100644
--- a/sysdeps/powerpc/powerpc64le/fpu/sfp-machine.h
+++ b/sysdeps/powerpc/powerpc64/le/fpu/sfp-machine.h
diff --git a/sysdeps/powerpc/powerpc64/le/multiarch/Implies b/sysdeps/powerpc/powerpc64/le/multiarch/Implies
new file mode 100644
index 0000000000..30edcf7f9d
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/le/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/multiarch
diff --git a/sysdeps/powerpc/powerpc64/le/power7/Implies b/sysdeps/powerpc/powerpc64/le/power7/Implies
new file mode 100644
index 0000000000..5763968694
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/le/power7/Implies
@@ -0,0 +1,13 @@
+powerpc/powerpc64/power7
+powerpc/powerpc64/power6/fpu
+powerpc/powerpc64/power6
+powerpc/powerpc64/power5+/fpu
+powerpc/powerpc64/power5+
+powerpc/power5+/fpu
+powerpc/power5+
+powerpc/powerpc64/power5/fpu
+powerpc/powerpc64/power5
+powerpc/powerpc64/power4
+powerpc/power4/fpu
+powerpc/power4
+powerpc/powerpc64/le
diff --git a/sysdeps/powerpc/powerpc64/le/power7/fpu/Implies b/sysdeps/powerpc/powerpc64/le/power7/fpu/Implies
new file mode 100644
index 0000000000..27eb299ef0
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/le/power7/fpu/Implies
@@ -0,0 +1,5 @@
+powerpc/powerpc64/power7/fpu
+powerpc/powerpc64/power6/fpu
+powerpc/powerpc64/power5+/fpu
+powerpc/powerpc64/power5/fpu
+powerpc/powerpc64/le/fpu
diff --git a/sysdeps/powerpc/powerpc64/le/power7/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/le/power7/fpu/multiarch/Implies
new file mode 100644
index 0000000000..f9b3a92c33
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/le/power7/fpu/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/le/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/le/power7/multiarch/Implies b/sysdeps/powerpc/powerpc64/le/power7/multiarch/Implies
new file mode 100644
index 0000000000..87b32a21ee
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/le/power7/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/le/multiarch
diff --git a/sysdeps/powerpc/powerpc64/le/power8/Implies b/sysdeps/powerpc/powerpc64/le/power8/Implies
new file mode 100644
index 0000000000..6c3fc78ce1
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/le/power8/Implies
@@ -0,0 +1,2 @@
+powerpc/powerpc64/power8
+powerpc/powerpc64/le/power7
diff --git a/sysdeps/powerpc/powerpc64/le/power8/fpu/Implies b/sysdeps/powerpc/powerpc64/le/power8/fpu/Implies
new file mode 100644
index 0000000000..be3c5157b9
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/le/power8/fpu/Implies
@@ -0,0 +1,2 @@
+powerpc/powerpc64/power8/fpu
+powerpc/powerpc64/le/power7/fpu
diff --git a/sysdeps/powerpc/powerpc64/le/power8/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/le/power8/fpu/multiarch/Implies
new file mode 100644
index 0000000000..36c05ff34a
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/le/power8/fpu/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/le/power7/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/le/power8/multiarch/Implies b/sysdeps/powerpc/powerpc64/le/power8/multiarch/Implies
new file mode 100644
index 0000000000..0057194b12
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/le/power8/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/le/power7/multiarch
diff --git a/sysdeps/powerpc/powerpc64/le/power9/Implies b/sysdeps/powerpc/powerpc64/le/power9/Implies
new file mode 100644
index 0000000000..8c0cfd7c2e
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/le/power9/Implies
@@ -0,0 +1,2 @@
+powerpc/powerpc64/power9
+powerpc/powerpc64/le/power8
diff --git a/sysdeps/powerpc/powerpc64/le/power9/fpu/Implies b/sysdeps/powerpc/powerpc64/le/power9/fpu/Implies
new file mode 100644
index 0000000000..8b7c0b4af6
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/le/power9/fpu/Implies
@@ -0,0 +1,2 @@
+powerpc/powerpc64/power9/fpu
+powerpc/powerpc64/le/power8/fpu
diff --git a/sysdeps/powerpc/powerpc64le/power9/fpu/e_sqrtf128.c b/sysdeps/powerpc/powerpc64/le/power9/fpu/e_sqrtf128.c
index 76ab451dbb..76ab451dbb 100644
--- a/sysdeps/powerpc/powerpc64le/power9/fpu/e_sqrtf128.c
+++ b/sysdeps/powerpc/powerpc64/le/power9/fpu/e_sqrtf128.c
diff --git a/sysdeps/powerpc/powerpc64/le/power9/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/le/power9/fpu/multiarch/Implies
new file mode 100644
index 0000000000..dce5bca13e
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/le/power9/fpu/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/le/power8/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/le/power9/multiarch/Implies b/sysdeps/powerpc/powerpc64/le/power9/multiarch/Implies
new file mode 100644
index 0000000000..98efd68e54
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/le/power9/multiarch/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/le/power8/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power5+/Implies b/sysdeps/powerpc/powerpc64/power5+/Implies
deleted file mode 100644
index 565bc94471..0000000000
--- a/sysdeps/powerpc/powerpc64/power5+/Implies
+++ /dev/null
@@ -1,4 +0,0 @@
-powerpc/power5+/fpu
-powerpc/power5+
-powerpc/powerpc64/power5/fpu
-powerpc/powerpc64/power5
diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/Implies b/sysdeps/powerpc/powerpc64/power5+/fpu/Implies
deleted file mode 100644
index f00c50fb49..0000000000
--- a/sysdeps/powerpc/powerpc64/power5+/fpu/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power5/fpu
diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power5+/fpu/multiarch/Implies
deleted file mode 100644
index c0e67848e2..0000000000
--- a/sysdeps/powerpc/powerpc64/power5+/fpu/multiarch/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power5/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power5+/multiarch/Implies b/sysdeps/powerpc/powerpc64/power5+/multiarch/Implies
deleted file mode 100644
index 0851b19fa2..0000000000
--- a/sysdeps/powerpc/powerpc64/power5+/multiarch/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power5/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power5/Implies b/sysdeps/powerpc/powerpc64/power5/Implies
deleted file mode 100644
index bedb20b65c..0000000000
--- a/sysdeps/powerpc/powerpc64/power5/Implies
+++ /dev/null
@@ -1,2 +0,0 @@
-powerpc/powerpc64/power4/fpu
-powerpc/powerpc64/power4
diff --git a/sysdeps/powerpc/powerpc64/power5/fpu/Implies b/sysdeps/powerpc/powerpc64/power5/fpu/Implies
deleted file mode 100644
index 6b8c23efa6..0000000000
--- a/sysdeps/powerpc/powerpc64/power5/fpu/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power4/fpu/
diff --git a/sysdeps/powerpc/powerpc64/power5/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power5/fpu/multiarch/Implies
deleted file mode 100644
index 3740d050a6..0000000000
--- a/sysdeps/powerpc/powerpc64/power5/fpu/multiarch/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power4/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power5/multiarch/Implies b/sysdeps/powerpc/powerpc64/power5/multiarch/Implies
deleted file mode 100644
index 9a3cbb0938..0000000000
--- a/sysdeps/powerpc/powerpc64/power5/multiarch/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power4/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power6/Implies b/sysdeps/powerpc/powerpc64/power6/Implies
deleted file mode 100644
index 4c782d4122..0000000000
--- a/sysdeps/powerpc/powerpc64/power6/Implies
+++ /dev/null
@@ -1,2 +0,0 @@
-powerpc/powerpc64/power5+/fpu
-powerpc/powerpc64/power5+
diff --git a/sysdeps/powerpc/powerpc64/power6/fpu/Implies b/sysdeps/powerpc/powerpc64/power6/fpu/Implies
deleted file mode 100644
index f09854edb6..0000000000
--- a/sysdeps/powerpc/powerpc64/power6/fpu/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power5+/fpu
diff --git a/sysdeps/powerpc/powerpc64/power6/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power6/fpu/multiarch/Implies
deleted file mode 100644
index fca8a4ef0f..0000000000
--- a/sysdeps/powerpc/powerpc64/power6/fpu/multiarch/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power5+/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power6/multiarch/Implies b/sysdeps/powerpc/powerpc64/power6/multiarch/Implies
deleted file mode 100644
index 2ebe304fa6..0000000000
--- a/sysdeps/powerpc/powerpc64/power6/multiarch/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power5+/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power6x/Implies b/sysdeps/powerpc/powerpc64/power6x/Implies
deleted file mode 100644
index 9d68f39d22..0000000000
--- a/sysdeps/powerpc/powerpc64/power6x/Implies
+++ /dev/null
@@ -1,2 +0,0 @@
-powerpc/powerpc64/power6/fpu
-powerpc/powerpc64/power6
diff --git a/sysdeps/powerpc/powerpc64/power6x/fpu/Implies b/sysdeps/powerpc/powerpc64/power6x/fpu/Implies
deleted file mode 100644
index 30fa17646e..0000000000
--- a/sysdeps/powerpc/powerpc64/power6x/fpu/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power6/fpu
diff --git a/sysdeps/powerpc/powerpc64/power6x/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power6x/fpu/multiarch/Implies
deleted file mode 100644
index 410d289a6d..0000000000
--- a/sysdeps/powerpc/powerpc64/power6x/fpu/multiarch/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power6/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power6x/multiarch/Implies b/sysdeps/powerpc/powerpc64/power6x/multiarch/Implies
deleted file mode 100644
index bf5d6171a5..0000000000
--- a/sysdeps/powerpc/powerpc64/power6x/multiarch/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power6/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power7/Implies b/sysdeps/powerpc/powerpc64/power7/Implies
deleted file mode 100644
index 9d68f39d22..0000000000
--- a/sysdeps/powerpc/powerpc64/power7/Implies
+++ /dev/null
@@ -1,2 +0,0 @@
-powerpc/powerpc64/power6/fpu
-powerpc/powerpc64/power6
diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/Implies b/sysdeps/powerpc/powerpc64/power7/fpu/Implies
deleted file mode 100644
index 30fa17646e..0000000000
--- a/sysdeps/powerpc/powerpc64/power7/fpu/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power6/fpu
diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power7/fpu/multiarch/Implies
deleted file mode 100644
index 410d289a6d..0000000000
--- a/sysdeps/powerpc/powerpc64/power7/fpu/multiarch/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power6/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power7/multiarch/Implies b/sysdeps/powerpc/powerpc64/power7/multiarch/Implies
deleted file mode 100644
index bf5d6171a5..0000000000
--- a/sysdeps/powerpc/powerpc64/power7/multiarch/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power6/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power8/Implies b/sysdeps/powerpc/powerpc64/power8/Implies
deleted file mode 100644
index 9a5e3c7277..0000000000
--- a/sysdeps/powerpc/powerpc64/power8/Implies
+++ /dev/null
@@ -1,2 +0,0 @@
-powerpc/powerpc64/power7/fpu
-powerpc/powerpc64/power7
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/Implies b/sysdeps/powerpc/powerpc64/power8/fpu/Implies
deleted file mode 100644
index 1187cdfb0a..0000000000
--- a/sysdeps/powerpc/powerpc64/power8/fpu/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power7/fpu/
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power8/fpu/multiarch/Implies
deleted file mode 100644
index 7fd86fdf87..0000000000
--- a/sysdeps/powerpc/powerpc64/power8/fpu/multiarch/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power7/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power8/multiarch/Implies b/sysdeps/powerpc/powerpc64/power8/multiarch/Implies
deleted file mode 100644
index 1fc7b7cd39..0000000000
--- a/sysdeps/powerpc/powerpc64/power8/multiarch/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power7/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power9/Implies b/sysdeps/powerpc/powerpc64/power9/Implies
deleted file mode 100644
index fad2505ab9..0000000000
--- a/sysdeps/powerpc/powerpc64/power9/Implies
+++ /dev/null
@@ -1,2 +0,0 @@
-powerpc/powerpc64/power8/fpu
-powerpc/powerpc64/power8
diff --git a/sysdeps/powerpc/powerpc64/power9/fpu/Implies b/sysdeps/powerpc/powerpc64/power9/fpu/Implies
deleted file mode 100644
index ae0dbaf857..0000000000
--- a/sysdeps/powerpc/powerpc64/power9/fpu/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power8/fpu
diff --git a/sysdeps/powerpc/powerpc64/power9/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power9/fpu/multiarch/Implies
deleted file mode 100644
index f11e1bdba2..0000000000
--- a/sysdeps/powerpc/powerpc64/power9/fpu/multiarch/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power8/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power9/multiarch/Implies b/sysdeps/powerpc/powerpc64/power9/multiarch/Implies
deleted file mode 100644
index dd6bca4b36..0000000000
--- a/sysdeps/powerpc/powerpc64/power9/multiarch/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power8/multiarch
diff --git a/sysdeps/powerpc/powerpc64le/power7/Implies b/sysdeps/powerpc/powerpc64le/power7/Implies
deleted file mode 100644
index eedef823d5..0000000000
--- a/sysdeps/powerpc/powerpc64le/power7/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power7
diff --git a/sysdeps/powerpc/powerpc64le/power7/fpu/Implies b/sysdeps/powerpc/powerpc64le/power7/fpu/Implies
deleted file mode 100644
index 8447198fbc..0000000000
--- a/sysdeps/powerpc/powerpc64le/power7/fpu/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power7/fpu
diff --git a/sysdeps/powerpc/powerpc64le/power7/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64le/power7/fpu/multiarch/Implies
deleted file mode 100644
index 7fd86fdf87..0000000000
--- a/sysdeps/powerpc/powerpc64le/power7/fpu/multiarch/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power7/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64le/power7/multiarch/Implies b/sysdeps/powerpc/powerpc64le/power7/multiarch/Implies
deleted file mode 100644
index 1fc7b7cd39..0000000000
--- a/sysdeps/powerpc/powerpc64le/power7/multiarch/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power7/multiarch
diff --git a/sysdeps/powerpc/powerpc64le/power8/Implies b/sysdeps/powerpc/powerpc64le/power8/Implies
deleted file mode 100644
index 3c37351dcc..0000000000
--- a/sysdeps/powerpc/powerpc64le/power8/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power8
diff --git a/sysdeps/powerpc/powerpc64le/power8/fpu/Implies b/sysdeps/powerpc/powerpc64le/power8/fpu/Implies
deleted file mode 100644
index ae0dbaf857..0000000000
--- a/sysdeps/powerpc/powerpc64le/power8/fpu/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power8/fpu
diff --git a/sysdeps/powerpc/powerpc64le/power8/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64le/power8/fpu/multiarch/Implies
deleted file mode 100644
index f11e1bdba2..0000000000
--- a/sysdeps/powerpc/powerpc64le/power8/fpu/multiarch/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power8/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64le/power8/multiarch/Implies b/sysdeps/powerpc/powerpc64le/power8/multiarch/Implies
deleted file mode 100644
index dd6bca4b36..0000000000
--- a/sysdeps/powerpc/powerpc64le/power8/multiarch/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power8/multiarch
diff --git a/sysdeps/powerpc/powerpc64le/power9/Implies b/sysdeps/powerpc/powerpc64le/power9/Implies
deleted file mode 100644
index efe5d4193c..0000000000
--- a/sysdeps/powerpc/powerpc64le/power9/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power9
diff --git a/sysdeps/powerpc/powerpc64le/power9/fpu/Implies b/sysdeps/powerpc/powerpc64le/power9/fpu/Implies
deleted file mode 100644
index 3633114b47..0000000000
--- a/sysdeps/powerpc/powerpc64le/power9/fpu/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power9/fpu/
diff --git a/sysdeps/powerpc/powerpc64le/power9/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64le/power9/fpu/multiarch/Implies
deleted file mode 100644
index 105948092d..0000000000
--- a/sysdeps/powerpc/powerpc64le/power9/fpu/multiarch/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power9/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64le/power9/multiarch/Implies b/sysdeps/powerpc/powerpc64le/power9/multiarch/Implies
deleted file mode 100644
index 02be30cfd0..0000000000
--- a/sysdeps/powerpc/powerpc64le/power9/multiarch/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/power9/multiarch
diff --git a/sysdeps/powerpc/preconfigure b/sysdeps/powerpc/preconfigure
index 0030bfd0c0..e3ad6ec57f 100644
--- a/sysdeps/powerpc/preconfigure
+++ b/sysdeps/powerpc/preconfigure
@@ -2,10 +2,10 @@
 
 case "$machine" in
 powerpc64le)
-  base_machine=powerpc machine=powerpc/powerpc64le
+  base_machine=powerpc machine=powerpc/powerpc64/le
   ;;
 powerpc64*)
-  base_machine=powerpc machine=powerpc/powerpc64
+  base_machine=powerpc machine=powerpc/powerpc64/be
   ;;
 powerpc*)
   # Check for e500.
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/970/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/970/Implies
deleted file mode 100644
index 76a32ce7b5..0000000000
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/970/Implies
+++ /dev/null
@@ -1,2 +0,0 @@
-powerpc/powerpc64/970/fpu
-powerpc/powerpc64/970
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/a2/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/a2/Implies
deleted file mode 100644
index 39b19e9c1f..0000000000
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/a2/Implies
+++ /dev/null
@@ -1,2 +0,0 @@
-powerpc/powerpc64/a2/fpu
-powerpc/powerpc64/a2
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/970/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/970/Implies
new file mode 100644
index 0000000000..1ef894bfe0
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/970/Implies
@@ -0,0 +1,2 @@
+powerpc/powerpc64/be/970/fpu
+powerpc/powerpc64/be/970
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/a2/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/a2/Implies
new file mode 100644
index 0000000000..c8774754fc
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/a2/Implies
@@ -0,0 +1,2 @@
+powerpc/powerpc64/be/a2/fpu
+powerpc/powerpc64/be/a2
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/cell/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/cell/Implies
new file mode 100644
index 0000000000..0da65967a2
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/cell/Implies
@@ -0,0 +1,2 @@
+powerpc/powerpc64/be/cell/fpu
+powerpc/powerpc64/be/cell
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/cell/fpu/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/cell/fpu/Implies
new file mode 100644
index 0000000000..6c526bba1c
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/cell/fpu/Implies
@@ -0,0 +1 @@
+powerpc/powerpc64/be/cell/fpu
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/cell/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/cell/Implies
deleted file mode 100644
index 583d4084a4..0000000000
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/cell/Implies
+++ /dev/null
@@ -1,2 +0,0 @@
-powerpc/powerpc64/cell/fpu
-powerpc/powerpc64/cell
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/cell/fpu/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/cell/fpu/Implies
deleted file mode 100644
index b6720ecda5..0000000000
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/cell/fpu/Implies
+++ /dev/null
@@ -1 +0,0 @@
-powerpc/powerpc64/cell/fpu
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64le/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/Implies
index 4eacd3ae86..4eacd3ae86 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64le/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/Implies
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64le/float128-abi.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/float128-abi.h
index 6b954cc673..6b954cc673 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64le/float128-abi.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/float128-abi.h
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64le/fpu/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/fpu/Implies
index 5da96db05b..5da96db05b 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64le/fpu/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/fpu/Implies