Patchwork [v4] powerpc64*: fix the order of implied sysdeps directories

login
register
mail settings
Submitter Gabriel F. T. Gomes
Date March 13, 2018, 4:48 p.m.
Message ID <20180313164809.16530-1-gabriel@inconstante.eti.br>
Download mbox | patch
Permalink /patch/26298/
State Committed
Delegated to: Tulio Magno Quites Machado Filho
Headers show

Comments

Gabriel F. T. Gomes - March 13, 2018, 4:48 p.m.
Changes since v3:

  - Do not move files to powerpc64-common, instead, create a new
    directory for big-endian (.../powerpc64/be), so that powerpc64
    becomes the place for files that are common to big-endian and
    little-endian.
  - Adjusted commit message and ChangeLog entry.

Changes since v2:

  - Rebased against current master.
  - Fixed comments in ifunc-impl-list.c [2].
  - Removed non-existing directories from Implies files and fixed the
    order of inclusion of source files [3].
  - Updated the ChangeLog entry.
  - Rechecked that installed stripped binaries remain unchanged and for
    those who don't the only difference is a string change from
    powerpc64 to powerpc64-common (checked with objdump -D).

Changes since v1:

  - Rebased against current master and ran again with the same
    generating script from v1 [1].
  - Changed commit message.

[1] https://sourceware.org/ml/libc-alpha/2017-12/msg00162.html

[2] https://sourceware.org/ml/libc-alpha/2018-01/msg00076.html

[3] https://sourceware.org/ml/libc-alpha/2018-02/msg00760.html

-- 8< --
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.

	* 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/fpu/Implies: Moved to powerpc64/be.
	* 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: Moved 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/powerpc64le/Implies: Moved 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: Moved 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: Moved 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: Moved 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: Moved 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: Moved from
	powerpc64le.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/le/float128-abi.h: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/le/fpu/Implies: Likewise.
---
 sysdeps/powerpc/powerpc64/be/power4/Implies                 |  3 +++
 sysdeps/powerpc/powerpc64/{ => be}/power4/fpu/Implies       |  0
 .../powerpc/powerpc64/{ => be}/power4/fpu/multiarch/Implies |  0
 sysdeps/powerpc/powerpc64/{ => be}/power4/multiarch/Implies |  0
 sysdeps/powerpc/powerpc64/be/power5+/Implies                |  5 +++++
 sysdeps/powerpc/powerpc64/be/power5+/fpu/Implies            |  2 ++
 sysdeps/powerpc/powerpc64/be/power5+/fpu/multiarch/Implies  |  1 +
 sysdeps/powerpc/powerpc64/be/power5+/multiarch/Implies      |  1 +
 sysdeps/powerpc/powerpc64/be/power5/Implies                 |  3 +++
 sysdeps/powerpc/powerpc64/be/power5/fpu/Implies             |  2 ++
 sysdeps/powerpc/powerpc64/be/power5/fpu/multiarch/Implies   |  1 +
 sysdeps/powerpc/powerpc64/be/power5/multiarch/Implies       |  1 +
 sysdeps/powerpc/powerpc64/be/power6/Implies                 |  3 +++
 sysdeps/powerpc/powerpc64/be/power6/fpu/Implies             |  2 ++
 sysdeps/powerpc/powerpc64/be/power6/fpu/multiarch/Implies   |  1 +
 sysdeps/powerpc/powerpc64/be/power6/multiarch/Implies       |  1 +
 sysdeps/powerpc/powerpc64/be/power6x/Implies                |  3 +++
 sysdeps/powerpc/powerpc64/be/power6x/fpu/Implies            |  2 ++
 sysdeps/powerpc/powerpc64/be/power6x/fpu/multiarch/Implies  |  1 +
 sysdeps/powerpc/powerpc64/be/power6x/multiarch/Implies      |  1 +
 sysdeps/powerpc/powerpc64/be/power7/Implies                 |  3 +++
 sysdeps/powerpc/powerpc64/be/power7/fpu/Implies             |  2 ++
 sysdeps/powerpc/powerpc64/be/power7/fpu/multiarch/Implies   |  1 +
 sysdeps/powerpc/powerpc64/be/power7/multiarch/Implies       |  1 +
 sysdeps/powerpc/powerpc64/be/power8/Implies                 |  3 +++
 sysdeps/powerpc/powerpc64/be/power8/fpu/Implies             |  2 ++
 sysdeps/powerpc/powerpc64/be/power8/fpu/multiarch/Implies   |  1 +
 sysdeps/powerpc/powerpc64/be/power8/multiarch/Implies       |  1 +
 sysdeps/powerpc/powerpc64/be/power9/Implies                 |  3 +++
 sysdeps/powerpc/powerpc64/be/power9/fpu/Implies             |  2 ++
 sysdeps/powerpc/powerpc64/be/power9/fpu/multiarch/Implies   |  1 +
 sysdeps/powerpc/powerpc64/be/power9/multiarch/Implies       |  1 +
 sysdeps/powerpc/{powerpc64le => powerpc64/le}/Implies       |  0
 .../powerpc/{powerpc64le => powerpc64/le}/Implies-before    |  0
 sysdeps/powerpc/{powerpc64le => powerpc64/le}/Makefile      |  0
 sysdeps/powerpc/{powerpc64le => powerpc64/le}/configure     |  0
 sysdeps/powerpc/{powerpc64le => powerpc64/le}/configure.ac  |  0
 sysdeps/powerpc/{powerpc64le => powerpc64/le}/fpu/Implies   |  0
 .../powerpc/{powerpc64le => powerpc64/le}/fpu/e_sqrtf128.c  |  0
 .../{powerpc64le => powerpc64/le}/fpu/multiarch/Implies     |  0
 .../powerpc/{powerpc64le => powerpc64/le}/fpu/sfp-machine.h |  0
 .../powerpc/{powerpc64le => powerpc64/le}/multiarch/Implies |  0
 sysdeps/powerpc/powerpc64/le/power7/Implies                 | 13 +++++++++++++
 sysdeps/powerpc/powerpc64/le/power7/fpu/Implies             |  5 +++++
 sysdeps/powerpc/powerpc64/le/power7/fpu/multiarch/Implies   |  1 +
 sysdeps/powerpc/powerpc64/le/power7/multiarch/Implies       |  1 +
 sysdeps/powerpc/powerpc64/le/power8/Implies                 |  2 ++
 sysdeps/powerpc/powerpc64/le/power8/fpu/Implies             |  2 ++
 sysdeps/powerpc/powerpc64/le/power8/fpu/multiarch/Implies   |  1 +
 sysdeps/powerpc/powerpc64/le/power8/multiarch/Implies       |  1 +
 sysdeps/powerpc/powerpc64/le/power9/Implies                 |  2 ++
 sysdeps/powerpc/powerpc64/le/power9/fpu/Implies             |  2 ++
 .../{powerpc64le => powerpc64/le}/power9/fpu/e_sqrtf128.c   |  0
 sysdeps/powerpc/powerpc64/le/power9/fpu/multiarch/Implies   |  1 +
 sysdeps/powerpc/powerpc64/le/power9/multiarch/Implies       |  1 +
 sysdeps/powerpc/powerpc64/power5+/Implies                   |  4 ----
 sysdeps/powerpc/powerpc64/power5+/fpu/Implies               |  1 -
 sysdeps/powerpc/powerpc64/power5+/fpu/multiarch/Implies     |  1 -
 sysdeps/powerpc/powerpc64/power5+/multiarch/Implies         |  1 -
 sysdeps/powerpc/powerpc64/power5/Implies                    |  2 --
 sysdeps/powerpc/powerpc64/power5/fpu/Implies                |  1 -
 sysdeps/powerpc/powerpc64/power5/fpu/multiarch/Implies      |  1 -
 sysdeps/powerpc/powerpc64/power5/multiarch/Implies          |  1 -
 sysdeps/powerpc/powerpc64/power6/Implies                    |  2 --
 sysdeps/powerpc/powerpc64/power6/fpu/Implies                |  1 -
 sysdeps/powerpc/powerpc64/power6/fpu/multiarch/Implies      |  1 -
 sysdeps/powerpc/powerpc64/power6/multiarch/Implies          |  1 -
 sysdeps/powerpc/powerpc64/power6x/Implies                   |  2 --
 sysdeps/powerpc/powerpc64/power6x/fpu/Implies               |  1 -
 sysdeps/powerpc/powerpc64/power6x/fpu/multiarch/Implies     |  1 -
 sysdeps/powerpc/powerpc64/power6x/multiarch/Implies         |  1 -
 sysdeps/powerpc/powerpc64/power7/Implies                    |  2 --
 sysdeps/powerpc/powerpc64/power7/fpu/Implies                |  1 -
 sysdeps/powerpc/powerpc64/power7/fpu/multiarch/Implies      |  1 -
 sysdeps/powerpc/powerpc64/power7/multiarch/Implies          |  1 -
 sysdeps/powerpc/powerpc64/power8/Implies                    |  2 --
 sysdeps/powerpc/powerpc64/power8/fpu/Implies                |  1 -
 sysdeps/powerpc/powerpc64/power8/fpu/multiarch/Implies      |  1 -
 sysdeps/powerpc/powerpc64/power8/multiarch/Implies          |  1 -
 sysdeps/powerpc/powerpc64/power9/Implies                    |  2 --
 sysdeps/powerpc/powerpc64/power9/fpu/Implies                |  1 -
 sysdeps/powerpc/powerpc64/power9/fpu/multiarch/Implies      |  1 -
 sysdeps/powerpc/powerpc64/power9/multiarch/Implies          |  1 -
 sysdeps/powerpc/powerpc64le/power7/Implies                  |  1 -
 sysdeps/powerpc/powerpc64le/power7/fpu/Implies              |  1 -
 sysdeps/powerpc/powerpc64le/power7/fpu/multiarch/Implies    |  1 -
 sysdeps/powerpc/powerpc64le/power7/multiarch/Implies        |  1 -
 sysdeps/powerpc/powerpc64le/power8/Implies                  |  1 -
 sysdeps/powerpc/powerpc64le/power8/fpu/Implies              |  1 -
 sysdeps/powerpc/powerpc64le/power8/fpu/multiarch/Implies    |  1 -
 sysdeps/powerpc/powerpc64le/power8/multiarch/Implies        |  1 -
 sysdeps/powerpc/powerpc64le/power9/Implies                  |  1 -
 sysdeps/powerpc/powerpc64le/power9/fpu/Implies              |  1 -
 sysdeps/powerpc/powerpc64le/power9/fpu/multiarch/Implies    |  1 -
 sysdeps/powerpc/powerpc64le/power9/multiarch/Implies        |  1 -
 sysdeps/powerpc/preconfigure                                |  4 ++--
 .../linux/powerpc/{powerpc64le => powerpc64/le}/Implies     |  0
 .../powerpc/{powerpc64le => powerpc64/le}/float128-abi.h    |  0
 .../linux/powerpc/{powerpc64le => powerpc64/le}/fpu/Implies |  0
 99 files changed, 88 insertions(+), 51 deletions(-)
 create mode 100644 sysdeps/powerpc/powerpc64/be/power4/Implies
 rename sysdeps/powerpc/powerpc64/{ => be}/power4/fpu/Implies (100%)
 rename sysdeps/powerpc/powerpc64/{ => be}/power4/fpu/multiarch/Implies (100%)
 rename sysdeps/powerpc/powerpc64/{ => be}/power4/multiarch/Implies (100%)
 create mode 100644 sysdeps/powerpc/powerpc64/be/power5+/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power5+/fpu/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power5+/fpu/multiarch/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power5+/multiarch/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power5/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power5/fpu/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power5/fpu/multiarch/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power5/multiarch/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power6/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power6/fpu/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power6/fpu/multiarch/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power6/multiarch/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power6x/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power6x/fpu/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power6x/fpu/multiarch/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power6x/multiarch/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power7/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power7/fpu/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power7/fpu/multiarch/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power7/multiarch/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power8/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power8/fpu/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power8/fpu/multiarch/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power8/multiarch/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power9/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power9/fpu/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power9/fpu/multiarch/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/be/power9/multiarch/Implies
 rename sysdeps/powerpc/{powerpc64le => powerpc64/le}/Implies (100%)
 rename sysdeps/powerpc/{powerpc64le => powerpc64/le}/Implies-before (100%)
 rename sysdeps/powerpc/{powerpc64le => powerpc64/le}/Makefile (100%)
 rename sysdeps/powerpc/{powerpc64le => powerpc64/le}/configure (100%)
 rename sysdeps/powerpc/{powerpc64le => powerpc64/le}/configure.ac (100%)
 rename sysdeps/powerpc/{powerpc64le => powerpc64/le}/fpu/Implies (100%)
 rename sysdeps/powerpc/{powerpc64le => powerpc64/le}/fpu/e_sqrtf128.c (100%)
 rename sysdeps/powerpc/{powerpc64le => powerpc64/le}/fpu/multiarch/Implies (100%)
 rename sysdeps/powerpc/{powerpc64le => powerpc64/le}/fpu/sfp-machine.h (100%)
 rename sysdeps/powerpc/{powerpc64le => powerpc64/le}/multiarch/Implies (100%)
 create mode 100644 sysdeps/powerpc/powerpc64/le/power7/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/le/power7/fpu/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/le/power7/fpu/multiarch/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/le/power7/multiarch/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/le/power8/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/le/power8/fpu/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/le/power8/fpu/multiarch/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/le/power8/multiarch/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/le/power9/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/le/power9/fpu/Implies
 rename sysdeps/powerpc/{powerpc64le => powerpc64/le}/power9/fpu/e_sqrtf128.c (100%)
 create mode 100644 sysdeps/powerpc/powerpc64/le/power9/fpu/multiarch/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/le/power9/multiarch/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power5+/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power5+/fpu/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power5+/fpu/multiarch/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power5+/multiarch/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power5/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power5/fpu/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power5/fpu/multiarch/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power5/multiarch/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power6/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power6/fpu/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power6/fpu/multiarch/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power6/multiarch/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power6x/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power6x/fpu/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power6x/fpu/multiarch/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power6x/multiarch/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power7/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power7/fpu/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power7/fpu/multiarch/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power7/multiarch/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power8/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power8/fpu/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power8/fpu/multiarch/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power8/multiarch/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power9/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power9/fpu/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power9/fpu/multiarch/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64/power9/multiarch/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64le/power7/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64le/power7/fpu/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64le/power7/fpu/multiarch/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64le/power7/multiarch/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64le/power8/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64le/power8/fpu/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64le/power8/fpu/multiarch/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64le/power8/multiarch/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64le/power9/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64le/power9/fpu/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64le/power9/fpu/multiarch/Implies
 delete mode 100644 sysdeps/powerpc/powerpc64le/power9/multiarch/Implies
 rename sysdeps/unix/sysv/linux/powerpc/{powerpc64le => powerpc64/le}/Implies (100%)
 rename sysdeps/unix/sysv/linux/powerpc/{powerpc64le => powerpc64/le}/float128-abi.h (100%)
 rename sysdeps/unix/sysv/linux/powerpc/{powerpc64le => powerpc64/le}/fpu/Implies (100%)
Gabriel F. T. Gomes - April 2, 2018, 6:27 p.m.
On Tue, 13 Mar 2018, Gabriel F. T. Gomes wrote:

>Changes since v3:
>
>  - Do not move files to powerpc64-common, instead, create a new
>    directory for big-endian (.../powerpc64/be), so that powerpc64
>    becomes the place for files that are common to big-endian and
>    little-endian.
>  - Adjusted commit message and ChangeLog entry.

Is this new version [1] of the patch OK for master?

Tulio, you gave your OK for the older version, which moved files to
powerpc64-common...  Are you OK with this new version?

[1] https://sourceware.org/ml/libc-alpha/2018-03/msg00321.html
Tulio Magno Quites Machado Filho - April 24, 2018, 6:22 p.m.
"Gabriel F. T. Gomes" <gabriel@inconstante.eti.br> writes:

> On Tue, 13 Mar 2018, Gabriel F. T. Gomes wrote:
>
>>Changes since v3:
>>
>>  - Do not move files to powerpc64-common, instead, create a new
>>    directory for big-endian (.../powerpc64/be), so that powerpc64
>>    becomes the place for files that are common to big-endian and
>>    little-endian.
>>  - Adjusted commit message and ChangeLog entry.
>
> Is this new version [1] of the patch OK for master?
>
> Tulio, you gave your OK for the older version, which moved files to
> powerpc64-common...  Are you OK with this new version?

Yes.  LGTM.

Thanks!
Gabriel F. T. Gomes - April 27, 2018, 8:02 p.m.
On Tue, 24 Apr 2018, Tulio Magno Quites Machado Filho wrote:

>"Gabriel F. T. Gomes" <gabriel@inconstante.eti.br> writes:
>
>> Tulio, you gave your OK for the older version, which moved files to
>> powerpc64-common...  Are you OK with this new version?  
>
>Yes.  LGTM.

Thanks.  Now pushed.

Patch

diff --git a/sysdeps/powerpc/powerpc64/be/power4/Implies b/sysdeps/powerpc/powerpc64/be/power4/Implies
new file mode 100644
index 0000000000..6d067e28ec
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/be/power4/Implies
@@ -0,0 +1,3 @@ 
+powerpc/powerpc64/power4
+powerpc/power4/fpu
+powerpc/power4
diff --git a/sysdeps/powerpc/powerpc64/power4/fpu/Implies b/sysdeps/powerpc/powerpc64/be/power4/fpu/Implies
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power4/fpu/Implies
rename to sysdeps/powerpc/powerpc64/be/power4/fpu/Implies
diff --git a/sysdeps/powerpc/powerpc64/power4/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power4/fpu/multiarch/Implies
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power4/fpu/multiarch/Implies
rename to sysdeps/powerpc/powerpc64/be/power4/fpu/multiarch/Implies
diff --git a/sysdeps/powerpc/powerpc64/power4/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power4/multiarch/Implies
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power4/multiarch/Implies
rename to 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/powerpc64le/Implies b/sysdeps/powerpc/powerpc64/le/Implies
similarity index 100%
rename from sysdeps/powerpc/powerpc64le/Implies
rename to sysdeps/powerpc/powerpc64/le/Implies
diff --git a/sysdeps/powerpc/powerpc64le/Implies-before b/sysdeps/powerpc/powerpc64/le/Implies-before
similarity index 100%
rename from sysdeps/powerpc/powerpc64le/Implies-before
rename to sysdeps/powerpc/powerpc64/le/Implies-before
diff --git a/sysdeps/powerpc/powerpc64le/Makefile b/sysdeps/powerpc/powerpc64/le/Makefile
similarity index 100%
rename from sysdeps/powerpc/powerpc64le/Makefile
rename to sysdeps/powerpc/powerpc64/le/Makefile
diff --git a/sysdeps/powerpc/powerpc64le/configure b/sysdeps/powerpc/powerpc64/le/configure
similarity index 100%
rename from sysdeps/powerpc/powerpc64le/configure
rename to sysdeps/powerpc/powerpc64/le/configure
diff --git a/sysdeps/powerpc/powerpc64le/configure.ac b/sysdeps/powerpc/powerpc64/le/configure.ac
similarity index 100%
rename from sysdeps/powerpc/powerpc64le/configure.ac
rename to sysdeps/powerpc/powerpc64/le/configure.ac
diff --git a/sysdeps/powerpc/powerpc64le/fpu/Implies b/sysdeps/powerpc/powerpc64/le/fpu/Implies
similarity index 100%
rename from sysdeps/powerpc/powerpc64le/fpu/Implies
rename to sysdeps/powerpc/powerpc64/le/fpu/Implies
diff --git a/sysdeps/powerpc/powerpc64le/fpu/e_sqrtf128.c b/sysdeps/powerpc/powerpc64/le/fpu/e_sqrtf128.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64le/fpu/e_sqrtf128.c
rename to sysdeps/powerpc/powerpc64/le/fpu/e_sqrtf128.c
diff --git a/sysdeps/powerpc/powerpc64le/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/le/fpu/multiarch/Implies
similarity index 100%
rename from sysdeps/powerpc/powerpc64le/fpu/multiarch/Implies
rename to sysdeps/powerpc/powerpc64/le/fpu/multiarch/Implies
diff --git a/sysdeps/powerpc/powerpc64le/fpu/sfp-machine.h b/sysdeps/powerpc/powerpc64/le/fpu/sfp-machine.h
similarity index 100%
rename from sysdeps/powerpc/powerpc64le/fpu/sfp-machine.h
rename to sysdeps/powerpc/powerpc64/le/fpu/sfp-machine.h
diff --git a/sysdeps/powerpc/powerpc64le/multiarch/Implies b/sysdeps/powerpc/powerpc64/le/multiarch/Implies
similarity index 100%
rename from sysdeps/powerpc/powerpc64le/multiarch/Implies
rename to sysdeps/powerpc/powerpc64/le/multiarch/Implies
diff --git a/sysdeps/powerpc/powerpc64/le/power7/Implies b/sysdeps/powerpc/powerpc64/le/power7/Implies
new file mode 100644
index 0000000000..15ba5bd619
--- /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/power5+
+powerpc/power5+/fpu
+powerpc/powerpc64/power5+
+powerpc/powerpc64/power5/fpu
+powerpc/powerpc64/power5
+powerpc/powerpc64/power4
+powerpc/power4
+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
similarity index 100%
rename from sysdeps/powerpc/powerpc64le/power9/fpu/e_sqrtf128.c
rename to 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/powerpc64le/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/Implies
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64le/Implies
rename to 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
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64le/float128-abi.h
rename to 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
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64le/fpu/Implies
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/le/fpu/Implies