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

login
register
mail settings
Submitter Gabriel F. T. Gomes
Date March 7, 2018, 4:36 p.m.
Message ID <20180307163615.6450-1-gabriel@inconstante.eti.br>
Download mbox | patch
Permalink /patch/26226/
State Superseded
Headers show

Comments

Gabriel F. T. Gomes - March 7, 2018, 4:36 p.m.
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 moving sysdeps/powerpc/powerpc64 to
sysdeps/powerpc/powerpc64-common and creating new Implies files to
provide the hierarchy of processors for powerpc64 and powerpc64le
separately.

Builds for powerpc64le still use sysdeps/powerpc/powerpc64le, which now
implies sysdeps/powerpc/powerpc64-common.  Likewise, builds for
powerpc64 still use sysdeps/powerpc/powerpc64, which now has new Implies
files to imply sysdeps/powerpc/powerpc64-common.  The hierarchy of
processors is now implemented separately for powerpc64 and powerpc64le
(each in its own subdirectory).  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/powerpc64/Makefile: Moved to powerpc64-common.
	* sysdeps/powerpc/powerpc64/__longjmp-common.S: Likewise.
	* sysdeps/powerpc/powerpc64/__longjmp.S: Likewise.
	* sysdeps/powerpc/powerpc64/a2/memcpy.S: Likewise.
	* sysdeps/powerpc/powerpc64/addmul_1.S: Likewise.
	* sysdeps/powerpc/powerpc64/atomic-machine.h: Likewise.
	* sysdeps/powerpc/powerpc64/backtrace.c: Likewise.
	* sysdeps/powerpc/powerpc64/bits/wordsize.h: Likewise.
	* sysdeps/powerpc/powerpc64/bsd-_setjmp.S: Likewise.
	* sysdeps/powerpc/powerpc64/bsd-setjmp.S: Likewise.
	* sysdeps/powerpc/powerpc64/bzero.S: Likewise.
	* sysdeps/powerpc/powerpc64/cell/memcpy.S: Likewise.
	* sysdeps/powerpc/powerpc64/configure: Likewise.
	* sysdeps/powerpc/powerpc64/configure.ac: Likewise.
	* sysdeps/powerpc/powerpc64/crti.S: Likewise.
	* sysdeps/powerpc/powerpc64/crtn.S: Likewise.
	* sysdeps/powerpc/powerpc64/dl-dtprocnum.h: Likewise.
	* sysdeps/powerpc/powerpc64/dl-irel.h: Likewise.
	* sysdeps/powerpc/powerpc64/dl-machine.c: Likewise.
	* sysdeps/powerpc/powerpc64/dl-machine.h: Likewise.
	* sysdeps/powerpc/powerpc64/dl-trampoline.S: Likewise.
	* sysdeps/powerpc/powerpc64/entry.h: Likewise.
	* sysdeps/powerpc/powerpc64/ffsll.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-power5+.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-power5+.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-power6.S:
	Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysignf.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_finitef-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_finitef.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-power5+.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-power5+.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinff-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinff.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power5.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6x.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnanf.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power6x.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrintf.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power5+.S:
	Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power6x.S:
	Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_llroundf-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_llroundf.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_logb-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_logb-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_logb.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbf-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbf-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbf.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbl-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbl-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbl.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_lrint.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_lround.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf-power5+.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_modff-power5+.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_modff-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_modff.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-power5+.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_round.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-power5+.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-power5+.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-power5+.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/w_expf.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_ceil.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_ceilf.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_copysign.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_copysignf.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_copysignl.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_fabsl.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_floor.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_floorf.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_isnan.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_llrint.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_llrintf.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_llround.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_llroundf.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_lrint.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_lround.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_lroundf.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_nearbyint.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_nearbyintf.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_rint.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_rintf.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_round.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_roundf.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_trunc.S: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/s_truncf.S: Likewise.
	* sysdeps/powerpc/powerpc64/hp-timing.h: Likewise.
	* sysdeps/powerpc/powerpc64/lshift.S: Likewise.
	* sysdeps/powerpc/powerpc64/memcpy.S: Likewise.
	* sysdeps/powerpc/powerpc64/memset.S: Likewise.
	* sysdeps/powerpc/powerpc64/mul_1.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/Makefile: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/bcopy-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/bcopy.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/bzero.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/init-arch.h: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memchr-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memchr-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memchr-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memchr.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memcmp-power4.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memcmp-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memcmp-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memcmp-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memcmp.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memcpy-a2.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memcpy-cell.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memcpy-power4.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memcpy-power6.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memcpy-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memcpy-power8-cached.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memcpy.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memmove-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memmove.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/mempcpy-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/mempcpy-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/mempcpy.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memrchr-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memrchr-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memrchr-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memrchr.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memset-power4.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memset-power6.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memset-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memset-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memset.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/rawmemchr-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/rawmemchr-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/rtld-memset.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/rtld-strchr.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/stpcpy-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/stpcpy-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/stpcpy.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/stpncpy-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/stpncpy-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/stpncpy-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/stpncpy.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcasecmp-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcasecmp.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcasestr-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcasestr-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcasestr.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcat-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcat-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcat.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strchr-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strchr-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strchr-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strchr.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strchrnul-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strchrnul-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strchrnul.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcmp-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcmp-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcmp-power9.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcmp.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcpy-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcpy-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcpy-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcpy.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcspn-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcspn-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcspn.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strlen-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strlen-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strlen.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strncase-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strncase-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strncase-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strncase.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strncase_l.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strncat-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strncat-power8.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strncat-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strncat.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strncmp-power4.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strncmp-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strncmp-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strncmp-power9.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strncmp.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strncpy-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strncpy-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strncpy-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strncpy.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strnlen-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strnlen-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strnlen.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strrchr-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strrchr-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strrchr.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strspn-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strspn-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strspn.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strstr-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strstr-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strstr.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wcschr-power6.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wcschr-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wcschr-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wcschr.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wcscpy-power6.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wcscpy-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wcscpy-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wcscpy.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wcsrchr-power6.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wcsrchr-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wcsrchr-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wcsrchr.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/power4/Makefile: Likewise.
	* sysdeps/powerpc/powerpc64/power4/memcmp.S: Likewise.
	* sysdeps/powerpc/powerpc64/power4/memcopy.h: Likewise.
	* sysdeps/powerpc/powerpc64/power4/memcpy.S: Likewise.
	* sysdeps/powerpc/powerpc64/power4/memset.S: Likewise.
	* sysdeps/powerpc/powerpc64/power4/strncmp.S: Likewise.
	* sysdeps/powerpc/powerpc64/power5+/fpu/s_ceil.S: Likewise.
	* sysdeps/powerpc/powerpc64/power5+/fpu/s_ceilf.S: Likewise.
	* sysdeps/powerpc/powerpc64/power5+/fpu/s_floor.S: Likewise.
	* sysdeps/powerpc/powerpc64/power5+/fpu/s_floorf.S: Likewise.
	* sysdeps/powerpc/powerpc64/power5+/fpu/s_llround.S: Likewise.
	* sysdeps/powerpc/powerpc64/power5+/fpu/s_llroundf.S: Likewise.
	* sysdeps/powerpc/powerpc64/power5+/fpu/s_round.S: Likewise.
	* sysdeps/powerpc/powerpc64/power5+/fpu/s_roundf.S: Likewise.
	* sysdeps/powerpc/powerpc64/power5+/fpu/s_trunc.S: Likewise.
	* sysdeps/powerpc/powerpc64/power5+/fpu/s_truncf.S: Likewise.
	* sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S: Likewise.
	* sysdeps/powerpc/powerpc64/power6/fpu/s_copysign.S: Likewise.
	* sysdeps/powerpc/powerpc64/power6/fpu/s_copysignf.S: Likewise.
	* sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S: Likewise.
	* sysdeps/powerpc/powerpc64/power6/memcpy.S: Likewise.
	* sysdeps/powerpc/powerpc64/power6/memset.S: Likewise.
	* sysdeps/powerpc/powerpc64/power6/wcschr.c: Likewise.
	* sysdeps/powerpc/powerpc64/power6/wcscpy.c: Likewise.
	* sysdeps/powerpc/powerpc64/power6/wcsrchr.c: Likewise.
	* sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S: Likewise.
	* sysdeps/powerpc/powerpc64/power6x/fpu/s_llrint.S: Likewise.
	* sysdeps/powerpc/powerpc64/power6x/fpu/s_llround.S: Likewise.
	* sysdeps/powerpc/powerpc64/power6x/fpu/s_llroundf.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/Makefile: Likewise.
	* sysdeps/powerpc/powerpc64/power7/add_n.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/bcopy.c: Likewise.
	* sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/fpu/s_finitef.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/fpu/s_isinff.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/fpu/s_isnanf.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/fpu/s_logb.c: Likewise.
	* sysdeps/powerpc/powerpc64/power7/fpu/s_logbf.c: Likewise.
	* sysdeps/powerpc/powerpc64/power7/fpu/s_logbl.c: Likewise.
	* sysdeps/powerpc/powerpc64/power7/memchr.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/memcmp.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/memcpy.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/memmove.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/mempcpy.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/memrchr.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/memset.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/rawmemchr.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/stpncpy.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/strcasecmp.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/strcasecmp_l.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/strchr.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/strchrnul.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/strcmp.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/strlen.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/strncmp.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/strncpy.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/strnlen.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/strrchr.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/strstr-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/power7/strstr.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/sub_n.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/Makefile: Likewise.
	* sysdeps/powerpc/powerpc64/power8/fpu/e_expf.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/fpu/s_cosf.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/fpu/s_finite.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/fpu/s_finitef.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/fpu/s_isinff.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/fpu/s_isnanf.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/fpu/s_llrint.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/fpu/s_llround.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/fpu/s_llroundf.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/fpu/s_sinf.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/fpu/w_expf.c: Likewise.
	* sysdeps/powerpc/powerpc64/power8/memchr.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/memcmp.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/memrchr.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/memset.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/stpcpy.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/stpncpy.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/strcasecmp.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/strcasestr-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/power8/strcasestr.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/strchr.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/strchrnul.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/strcmp.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/strcpy.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/strcspn.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/strlen.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/strncase.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/strncmp.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/strncpy.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/strnlen.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/strrchr.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/strspn.S: Likewise.
	* sysdeps/powerpc/powerpc64/power9/strcmp.S: Likewise.
	* sysdeps/powerpc/powerpc64/power9/strncmp.S: Likewise.
	* sysdeps/powerpc/powerpc64/ppc-mcount.S: Likewise.
	* sysdeps/powerpc/powerpc64/register-dump.h: Likewise.
	* sysdeps/powerpc/powerpc64/rtld-memset.c: Likewise.
	* sysdeps/powerpc/powerpc64/setjmp-common.S: Likewise.
	* sysdeps/powerpc/powerpc64/setjmp.S: Likewise.
	* sysdeps/powerpc/powerpc64/stackguard-macros.h: Likewise.
	* sysdeps/powerpc/powerpc64/start.S: Likewise.
	* sysdeps/powerpc/powerpc64/strchr.S: Likewise.
	* sysdeps/powerpc/powerpc64/strcmp.S: Likewise.
	* sysdeps/powerpc/powerpc64/strlen.S: Likewise.
	* sysdeps/powerpc/powerpc64/strncmp.S: Likewise.
	* sysdeps/powerpc/powerpc64/submul_1.S: Likewise.
	* sysdeps/powerpc/powerpc64/sysdep.h: Likewise.
	* sysdeps/powerpc/powerpc64/tls-macros.h: Likewise.
	* sysdeps/powerpc/powerpc64/tst-audit.h: Likewise.

	* sysdeps/powerpc/powerpc64-common/Makefile: New file moved from
	powerpc64.
	* sysdeps/powerpc/powerpc64-common/__longjmp-common.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/__longjmp.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/a2/memcpy.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/addmul_1.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/atomic-machine.h: Likewise.
	* sysdeps/powerpc/powerpc64-common/backtrace.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/bits/wordsize.h: Likewise.
	* sysdeps/powerpc/powerpc64-common/bsd-_setjmp.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/bsd-setjmp.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/bzero.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/cell/memcpy.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/configure: Likewise.
	* sysdeps/powerpc/powerpc64-common/configure.ac: Likewise.
	* sysdeps/powerpc/powerpc64-common/crti.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/crtn.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/dl-dtprocnum.h: Likewise.
	* sysdeps/powerpc/powerpc64-common/dl-irel.h: Likewise.
	* sysdeps/powerpc/powerpc64-common/dl-machine.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/dl-machine.h: Likewise.
	* sysdeps/powerpc/powerpc64-common/dl-trampoline.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/entry.h: Likewise.
	* sysdeps/powerpc/powerpc64-common/ffsll.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/Makefile: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_expf-ppc64.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_expf.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypot-power7.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypot-ppc64.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypot.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypotf-power7.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypotf-ppc64.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypotf.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceil.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceilf.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysign.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysignf.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_cosf-ppc64.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_cosf.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite-ppc64.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finitef-ppc64.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finitef.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floor.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floorf.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf-ppc64.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinff-ppc64.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinff.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnanf.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrintf.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llroundf.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logb-power7.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logb-ppc64.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logb.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbf-power7.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbf-ppc64.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbf.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbl-power7.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbl-ppc64.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbl.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_lrint.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_lround.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modf-power5+.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modf-ppc64.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modf.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modff-power5+.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modff-ppc64.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modff.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_round.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_roundf.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_sinf-ppc64.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_sinf.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_trunc.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_truncf.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/w_expf.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_ceil.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_ceilf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_copysign.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_copysignf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_copysignl.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_fabsl.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_floor.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_floorf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_isnan.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_llrint.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_llrintf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_llround.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_llroundf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_lrint.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_lround.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_lroundf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_nearbyint.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_nearbyintf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_rint.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_rintf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_round.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_roundf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_trunc.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/s_truncf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/hp-timing.h: Likewise.
	* sysdeps/powerpc/powerpc64-common/lshift.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/memcpy.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/memset.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/mul_1.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/Makefile: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/bcopy-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/bcopy.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/bzero.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/init-arch.h: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memchr-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memchr.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memcmp-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memcmp.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memcpy.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memmove-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memmove.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/mempcpy-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/mempcpy.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memrchr-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memrchr.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memset.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/rawmemchr-ppc64.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/rawmemchr.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/stpcpy-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/stpcpy-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/stpcpy.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/stpncpy-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/stpncpy.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp-ppc64.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp_l.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcasestr-ppc64.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcasestr.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcat-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcat-power8.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcat-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcat.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strchr.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strchrnul-ppc64.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strchrnul.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcmp.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcpy-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcpy-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcpy.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcspn-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcspn.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strlen.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strncase-power7.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strncase-ppc64.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strncase.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strncase_l-power7.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strncase_l.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strncat-power7.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strncat-power8.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strncat-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strncat.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strncmp.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strncpy-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strncpy.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strnlen-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strnlen.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strrchr-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strrchr.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strspn-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strspn.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strstr-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strstr.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/wcschr-power6.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/wcschr-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/wcschr-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/wcschr.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/wcscpy-power6.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/wcscpy-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/wcscpy-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/wcscpy.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/wcsrchr-power6.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/wcsrchr-power7.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/wcsrchr-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/wcsrchr.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/wordcopy-ppc64.c:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/power4/Makefile: Likewise.
	* sysdeps/powerpc/powerpc64-common/power4/memcmp.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power4/memcopy.h: Likewise.
	* sysdeps/powerpc/powerpc64-common/power4/memcpy.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power4/memset.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power4/strncmp.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power5+/fpu/s_ceil.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power5+/fpu/s_ceilf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power5+/fpu/s_floor.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power5+/fpu/s_floorf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power5+/fpu/s_llround.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power5+/fpu/s_llroundf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power5+/fpu/s_round.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power5+/fpu/s_roundf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power5+/fpu/s_trunc.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power5+/fpu/s_truncf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power5/fpu/s_isnan.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power6/fpu/s_copysign.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power6/fpu/s_copysignf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power6/fpu/s_isnan.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power6/memcpy.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power6/memset.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power6/wcschr.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/power6/wcscpy.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/power6/wcsrchr.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/power6x/fpu/s_isnan.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power6x/fpu/s_llrint.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power6x/fpu/s_llround.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power6x/fpu/s_llroundf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/Makefile: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/add_n.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/bcopy.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/fpu/s_finite.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/fpu/s_finitef.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/fpu/s_isinf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/fpu/s_isinff.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/fpu/s_isnan.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/fpu/s_isnanf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/fpu/s_logb.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/fpu/s_logbf.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/fpu/s_logbl.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/memchr.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/memcmp.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/memcpy.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/memmove.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/mempcpy.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/memrchr.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/memset.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/rawmemchr.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/strcasecmp.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/strcasecmp_l.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/strchr.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/strchrnul.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/strcmp.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/strlen.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/strncmp.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/strncpy.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/strnlen.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/strrchr.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/strstr-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/strstr.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/sub_n.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/Makefile: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/fpu/e_expf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/fpu/s_cosf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/fpu/s_finite.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/fpu/s_finitef.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/fpu/s_isinf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/fpu/s_isinff.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/fpu/s_isnan.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/fpu/s_isnanf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/fpu/s_llrint.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/fpu/s_llround.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/fpu/s_llroundf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/fpu/s_sinf.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/fpu/w_expf.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/memchr.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/memcmp.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/memrchr.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/memset.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/strcasecmp.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/strcasestr-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/strcasestr.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/strchr.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/strcmp.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/strcpy.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/strlen.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/strncmp.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/strncpy.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/strnlen.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/strrchr.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/strspn.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/ppc-mcount.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/register-dump.h: Likewise.
	* sysdeps/powerpc/powerpc64-common/rtld-memset.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/setjmp-common.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/setjmp.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/stackguard-macros.h: Likewise.
	* sysdeps/powerpc/powerpc64-common/start.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/strchr.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/strcmp.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/strlen.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/strncmp.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/submul_1.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/sysdep.h: Likewise.
	* sysdeps/powerpc/powerpc64-common/tls-macros.h: Likewise.
	* sysdeps/powerpc/powerpc64-common/tst-audit.h: Likewise.

	* sysdeps/powerpc/powerpc64-common/multiarch/ifunc-impl-list.c:	New
	file, moved from powerpc64 and with comments updated.

	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_expf-power8.S: New
	file moved from powerpc64 and with #include<> directives adjusted.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceil-power5+.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceil-ppc64.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceilf-power5+.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceilf-ppc64.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysign-power6.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysign-ppc64.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_cosf-power8.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite-power7.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite-power8.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floor-power5+.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floor-ppc64.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floorf-power5+.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floorf-ppc64.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf-power7.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf-power8.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power5.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power6.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power6x.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power7.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power8.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-ppc64.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-power6x.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-power8.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-ppc64.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power5+.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power6x.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power8.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-ppc64.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llroundf-ppc64.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_round-power5+.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_round-ppc64.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_roundf-power5+.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_roundf-ppc64.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_sinf-power8.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_trunc-power5+.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_trunc-ppc64.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_truncf-power5+.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_truncf-ppc64.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memchr-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memchr-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power4.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memcpy-a2.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memcpy-cell.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power4.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power6.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power8-cached.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memcpy-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memmove-power7.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/mempcpy-power7.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memrchr-power7.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memrchr-power8.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memset-power4.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memset-power6.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memset-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memset-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/memset-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/rawmemchr-power7.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/rtld-memset.c: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/rtld-strchr.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/stpcpy-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/stpncpy-power7.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/stpncpy-power8.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp-power7.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp-power8.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp_l-power7.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcasestr-power8.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strchr-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strchr-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strchr-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strchrnul-power7.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strchrnul-power8.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power9.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcmp-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcpy-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strcspn-power8.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strlen-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strlen-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strlen-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strncase-power8.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power4.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power7.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power8.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power9.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strncmp-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strncpy-power7.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strncpy-power8.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strnlen-power7.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strnlen-power8.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strrchr-power7.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strrchr-power8.S:
	Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strspn-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/multiarch/strstr-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power7/stpncpy.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/stpcpy.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/stpncpy.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/strchrnul.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/strcspn.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power8/strncase.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power9/strcmp.S: Likewise.
	* sysdeps/powerpc/powerpc64-common/power9/strncmp.S: Likewise.

	* sysdeps/powerpc/powerpc64/970/Implies: Prepend a reference to the
	equivalent directory in powerpc64-common.
	* sysdeps/powerpc/powerpc64/Implies: Likewise.
	* sysdeps/powerpc/powerpc64/a2/Implies: Likewise.
	* sysdeps/powerpc/powerpc64/cell/Implies: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/Implies: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/Implies: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/Implies: Likewise.
	* sysdeps/powerpc/powerpc64/power4/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/powerpc64le/Implies: Replace references to powerpc64
	with references to powerpc64-common.
	* sysdeps/powerpc/powerpc64le/fpu/Implies: Likewise.
	* sysdeps/powerpc/powerpc64le/fpu/multiarch/Implies: Likewise.
	* sysdeps/powerpc/powerpc64le/multiarch/Implies: Likewise.

	* sysdeps/powerpc/powerpc64le/power7/Implies: Replace references to
	powerpc64 with references to powerpc64-common and add references to
	older processors.
	* 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.
---
 .../{powerpc64 => powerpc64-common}/Makefile       |  0
 .../__longjmp-common.S                             |  0
 .../{powerpc64 => powerpc64-common}/__longjmp.S    |  0
 .../{powerpc64 => powerpc64-common}/a2/memcpy.S    |  0
 .../{powerpc64 => powerpc64-common}/addmul_1.S     |  0
 .../atomic-machine.h                               |  0
 .../{powerpc64 => powerpc64-common}/backtrace.c    |  0
 .../bits/wordsize.h                                |  0
 .../{powerpc64 => powerpc64-common}/bsd-_setjmp.S  |  0
 .../{powerpc64 => powerpc64-common}/bsd-setjmp.S   |  0
 .../{powerpc64 => powerpc64-common}/bzero.S        |  0
 .../{powerpc64 => powerpc64-common}/cell/memcpy.S  |  0
 .../{powerpc64 => powerpc64-common}/configure      |  0
 .../{powerpc64 => powerpc64-common}/configure.ac   |  0
 .../powerpc/{powerpc64 => powerpc64-common}/crti.S |  0
 .../powerpc/{powerpc64 => powerpc64-common}/crtn.S |  0
 .../{powerpc64 => powerpc64-common}/dl-dtprocnum.h |  0
 .../{powerpc64 => powerpc64-common}/dl-irel.h      |  0
 .../{powerpc64 => powerpc64-common}/dl-machine.c   |  0
 .../{powerpc64 => powerpc64-common}/dl-machine.h   |  0
 .../dl-trampoline.S                                |  0
 .../{powerpc64 => powerpc64-common}/entry.h        |  0
 .../{powerpc64 => powerpc64-common}/ffsll.c        |  0
 .../fpu/multiarch/Makefile                         |  0
 .../fpu/multiarch/e_expf-power8.S                  |  2 +-
 .../fpu/multiarch/e_expf-ppc64.c                   |  0
 .../fpu/multiarch/e_expf.c                         |  0
 .../fpu/multiarch/e_hypot-power7.c                 |  0
 .../fpu/multiarch/e_hypot-ppc64.c                  |  0
 .../fpu/multiarch/e_hypot.c                        |  0
 .../fpu/multiarch/e_hypotf-power7.c                |  0
 .../fpu/multiarch/e_hypotf-ppc64.c                 |  0
 .../fpu/multiarch/e_hypotf.c                       |  0
 .../fpu/multiarch/s_ceil-power5+.S                 |  2 +-
 .../fpu/multiarch/s_ceil-ppc64.S                   |  2 +-
 .../fpu/multiarch/s_ceil.c                         |  0
 .../fpu/multiarch/s_ceilf-power5+.S                |  2 +-
 .../fpu/multiarch/s_ceilf-ppc64.S                  |  2 +-
 .../fpu/multiarch/s_ceilf.c                        |  0
 .../fpu/multiarch/s_copysign-power6.S              |  2 +-
 .../fpu/multiarch/s_copysign-ppc64.S               |  2 +-
 .../fpu/multiarch/s_copysign.c                     |  0
 .../fpu/multiarch/s_copysignf.c                    |  0
 .../fpu/multiarch/s_cosf-power8.S                  |  2 +-
 .../fpu/multiarch/s_cosf-ppc64.c                   |  0
 .../fpu/multiarch/s_cosf.c                         |  0
 .../fpu/multiarch/s_finite-power7.S                |  2 +-
 .../fpu/multiarch/s_finite-power8.S                |  2 +-
 .../fpu/multiarch/s_finite-ppc64.c                 |  0
 .../fpu/multiarch/s_finite.c                       |  0
 .../fpu/multiarch/s_finitef-ppc64.c                |  0
 .../fpu/multiarch/s_finitef.c                      |  0
 .../fpu/multiarch/s_floor-power5+.S                |  2 +-
 .../fpu/multiarch/s_floor-ppc64.S                  |  2 +-
 .../fpu/multiarch/s_floor.c                        |  0
 .../fpu/multiarch/s_floorf-power5+.S               |  2 +-
 .../fpu/multiarch/s_floorf-ppc64.S                 |  2 +-
 .../fpu/multiarch/s_floorf.c                       |  0
 .../fpu/multiarch/s_isinf-power7.S                 |  2 +-
 .../fpu/multiarch/s_isinf-power8.S                 |  2 +-
 .../fpu/multiarch/s_isinf-ppc64.c                  |  0
 .../fpu/multiarch/s_isinf.c                        |  0
 .../fpu/multiarch/s_isinff-ppc64.c                 |  0
 .../fpu/multiarch/s_isinff.c                       |  0
 .../fpu/multiarch/s_isnan-power5.S                 |  2 +-
 .../fpu/multiarch/s_isnan-power6.S                 |  2 +-
 .../fpu/multiarch/s_isnan-power6x.S                |  2 +-
 .../fpu/multiarch/s_isnan-power7.S                 |  2 +-
 .../fpu/multiarch/s_isnan-power8.S                 |  2 +-
 .../fpu/multiarch/s_isnan-ppc64.S                  |  2 +-
 .../fpu/multiarch/s_isnan.c                        |  0
 .../fpu/multiarch/s_isnanf.c                       |  0
 .../fpu/multiarch/s_llrint-power6x.S               |  2 +-
 .../fpu/multiarch/s_llrint-power8.S                |  2 +-
 .../fpu/multiarch/s_llrint-ppc64.S                 |  2 +-
 .../fpu/multiarch/s_llrint.c                       |  0
 .../fpu/multiarch/s_llrintf.c                      |  0
 .../fpu/multiarch/s_llround-power5+.S              |  2 +-
 .../fpu/multiarch/s_llround-power6x.S              |  2 +-
 .../fpu/multiarch/s_llround-power8.S               |  2 +-
 .../fpu/multiarch/s_llround-ppc64.S                |  2 +-
 .../fpu/multiarch/s_llround.c                      |  0
 .../fpu/multiarch/s_llroundf-ppc64.S               |  2 +-
 .../fpu/multiarch/s_llroundf.c                     |  0
 .../fpu/multiarch/s_logb-power7.c                  |  0
 .../fpu/multiarch/s_logb-ppc64.c                   |  0
 .../fpu/multiarch/s_logb.c                         |  0
 .../fpu/multiarch/s_logbf-power7.c                 |  0
 .../fpu/multiarch/s_logbf-ppc64.c                  |  0
 .../fpu/multiarch/s_logbf.c                        |  0
 .../fpu/multiarch/s_logbl-power7.c                 |  0
 .../fpu/multiarch/s_logbl-ppc64.c                  |  0
 .../fpu/multiarch/s_logbl.c                        |  0
 .../fpu/multiarch/s_lrint.c                        |  0
 .../fpu/multiarch/s_lround.c                       |  0
 .../fpu/multiarch/s_modf-power5+.c                 |  0
 .../fpu/multiarch/s_modf-ppc64.c                   |  0
 .../fpu/multiarch/s_modf.c                         |  0
 .../fpu/multiarch/s_modff-power5+.c                |  0
 .../fpu/multiarch/s_modff-ppc64.c                  |  0
 .../fpu/multiarch/s_modff.c                        |  0
 .../fpu/multiarch/s_round-power5+.S                |  2 +-
 .../fpu/multiarch/s_round-ppc64.S                  |  2 +-
 .../fpu/multiarch/s_round.c                        |  0
 .../fpu/multiarch/s_roundf-power5+.S               |  2 +-
 .../fpu/multiarch/s_roundf-ppc64.S                 |  2 +-
 .../fpu/multiarch/s_roundf.c                       |  0
 .../fpu/multiarch/s_sinf-power8.S                  |  2 +-
 .../fpu/multiarch/s_sinf-ppc64.c                   |  0
 .../fpu/multiarch/s_sinf.c                         |  0
 .../fpu/multiarch/s_trunc-power5+.S                |  2 +-
 .../fpu/multiarch/s_trunc-ppc64.S                  |  2 +-
 .../fpu/multiarch/s_trunc.c                        |  0
 .../fpu/multiarch/s_truncf-power5+.S               |  2 +-
 .../fpu/multiarch/s_truncf-ppc64.S                 |  2 +-
 .../fpu/multiarch/s_truncf.c                       |  0
 .../fpu/multiarch/w_expf.c                         |  0
 .../{powerpc64 => powerpc64-common}/fpu/s_ceil.S   |  0
 .../{powerpc64 => powerpc64-common}/fpu/s_ceilf.S  |  0
 .../fpu/s_copysign.S                               |  0
 .../fpu/s_copysignf.S                              |  0
 .../fpu/s_copysignl.S                              |  0
 .../{powerpc64 => powerpc64-common}/fpu/s_fabsl.S  |  0
 .../{powerpc64 => powerpc64-common}/fpu/s_floor.S  |  0
 .../{powerpc64 => powerpc64-common}/fpu/s_floorf.S |  0
 .../{powerpc64 => powerpc64-common}/fpu/s_isnan.S  |  0
 .../{powerpc64 => powerpc64-common}/fpu/s_llrint.S |  0
 .../fpu/s_llrintf.S                                |  0
 .../fpu/s_llround.S                                |  0
 .../fpu/s_llroundf.S                               |  0
 .../{powerpc64 => powerpc64-common}/fpu/s_lrint.S  |  0
 .../{powerpc64 => powerpc64-common}/fpu/s_lround.S |  0
 .../fpu/s_lroundf.S                                |  0
 .../fpu/s_nearbyint.S                              |  0
 .../fpu/s_nearbyintf.S                             |  0
 .../{powerpc64 => powerpc64-common}/fpu/s_rint.S   |  0
 .../{powerpc64 => powerpc64-common}/fpu/s_rintf.S  |  0
 .../{powerpc64 => powerpc64-common}/fpu/s_round.S  |  0
 .../{powerpc64 => powerpc64-common}/fpu/s_roundf.S |  0
 .../{powerpc64 => powerpc64-common}/fpu/s_trunc.S  |  0
 .../{powerpc64 => powerpc64-common}/fpu/s_truncf.S |  0
 .../{powerpc64 => powerpc64-common}/hp-timing.h    |  0
 .../{powerpc64 => powerpc64-common}/lshift.S       |  0
 .../{powerpc64 => powerpc64-common}/memcpy.S       |  0
 .../{powerpc64 => powerpc64-common}/memset.S       |  0
 .../{powerpc64 => powerpc64-common}/mul_1.S        |  0
 .../multiarch/Makefile                             |  0
 .../multiarch/bcopy-ppc64.c                        |  0
 .../multiarch/bcopy.c                              |  0
 .../multiarch/bzero.c                              |  0
 .../multiarch/ifunc-impl-list.c                    | 68 +++++++++++-----------
 .../multiarch/init-arch.h                          |  0
 .../multiarch/memchr-power7.S                      |  2 +-
 .../multiarch/memchr-power8.S                      |  2 +-
 .../multiarch/memchr-ppc64.c                       |  0
 .../multiarch/memchr.c                             |  0
 .../multiarch/memcmp-power4.S                      |  2 +-
 .../multiarch/memcmp-power7.S                      |  2 +-
 .../multiarch/memcmp-power8.S                      |  2 +-
 .../multiarch/memcmp-ppc64.c                       |  0
 .../multiarch/memcmp.c                             |  0
 .../multiarch/memcpy-a2.S                          |  2 +-
 .../multiarch/memcpy-cell.S                        |  2 +-
 .../multiarch/memcpy-power4.S                      |  2 +-
 .../multiarch/memcpy-power6.S                      |  2 +-
 .../multiarch/memcpy-power7.S                      |  2 +-
 .../multiarch/memcpy-power8-cached.S               |  0
 .../multiarch/memcpy-ppc64.S                       |  2 +-
 .../multiarch/memcpy.c                             |  0
 .../multiarch/memmove-power7.S                     |  2 +-
 .../multiarch/memmove-ppc64.c                      |  0
 .../multiarch/memmove.c                            |  0
 .../multiarch/mempcpy-power7.S                     |  2 +-
 .../multiarch/mempcpy-ppc64.c                      |  0
 .../multiarch/mempcpy.c                            |  0
 .../multiarch/memrchr-power7.S                     |  2 +-
 .../multiarch/memrchr-power8.S                     |  2 +-
 .../multiarch/memrchr-ppc64.c                      |  0
 .../multiarch/memrchr.c                            |  0
 .../multiarch/memset-power4.S                      |  2 +-
 .../multiarch/memset-power6.S                      |  2 +-
 .../multiarch/memset-power7.S                      |  2 +-
 .../multiarch/memset-power8.S                      |  2 +-
 .../multiarch/memset-ppc64.S                       |  2 +-
 .../multiarch/memset.c                             |  0
 .../multiarch/rawmemchr-power7.S                   |  2 +-
 .../multiarch/rawmemchr-ppc64.c                    |  0
 .../multiarch/rawmemchr.c                          |  0
 .../multiarch/rtld-memset.c                        |  2 +-
 .../multiarch/rtld-strchr.S                        |  2 +-
 .../multiarch/stpcpy-power7.c                      |  0
 .../multiarch/stpcpy-power8.S                      |  2 +-
 .../multiarch/stpcpy-ppc64.c                       |  0
 .../multiarch/stpcpy.c                             |  0
 .../multiarch/stpncpy-power7.S                     |  2 +-
 .../multiarch/stpncpy-power8.S                     |  2 +-
 .../multiarch/stpncpy-ppc64.c                      |  0
 .../multiarch/stpncpy.c                            |  0
 .../multiarch/strcasecmp-power7.S                  |  2 +-
 .../multiarch/strcasecmp-power8.S                  |  2 +-
 .../multiarch/strcasecmp-ppc64.c                   |  0
 .../multiarch/strcasecmp.c                         |  0
 .../multiarch/strcasecmp_l-power7.S                |  2 +-
 .../multiarch/strcasecmp_l.c                       |  0
 .../multiarch/strcasestr-power8.S                  |  2 +-
 .../multiarch/strcasestr-ppc64.c                   |  0
 .../multiarch/strcasestr.c                         |  0
 .../multiarch/strcat-power7.c                      |  0
 .../multiarch/strcat-power8.c                      |  0
 .../multiarch/strcat-ppc64.c                       |  0
 .../multiarch/strcat.c                             |  0
 .../multiarch/strchr-power7.S                      |  2 +-
 .../multiarch/strchr-power8.S                      |  2 +-
 .../multiarch/strchr-ppc64.S                       |  2 +-
 .../multiarch/strchr.c                             |  0
 .../multiarch/strchrnul-power7.S                   |  2 +-
 .../multiarch/strchrnul-power8.S                   |  2 +-
 .../multiarch/strchrnul-ppc64.c                    |  0
 .../multiarch/strchrnul.c                          |  0
 .../multiarch/strcmp-power7.S                      |  2 +-
 .../multiarch/strcmp-power8.S                      |  2 +-
 .../multiarch/strcmp-power9.S                      |  2 +-
 .../multiarch/strcmp-ppc64.S                       |  2 +-
 .../multiarch/strcmp.c                             |  0
 .../multiarch/strcpy-power7.c                      |  0
 .../multiarch/strcpy-power8.S                      |  2 +-
 .../multiarch/strcpy-ppc64.c                       |  0
 .../multiarch/strcpy.c                             |  0
 .../multiarch/strcspn-power8.S                     |  2 +-
 .../multiarch/strcspn-ppc64.c                      |  0
 .../multiarch/strcspn.c                            |  0
 .../multiarch/strlen-power7.S                      |  2 +-
 .../multiarch/strlen-power8.S                      |  2 +-
 .../multiarch/strlen-ppc64.S                       |  2 +-
 .../multiarch/strlen.c                             |  0
 .../multiarch/strncase-power7.c                    |  0
 .../multiarch/strncase-power8.S                    |  2 +-
 .../multiarch/strncase-ppc64.c                     |  0
 .../multiarch/strncase.c                           |  0
 .../multiarch/strncase_l-power7.c                  |  0
 .../multiarch/strncase_l.c                         |  0
 .../multiarch/strncat-power7.c                     |  0
 .../multiarch/strncat-power8.c                     |  0
 .../multiarch/strncat-ppc64.c                      |  0
 .../multiarch/strncat.c                            |  0
 .../multiarch/strncmp-power4.S                     |  2 +-
 .../multiarch/strncmp-power7.S                     |  2 +-
 .../multiarch/strncmp-power8.S                     |  2 +-
 .../multiarch/strncmp-power9.S                     |  2 +-
 .../multiarch/strncmp-ppc64.S                      |  2 +-
 .../multiarch/strncmp.c                            |  0
 .../multiarch/strncpy-power7.S                     |  2 +-
 .../multiarch/strncpy-power8.S                     |  2 +-
 .../multiarch/strncpy-ppc64.c                      |  0
 .../multiarch/strncpy.c                            |  0
 .../multiarch/strnlen-power7.S                     |  2 +-
 .../multiarch/strnlen-power8.S                     |  2 +-
 .../multiarch/strnlen-ppc64.c                      |  0
 .../multiarch/strnlen.c                            |  0
 .../multiarch/strrchr-power7.S                     |  2 +-
 .../multiarch/strrchr-power8.S                     |  2 +-
 .../multiarch/strrchr-ppc64.c                      |  0
 .../multiarch/strrchr.c                            |  0
 .../multiarch/strspn-power8.S                      |  2 +-
 .../multiarch/strspn-ppc64.c                       |  0
 .../multiarch/strspn.c                             |  0
 .../multiarch/strstr-power7.S                      |  2 +-
 .../multiarch/strstr-ppc64.c                       |  0
 .../multiarch/strstr.c                             |  0
 .../multiarch/wcschr-power6.c                      |  0
 .../multiarch/wcschr-power7.c                      |  0
 .../multiarch/wcschr-ppc64.c                       |  0
 .../multiarch/wcschr.c                             |  0
 .../multiarch/wcscpy-power6.c                      |  0
 .../multiarch/wcscpy-power7.c                      |  0
 .../multiarch/wcscpy-ppc64.c                       |  0
 .../multiarch/wcscpy.c                             |  0
 .../multiarch/wcsrchr-power6.c                     |  0
 .../multiarch/wcsrchr-power7.c                     |  0
 .../multiarch/wcsrchr-ppc64.c                      |  0
 .../multiarch/wcsrchr.c                            |  0
 .../multiarch/wordcopy-ppc64.c                     |  0
 .../power4/Makefile                                |  0
 .../power4/memcmp.S                                |  0
 .../power4/memcopy.h                               |  0
 .../power4/memcpy.S                                |  0
 .../power4/memset.S                                |  0
 .../power4/strncmp.S                               |  0
 .../power5+/fpu/s_ceil.S                           |  0
 .../power5+/fpu/s_ceilf.S                          |  0
 .../power5+/fpu/s_floor.S                          |  0
 .../power5+/fpu/s_floorf.S                         |  0
 .../power5+/fpu/s_llround.S                        |  0
 .../power5+/fpu/s_llroundf.S                       |  0
 .../power5+/fpu/s_round.S                          |  0
 .../power5+/fpu/s_roundf.S                         |  0
 .../power5+/fpu/s_trunc.S                          |  0
 .../power5+/fpu/s_truncf.S                         |  0
 .../power5/fpu/s_isnan.S                           |  0
 .../power6/fpu/s_copysign.S                        |  0
 .../power6/fpu/s_copysignf.S                       |  0
 .../power6/fpu/s_isnan.S                           |  0
 .../power6/memcpy.S                                |  0
 .../power6/memset.S                                |  0
 .../power6/wcschr.c                                |  0
 .../power6/wcscpy.c                                |  0
 .../power6/wcsrchr.c                               |  0
 .../power6x/fpu/s_isnan.S                          |  0
 .../power6x/fpu/s_llrint.S                         |  0
 .../power6x/fpu/s_llround.S                        |  0
 .../power6x/fpu/s_llroundf.S                       |  0
 .../power7/Makefile                                |  0
 .../{powerpc64 => powerpc64-common}/power7/add_n.S |  0
 .../{powerpc64 => powerpc64-common}/power7/bcopy.c |  0
 .../power7/fpu/s_finite.S                          |  0
 .../power7/fpu/s_finitef.S                         |  0
 .../power7/fpu/s_isinf.S                           |  0
 .../power7/fpu/s_isinff.S                          |  0
 .../power7/fpu/s_isnan.S                           |  0
 .../power7/fpu/s_isnanf.S                          |  0
 .../power7/fpu/s_logb.c                            |  0
 .../power7/fpu/s_logbf.c                           |  0
 .../power7/fpu/s_logbl.c                           |  0
 .../power7/memchr.S                                |  0
 .../power7/memcmp.S                                |  0
 .../power7/memcpy.S                                |  0
 .../power7/memmove.S                               |  0
 .../power7/mempcpy.S                               |  0
 .../power7/memrchr.S                               |  0
 .../power7/memset.S                                |  0
 .../power7/rawmemchr.S                             |  0
 .../power7/stpncpy.S                               |  2 +-
 .../power7/strcasecmp.S                            |  0
 .../power7/strcasecmp_l.S                          |  0
 .../power7/strchr.S                                |  0
 .../power7/strchrnul.S                             |  0
 .../power7/strcmp.S                                |  0
 .../power7/strlen.S                                |  0
 .../power7/strncmp.S                               |  0
 .../power7/strncpy.S                               |  0
 .../power7/strnlen.S                               |  0
 .../power7/strrchr.S                               |  0
 .../power7/strstr-ppc64.c                          |  0
 .../power7/strstr.S                                |  0
 .../{powerpc64 => powerpc64-common}/power7/sub_n.S |  0
 .../power8/Makefile                                |  0
 .../power8/fpu/e_expf.S                            |  0
 .../power8/fpu/s_cosf.S                            |  0
 .../power8/fpu/s_finite.S                          |  0
 .../power8/fpu/s_finitef.S                         |  0
 .../power8/fpu/s_isinf.S                           |  0
 .../power8/fpu/s_isinff.S                          |  0
 .../power8/fpu/s_isnan.S                           |  0
 .../power8/fpu/s_isnanf.S                          |  0
 .../power8/fpu/s_llrint.S                          |  0
 .../power8/fpu/s_llround.S                         |  0
 .../power8/fpu/s_llroundf.S                        |  0
 .../power8/fpu/s_sinf.S                            |  0
 .../power8/fpu/w_expf.c                            |  0
 .../power8/memchr.S                                |  0
 .../power8/memcmp.S                                |  0
 .../power8/memrchr.S                               |  0
 .../power8/memset.S                                |  0
 .../power8/stpcpy.S                                |  2 +-
 .../power8/stpncpy.S                               |  2 +-
 .../power8/strcasecmp.S                            |  0
 .../power8/strcasestr-ppc64.c                      |  0
 .../power8/strcasestr.S                            |  0
 .../power8/strchr.S                                |  0
 .../power8/strchrnul.S                             |  2 +-
 .../power8/strcmp.S                                |  0
 .../power8/strcpy.S                                |  0
 .../power8/strcspn.S                               |  2 +-
 .../power8/strlen.S                                |  0
 .../power8/strncase.S                              |  2 +-
 .../power8/strncmp.S                               |  0
 .../power8/strncpy.S                               |  0
 .../power8/strnlen.S                               |  0
 .../power8/strrchr.S                               |  0
 .../power8/strspn.S                                |  0
 .../power9/strcmp.S                                |  2 +-
 .../power9/strncmp.S                               |  2 +-
 .../{powerpc64 => powerpc64-common}/ppc-mcount.S   |  0
 .../register-dump.h                                |  0
 .../{powerpc64 => powerpc64-common}/rtld-memset.c  |  0
 .../setjmp-common.S                                |  0
 .../{powerpc64 => powerpc64-common}/setjmp.S       |  0
 .../stackguard-macros.h                            |  0
 .../{powerpc64 => powerpc64-common}/start.S        |  0
 .../{powerpc64 => powerpc64-common}/strchr.S       |  0
 .../{powerpc64 => powerpc64-common}/strcmp.S       |  0
 .../{powerpc64 => powerpc64-common}/strlen.S       |  0
 .../{powerpc64 => powerpc64-common}/strncmp.S      |  0
 .../{powerpc64 => powerpc64-common}/submul_1.S     |  0
 .../{powerpc64 => powerpc64-common}/sysdep.h       |  0
 .../{powerpc64 => powerpc64-common}/tls-macros.h   |  0
 .../{powerpc64 => powerpc64-common}/tst-audit.h    |  0
 sysdeps/powerpc/powerpc64/970/Implies              |  1 +
 sysdeps/powerpc/powerpc64/Implies                  |  1 +
 sysdeps/powerpc/powerpc64/a2/Implies               |  1 +
 sysdeps/powerpc/powerpc64/cell/Implies             |  1 +
 sysdeps/powerpc/powerpc64/fpu/Implies              |  1 +
 sysdeps/powerpc/powerpc64/fpu/multiarch/Implies    |  1 +
 sysdeps/powerpc/powerpc64/multiarch/Implies        |  1 +
 sysdeps/powerpc/powerpc64/power4/Implies           |  1 +
 .../powerpc/powerpc64/power4/fpu/multiarch/Implies |  1 +
 sysdeps/powerpc/powerpc64/power4/multiarch/Implies |  1 +
 sysdeps/powerpc/powerpc64/power5+/Implies          |  1 +
 sysdeps/powerpc/powerpc64/power5+/fpu/Implies      |  1 +
 .../powerpc64/power5+/fpu/multiarch/Implies        |  1 +
 .../powerpc/powerpc64/power5+/multiarch/Implies    |  1 +
 sysdeps/powerpc/powerpc64/power5/Implies           |  1 +
 sysdeps/powerpc/powerpc64/power5/fpu/Implies       |  1 +
 .../powerpc/powerpc64/power5/fpu/multiarch/Implies |  1 +
 sysdeps/powerpc/powerpc64/power5/multiarch/Implies |  1 +
 sysdeps/powerpc/powerpc64/power6/Implies           |  1 +
 sysdeps/powerpc/powerpc64/power6/fpu/Implies       |  1 +
 .../powerpc/powerpc64/power6/fpu/multiarch/Implies |  1 +
 sysdeps/powerpc/powerpc64/power6/multiarch/Implies |  1 +
 sysdeps/powerpc/powerpc64/power6x/Implies          |  1 +
 sysdeps/powerpc/powerpc64/power6x/fpu/Implies      |  1 +
 .../powerpc64/power6x/fpu/multiarch/Implies        |  1 +
 .../powerpc/powerpc64/power6x/multiarch/Implies    |  1 +
 sysdeps/powerpc/powerpc64/power7/Implies           |  1 +
 sysdeps/powerpc/powerpc64/power7/fpu/Implies       |  1 +
 .../powerpc/powerpc64/power7/fpu/multiarch/Implies |  1 +
 sysdeps/powerpc/powerpc64/power7/multiarch/Implies |  1 +
 sysdeps/powerpc/powerpc64/power8/Implies           |  1 +
 sysdeps/powerpc/powerpc64/power8/fpu/Implies       |  1 +
 .../powerpc/powerpc64/power8/fpu/multiarch/Implies |  1 +
 sysdeps/powerpc/powerpc64/power8/multiarch/Implies |  1 +
 sysdeps/powerpc/powerpc64/power9/Implies           |  1 +
 sysdeps/powerpc/powerpc64/power9/fpu/Implies       |  1 +
 .../powerpc/powerpc64/power9/fpu/multiarch/Implies |  1 +
 sysdeps/powerpc/powerpc64/power9/multiarch/Implies |  1 +
 sysdeps/powerpc/powerpc64le/Implies                |  3 +-
 sysdeps/powerpc/powerpc64le/fpu/Implies            |  2 +-
 sysdeps/powerpc/powerpc64le/fpu/multiarch/Implies  |  2 +-
 sysdeps/powerpc/powerpc64le/multiarch/Implies      |  2 +-
 sysdeps/powerpc/powerpc64le/power7/Implies         | 13 ++++-
 sysdeps/powerpc/powerpc64le/power7/fpu/Implies     |  6 +-
 .../powerpc64le/power7/fpu/multiarch/Implies       |  2 +-
 .../powerpc/powerpc64le/power7/multiarch/Implies   |  2 +-
 sysdeps/powerpc/powerpc64le/power8/Implies         |  4 +-
 sysdeps/powerpc/powerpc64le/power8/fpu/Implies     |  3 +-
 .../powerpc64le/power8/fpu/multiarch/Implies       |  2 +-
 .../powerpc/powerpc64le/power8/multiarch/Implies   |  2 +-
 sysdeps/powerpc/powerpc64le/power9/Implies         |  4 +-
 sysdeps/powerpc/powerpc64le/power9/fpu/Implies     |  2 +-
 .../powerpc64le/power9/fpu/multiarch/Implies       |  2 +-
 .../powerpc/powerpc64le/power9/multiarch/Implies   |  2 +-
 sysdeps/unix/powerpc/sysdep.h                      |  2 +-
 452 files changed, 215 insertions(+), 156 deletions(-)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/Makefile (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/__longjmp-common.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/__longjmp.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/a2/memcpy.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/addmul_1.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/atomic-machine.h (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/backtrace.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/bits/wordsize.h (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/bsd-_setjmp.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/bsd-setjmp.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/bzero.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/cell/memcpy.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/configure (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/configure.ac (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/crti.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/crtn.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/dl-dtprocnum.h (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/dl-irel.h (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/dl-machine.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/dl-machine.h (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/dl-trampoline.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/entry.h (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/ffsll.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/Makefile (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/e_expf-power8.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/e_expf-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/e_expf.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/e_hypot-power7.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/e_hypot-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/e_hypot.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/e_hypotf-power7.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/e_hypotf-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/e_hypotf.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_ceil-power5+.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_ceil-ppc64.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_ceil.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_ceilf-power5+.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_ceilf-ppc64.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_ceilf.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_copysign-power6.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_copysign-ppc64.S (95%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_copysign.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_copysignf.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_cosf-power8.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_cosf-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_cosf.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_finite-power7.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_finite-power8.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_finite-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_finite.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_finitef-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_finitef.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_floor-power5+.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_floor-ppc64.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_floor.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_floorf-power5+.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_floorf-ppc64.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_floorf.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_isinf-power7.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_isinf-power8.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_isinf-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_isinf.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_isinff-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_isinff.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_isnan-power5.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_isnan-power6.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_isnan-power6x.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_isnan-power7.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_isnan-power8.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_isnan-ppc64.S (95%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_isnan.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_isnanf.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_llrint-power6x.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_llrint-power8.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_llrint-ppc64.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_llrint.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_llrintf.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_llround-power5+.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_llround-power6x.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_llround-power8.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_llround-ppc64.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_llround.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_llroundf-ppc64.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_llroundf.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_logb-power7.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_logb-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_logb.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_logbf-power7.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_logbf-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_logbf.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_logbl-power7.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_logbl-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_logbl.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_lrint.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_lround.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_modf-power5+.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_modf-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_modf.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_modff-power5+.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_modff-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_modff.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_round-power5+.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_round-ppc64.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_round.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_roundf-power5+.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_roundf-ppc64.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_roundf.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_sinf-power8.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_sinf-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_sinf.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_trunc-power5+.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_trunc-ppc64.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_trunc.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_truncf-power5+.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_truncf-ppc64.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/s_truncf.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/multiarch/w_expf.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_ceil.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_ceilf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_copysign.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_copysignf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_copysignl.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_fabsl.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_floor.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_floorf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_isnan.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_llrint.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_llrintf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_llround.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_llroundf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_lrint.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_lround.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_lroundf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_nearbyint.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_nearbyintf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_rint.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_rintf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_round.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_roundf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_trunc.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/fpu/s_truncf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/hp-timing.h (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/lshift.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/memcpy.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/memset.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/mul_1.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/Makefile (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/bcopy-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/bcopy.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/bzero.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/ifunc-impl-list.c (84%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/init-arch.h (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memchr-power7.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memchr-power8.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memchr-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memchr.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memcmp-power4.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memcmp-power7.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memcmp-power8.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memcmp-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memcmp.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memcpy-a2.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memcpy-cell.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memcpy-power4.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memcpy-power6.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memcpy-power7.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memcpy-power8-cached.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memcpy-ppc64.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memcpy.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memmove-power7.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memmove-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memmove.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/mempcpy-power7.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/mempcpy-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/mempcpy.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memrchr-power7.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memrchr-power8.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memrchr-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memrchr.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memset-power4.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memset-power6.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memset-power7.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memset-power8.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memset-ppc64.S (96%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/memset.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/rawmemchr-power7.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/rawmemchr-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/rawmemchr.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/rtld-memset.c (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/rtld-strchr.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/stpcpy-power7.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/stpcpy-power8.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/stpcpy-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/stpcpy.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/stpncpy-power7.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/stpncpy-power8.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/stpncpy-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/stpncpy.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcasecmp-power7.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcasecmp-power8.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcasecmp-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcasecmp.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcasecmp_l-power7.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcasecmp_l.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcasestr-power8.S (95%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcasestr-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcasestr.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcat-power7.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcat-power8.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcat-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcat.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strchr-power7.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strchr-power8.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strchr-ppc64.S (95%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strchr.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strchrnul-power7.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strchrnul-power8.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strchrnul-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strchrnul.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcmp-power7.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcmp-power8.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcmp-power9.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcmp-ppc64.S (95%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcmp.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcpy-power7.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcpy-power8.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcpy-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcpy.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcspn-power8.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcspn-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strcspn.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strlen-power7.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strlen-power8.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strlen-ppc64.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strlen.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strncase-power7.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strncase-power8.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strncase-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strncase.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strncase_l-power7.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strncase_l.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strncat-power7.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strncat-power8.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strncat-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strncat.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strncmp-power4.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strncmp-power7.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strncmp-power8.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strncmp-power9.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strncmp-ppc64.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strncmp.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strncpy-power7.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strncpy-power8.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strncpy-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strncpy.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strnlen-power7.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strnlen-power8.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strnlen-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strnlen.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strrchr-power7.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strrchr-power8.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strrchr-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strrchr.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strspn-power8.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strspn-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strspn.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strstr-power7.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strstr-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/strstr.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/wcschr-power6.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/wcschr-power7.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/wcschr-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/wcschr.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/wcscpy-power6.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/wcscpy-power7.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/wcscpy-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/wcscpy.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/wcsrchr-power6.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/wcsrchr-power7.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/wcsrchr-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/wcsrchr.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/multiarch/wordcopy-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power4/Makefile (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power4/memcmp.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power4/memcopy.h (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power4/memcpy.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power4/memset.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power4/strncmp.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power5+/fpu/s_ceil.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power5+/fpu/s_ceilf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power5+/fpu/s_floor.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power5+/fpu/s_floorf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power5+/fpu/s_llround.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power5+/fpu/s_llroundf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power5+/fpu/s_round.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power5+/fpu/s_roundf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power5+/fpu/s_trunc.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power5+/fpu/s_truncf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power5/fpu/s_isnan.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power6/fpu/s_copysign.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power6/fpu/s_copysignf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power6/fpu/s_isnan.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power6/memcpy.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power6/memset.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power6/wcschr.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power6/wcscpy.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power6/wcsrchr.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power6x/fpu/s_isnan.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power6x/fpu/s_llrint.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power6x/fpu/s_llround.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power6x/fpu/s_llroundf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/Makefile (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/add_n.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/bcopy.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/fpu/s_finite.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/fpu/s_finitef.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/fpu/s_isinf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/fpu/s_isinff.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/fpu/s_isnan.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/fpu/s_isnanf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/fpu/s_logb.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/fpu/s_logbf.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/fpu/s_logbl.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/memchr.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/memcmp.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/memcpy.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/memmove.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/mempcpy.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/memrchr.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/memset.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/rawmemchr.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/stpncpy.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/strcasecmp.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/strcasecmp_l.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/strchr.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/strchrnul.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/strcmp.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/strlen.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/strncmp.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/strncpy.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/strnlen.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/strrchr.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/strstr-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/strstr.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power7/sub_n.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/Makefile (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/fpu/e_expf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/fpu/s_cosf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/fpu/s_finite.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/fpu/s_finitef.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/fpu/s_isinf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/fpu/s_isinff.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/fpu/s_isnan.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/fpu/s_isnanf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/fpu/s_llrint.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/fpu/s_llround.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/fpu/s_llroundf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/fpu/s_sinf.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/fpu/w_expf.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/memchr.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/memcmp.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/memrchr.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/memset.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/stpcpy.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/stpncpy.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/strcasecmp.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/strcasestr-ppc64.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/strcasestr.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/strchr.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/strchrnul.S (94%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/strcmp.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/strcpy.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/strcspn.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/strlen.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/strncase.S (93%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/strncmp.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/strncpy.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/strnlen.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/strrchr.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power8/strspn.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power9/strcmp.S (99%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/power9/strncmp.S (99%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/ppc-mcount.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/register-dump.h (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/rtld-memset.c (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/setjmp-common.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/setjmp.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/stackguard-macros.h (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/start.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/strchr.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/strcmp.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/strlen.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/strncmp.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/submul_1.S (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/sysdep.h (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/tls-macros.h (100%)
 rename sysdeps/powerpc/{powerpc64 => powerpc64-common}/tst-audit.h (100%)
 create mode 100644 sysdeps/powerpc/powerpc64/a2/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/cell/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/Implies
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/Implies
Andreas Schwab - March 7, 2018, 4:44 p.m.
On Mär 07 2018, "Gabriel F. T. Gomes" <gabriel@inconstante.eti.br> wrote:

> This patch fixes this behavior, by moving sysdeps/powerpc/powerpc64 to
> sysdeps/powerpc/powerpc64-common and creating new Implies files to
> provide the hierarchy of processors for powerpc64 and powerpc64le
> separately.

Perhaps sysdeps/powerpc/powerpc64/common instead?

Andreas.
Gabriel F. T. Gomes - March 7, 2018, 5:15 p.m.
On Wed, 07 Mar 2018, Andreas Schwab wrote:
>
>Perhaps sysdeps/powerpc/powerpc64/common instead?

I'm not against it, but I would like your opinion on a question...

Moving the whole of powerpc64 to powerpc64-common, leaves powerpc64 empty,
which I can then fill with files that are specific to big-endian.  On the
other hand, if I move things into powerpc64/common, then powerpc64 is not
empty and Implies files on powerpc64le will still point to powerpc64 (but
now to the common subdir).  This gives a little less separation, imo, and
that's why I came up with powerpc64-common outside of powerpc64.

However, it could have its disadvantages. Do you have an opinion on that?
Andreas Schwab - March 8, 2018, 8:18 a.m.
On Mär 07 2018, "Gabriel F. T. Gomes" <gabriel@inconstante.eti.br> wrote:

> On Wed, 07 Mar 2018, Andreas Schwab wrote:
>>
>>Perhaps sysdeps/powerpc/powerpc64/common instead?
>
> I'm not against it, but I would like your opinion on a question...
>
> Moving the whole of powerpc64 to powerpc64-common, leaves powerpc64 empty,
> which I can then fill with files that are specific to big-endian.

Ok, how about this then: put the BE file in .../powerpc64/be, the LE
files in .../powerpc64/le, and keep the common files in .../powerpc64?

Andreas.
Gabriel F. T. Gomes - March 8, 2018, 8:49 p.m.
On Thu, 08 Mar 2018, Andreas Schwab wrote:

>On Mär 07 2018, "Gabriel F. T. Gomes" <gabriel@inconstante.eti.br> wrote:
>
>> Moving the whole of powerpc64 to powerpc64-common, leaves powerpc64 empty,
>> which I can then fill with files that are specific to big-endian.  
>
>Ok, how about this then: put the BE file in .../powerpc64/be, the LE
>files in .../powerpc64/le, and keep the common files in .../powerpc64?

While I can see the advantage of keeping the common files in .../powerpc64
(i.e.: most of the renamings in this patch disappear), I am not sure about
changing the name of the machine directories.  Notice that the configure
script will guess the name of the machine from the compiler triplet, so
big-endian automatically brings .../powerpc64, and little-endian
brings .../powerpc64le.

So, moving machine directories to .../powerpc64/{be,le}, means that
something needs to convert powerpc64 (from the triplet) to powerpc64/be
and powerpc64le to powerpc64/le.  Moreover, I think that this will
implicitly imply ".../powerpc64" for both big-endian and little-endian.

With that in mind, would you still suggest this change (maybe you had
something else in mind, which I couldn't grasp)?
Joseph Myers - March 9, 2018, 4:39 p.m.
On Thu, 8 Mar 2018, Gabriel F. T. Gomes wrote:

> >Ok, how about this then: put the BE file in .../powerpc64/be, the LE
> >files in .../powerpc64/le, and keep the common files in .../powerpc64?
> 
> While I can see the advantage of keeping the common files in .../powerpc64
> (i.e.: most of the renamings in this patch disappear), I am not sure about
> changing the name of the machine directories.  Notice that the configure
> script will guess the name of the machine from the compiler triplet, so
> big-endian automatically brings .../powerpc64, and little-endian
> brings .../powerpc64le.
> 
> So, moving machine directories to .../powerpc64/{be,le}, means that
> something needs to convert powerpc64 (from the triplet) to powerpc64/be
> and powerpc64le to powerpc64/le.  Moreover, I think that this will
> implicitly imply ".../powerpc64" for both big-endian and little-endian.

The code in question is sysdeps/powerpc/preconfigure; you'd need to change 
the machine settings therein.
Andreas Schwab - March 12, 2018, 9:04 a.m.
On Mär 08 2018, "Gabriel F. T. Gomes" <gabriel@inconstante.eti.br> wrote:

> With that in mind, would you still suggest this change (maybe you had
> something else in mind, which I couldn't grasp)?

Having all ppc64 related sources under a common directory is preferable,
IMHO.

Andreas.
Gabriel F. T. Gomes - March 13, 2018, 4:23 p.m.
On Fri, 09 Mar 2018, Joseph Myers wrote:

>On Thu, 8 Mar 2018, Gabriel F. T. Gomes wrote:
>
>> So, moving machine directories to .../powerpc64/{be,le}, means that
>> something needs to convert powerpc64 (from the triplet) to powerpc64/be
>> and powerpc64le to powerpc64/le.  Moreover, I think that this will
>> implicitly imply ".../powerpc64" for both big-endian and little-endian.  
>
>The code in question is sysdeps/powerpc/preconfigure; you'd need to change 
>the machine settings therein.

OK, somehow, I got the impression that it would be wrong to change the
value of $machine (I thought it was intentionally set to the triplet and
shouldn't be changed), but I changed my mind after your comments.

Besides that, I had mentioned that ".../powerpc64" would be implicitly
implied, as if it was something undesired, but that should be OK since
files that are specific to big-endian or little-endian can be moved to
their subdirectories (powerpc64/be and powerpc64/le).

With that in mind, I implemented Andreas suggestion (be/ and le/ subdirs)
and I'm sending it in a new thread.

Patch

diff --git a/sysdeps/powerpc/powerpc64/Makefile b/sysdeps/powerpc/powerpc64-common/Makefile
similarity index 100%
rename from sysdeps/powerpc/powerpc64/Makefile
rename to sysdeps/powerpc/powerpc64-common/Makefile
diff --git a/sysdeps/powerpc/powerpc64/__longjmp-common.S b/sysdeps/powerpc/powerpc64-common/__longjmp-common.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/__longjmp-common.S
rename to sysdeps/powerpc/powerpc64-common/__longjmp-common.S
diff --git a/sysdeps/powerpc/powerpc64/__longjmp.S b/sysdeps/powerpc/powerpc64-common/__longjmp.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/__longjmp.S
rename to sysdeps/powerpc/powerpc64-common/__longjmp.S
diff --git a/sysdeps/powerpc/powerpc64/a2/memcpy.S b/sysdeps/powerpc/powerpc64-common/a2/memcpy.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/a2/memcpy.S
rename to sysdeps/powerpc/powerpc64-common/a2/memcpy.S
diff --git a/sysdeps/powerpc/powerpc64/addmul_1.S b/sysdeps/powerpc/powerpc64-common/addmul_1.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/addmul_1.S
rename to sysdeps/powerpc/powerpc64-common/addmul_1.S
diff --git a/sysdeps/powerpc/powerpc64/atomic-machine.h b/sysdeps/powerpc/powerpc64-common/atomic-machine.h
similarity index 100%
rename from sysdeps/powerpc/powerpc64/atomic-machine.h
rename to sysdeps/powerpc/powerpc64-common/atomic-machine.h
diff --git a/sysdeps/powerpc/powerpc64/backtrace.c b/sysdeps/powerpc/powerpc64-common/backtrace.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/backtrace.c
rename to sysdeps/powerpc/powerpc64-common/backtrace.c
diff --git a/sysdeps/powerpc/powerpc64/bits/wordsize.h b/sysdeps/powerpc/powerpc64-common/bits/wordsize.h
similarity index 100%
rename from sysdeps/powerpc/powerpc64/bits/wordsize.h
rename to sysdeps/powerpc/powerpc64-common/bits/wordsize.h
diff --git a/sysdeps/powerpc/powerpc64/bsd-_setjmp.S b/sysdeps/powerpc/powerpc64-common/bsd-_setjmp.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/bsd-_setjmp.S
rename to sysdeps/powerpc/powerpc64-common/bsd-_setjmp.S
diff --git a/sysdeps/powerpc/powerpc64/bsd-setjmp.S b/sysdeps/powerpc/powerpc64-common/bsd-setjmp.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/bsd-setjmp.S
rename to sysdeps/powerpc/powerpc64-common/bsd-setjmp.S
diff --git a/sysdeps/powerpc/powerpc64/bzero.S b/sysdeps/powerpc/powerpc64-common/bzero.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/bzero.S
rename to sysdeps/powerpc/powerpc64-common/bzero.S
diff --git a/sysdeps/powerpc/powerpc64/cell/memcpy.S b/sysdeps/powerpc/powerpc64-common/cell/memcpy.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/cell/memcpy.S
rename to sysdeps/powerpc/powerpc64-common/cell/memcpy.S
diff --git a/sysdeps/powerpc/powerpc64/configure b/sysdeps/powerpc/powerpc64-common/configure
similarity index 100%
rename from sysdeps/powerpc/powerpc64/configure
rename to sysdeps/powerpc/powerpc64-common/configure
diff --git a/sysdeps/powerpc/powerpc64/configure.ac b/sysdeps/powerpc/powerpc64-common/configure.ac
similarity index 100%
rename from sysdeps/powerpc/powerpc64/configure.ac
rename to sysdeps/powerpc/powerpc64-common/configure.ac
diff --git a/sysdeps/powerpc/powerpc64/crti.S b/sysdeps/powerpc/powerpc64-common/crti.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/crti.S
rename to sysdeps/powerpc/powerpc64-common/crti.S
diff --git a/sysdeps/powerpc/powerpc64/crtn.S b/sysdeps/powerpc/powerpc64-common/crtn.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/crtn.S
rename to sysdeps/powerpc/powerpc64-common/crtn.S
diff --git a/sysdeps/powerpc/powerpc64/dl-dtprocnum.h b/sysdeps/powerpc/powerpc64-common/dl-dtprocnum.h
similarity index 100%
rename from sysdeps/powerpc/powerpc64/dl-dtprocnum.h
rename to sysdeps/powerpc/powerpc64-common/dl-dtprocnum.h
diff --git a/sysdeps/powerpc/powerpc64/dl-irel.h b/sysdeps/powerpc/powerpc64-common/dl-irel.h
similarity index 100%
rename from sysdeps/powerpc/powerpc64/dl-irel.h
rename to sysdeps/powerpc/powerpc64-common/dl-irel.h
diff --git a/sysdeps/powerpc/powerpc64/dl-machine.c b/sysdeps/powerpc/powerpc64-common/dl-machine.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/dl-machine.c
rename to sysdeps/powerpc/powerpc64-common/dl-machine.c
diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64-common/dl-machine.h
similarity index 100%
rename from sysdeps/powerpc/powerpc64/dl-machine.h
rename to sysdeps/powerpc/powerpc64-common/dl-machine.h
diff --git a/sysdeps/powerpc/powerpc64/dl-trampoline.S b/sysdeps/powerpc/powerpc64-common/dl-trampoline.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/dl-trampoline.S
rename to sysdeps/powerpc/powerpc64-common/dl-trampoline.S
diff --git a/sysdeps/powerpc/powerpc64/entry.h b/sysdeps/powerpc/powerpc64-common/entry.h
similarity index 100%
rename from sysdeps/powerpc/powerpc64/entry.h
rename to sysdeps/powerpc/powerpc64-common/entry.h
diff --git a/sysdeps/powerpc/powerpc64/ffsll.c b/sysdeps/powerpc/powerpc64-common/ffsll.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/ffsll.c
rename to sysdeps/powerpc/powerpc64-common/ffsll.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/Makefile
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/Makefile
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf-power8.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_expf-power8.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf-power8.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_expf-power8.S
index c9dad4e132..90f7399f48 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_expf-power8.S
@@ -21,4 +21,4 @@ 
 
 #define __ieee754_expf __ieee754_expf_power8
 
-#include <sysdeps/powerpc/powerpc64/power8/fpu/e_expf.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/fpu/e_expf.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_expf-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_expf-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_expf.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_expf.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot-power7.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypot-power7.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot-power7.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypot-power7.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypot-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypot-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypot.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypot.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf-power7.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypotf-power7.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf-power7.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypotf-power7.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypotf-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypotf-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypotf.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypotf.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-power5+.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceil-power5+.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-power5+.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceil-power5+.S
index 76651b694c..f6d91d5dd6 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-power5+.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceil-power5+.S
@@ -27,4 +27,4 @@ 
 
 #define __ceil __ceil_power5plus
 
-#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_ceil.S>
+#include <sysdeps/powerpc/powerpc64-common/power5+/fpu/s_ceil.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceil-ppc64.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-ppc64.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceil-ppc64.S
index c75c66ba3b..1b109e5ae0 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-ppc64.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceil-ppc64.S
@@ -27,4 +27,4 @@ 
 
 #define __ceil __ceil_ppc64
 
-#include <sysdeps/powerpc/powerpc64/fpu/s_ceil.S>
+#include <sysdeps/powerpc/powerpc64-common/fpu/s_ceil.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceil.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceil.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-power5+.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceilf-power5+.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-power5+.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceilf-power5+.S
index b9c9e14fba..54a8a3bb14 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-power5+.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceilf-power5+.S
@@ -21,4 +21,4 @@ 
 
 #define __ceilf __ceilf_power5plus
 
-#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_ceilf.S>
+#include <sysdeps/powerpc/powerpc64-common/power5+/fpu/s_ceilf.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceilf-ppc64.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-ppc64.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceilf-ppc64.S
index ce5cc49770..b10631ae08 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-ppc64.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceilf-ppc64.S
@@ -21,4 +21,4 @@ 
 
 #define __ceilf __ceilf_ppc64
 
-#include <sysdeps/powerpc/powerpc64/fpu/s_ceilf.S>
+#include <sysdeps/powerpc/powerpc64-common/fpu/s_ceilf.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceilf.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceilf.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-power6.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysign-power6.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-power6.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysign-power6.S
index 3ce85ca822..ec0246e24f 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-power6.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysign-power6.S
@@ -29,4 +29,4 @@ 
 
 #define __copysign __copysign_power6
 
-#include <sysdeps/powerpc/powerpc64/fpu/s_copysign.S>
+#include <sysdeps/powerpc/powerpc64-common/fpu/s_copysign.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysign-ppc64.S
similarity index 95%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-ppc64.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysign-ppc64.S
index 97fad681e3..c0eeddde70 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-ppc64.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysign-ppc64.S
@@ -31,4 +31,4 @@ 
 #define hidden_def(name)				\
   strong_alias (__copysign_ppc64, __GI___copysign)
 
-#include <sysdeps/powerpc/powerpc64/fpu/s_copysign.S>
+#include <sysdeps/powerpc/powerpc64-common/fpu/s_copysign.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysign.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysign.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysignf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysignf.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysignf.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysignf.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-power8.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_cosf-power8.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-power8.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_cosf-power8.S
index 17adc90ad2..4f806670cd 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_cosf-power8.S
@@ -21,4 +21,4 @@ 
 
 #define __cosf __cosf_power8
 
-#include <sysdeps/powerpc/powerpc64/power8/fpu/s_cosf.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/fpu/s_cosf.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_cosf-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_cosf-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_cosf.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_cosf.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power7.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite-power7.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power7.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite-power7.S
index d3e9f606bd..fe95d79388 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite-power7.S
@@ -29,4 +29,4 @@ 
 
 #define __finite __finite_power7
 
-#include <sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/fpu/s_finite.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power8.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite-power8.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power8.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite-power8.S
index 7a200a5c1a..d32f21f65b 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite-power8.S
@@ -29,4 +29,4 @@ 
 
 #define __finite __finite_power8
 
-#include <sysdeps/powerpc/powerpc64/power8/fpu/s_finite.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/fpu/s_finite.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finitef-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finitef-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_finitef-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finitef-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finitef.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finitef.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_finitef.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finitef.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-power5+.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floor-power5+.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-power5+.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floor-power5+.S
index 0c4c97f7a6..ebc6e82228 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-power5+.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floor-power5+.S
@@ -27,4 +27,4 @@ 
 
 #define __floor __floor_power5plus
 
-#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_floor.S>
+#include <sysdeps/powerpc/powerpc64-common/power5+/fpu/s_floor.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floor-ppc64.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-ppc64.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floor-ppc64.S
index 97ec94d733..14ca34c401 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-ppc64.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floor-ppc64.S
@@ -27,4 +27,4 @@ 
 
 #define __floor __floor_ppc64
 
-#include <sysdeps/powerpc/powerpc64/fpu/s_floor.S>
+#include <sysdeps/powerpc/powerpc64-common/fpu/s_floor.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floor.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floor.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-power5+.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floorf-power5+.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-power5+.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floorf-power5+.S
index 10676569c3..9c3e865266 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-power5+.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floorf-power5+.S
@@ -21,4 +21,4 @@ 
 
 #define __floorf __floorf_power5plus
 
-#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_floorf.S>
+#include <sysdeps/powerpc/powerpc64-common/power5+/fpu/s_floorf.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floorf-ppc64.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-ppc64.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floorf-ppc64.S
index b207f0cad2..d8c04bed99 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-ppc64.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floorf-ppc64.S
@@ -21,4 +21,4 @@ 
 
 #define __floorf __floorf_ppc64
 
-#include <sysdeps/powerpc/powerpc64/fpu/s_floorf.S>
+#include <sysdeps/powerpc/powerpc64-common/fpu/s_floorf.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floorf.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floorf.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power7.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf-power7.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power7.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf-power7.S
index e644f9605f..137980ae66 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf-power7.S
@@ -29,4 +29,4 @@ 
 
 #define __isinf __isinf_power7
 
-#include <sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/fpu/s_isinf.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power8.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf-power8.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power8.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf-power8.S
index dc7764d915..d28f95b719 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf-power8.S
@@ -29,4 +29,4 @@ 
 
 #define __isinf __isinf_power8
 
-#include <sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/fpu/s_isinf.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinff-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinff-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinff-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinff-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinff.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinff.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinff.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinff.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power5.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power5.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power5.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power5.S
index 749cdbc9fe..d554b54c5d 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power5.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power5.S
@@ -29,4 +29,4 @@ 
 
 #define __isnan __isnan_power5
 
-#include <sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S>
+#include <sysdeps/powerpc/powerpc64-common/power5/fpu/s_isnan.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power6.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power6.S
index 51cbc6b243..ec9b53bd98 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power6.S
@@ -29,4 +29,4 @@ 
 
 #define __isnan __isnan_power6
 
-#include <sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S>
+#include <sysdeps/powerpc/powerpc64-common/power6/fpu/s_isnan.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6x.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power6x.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6x.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power6x.S
index a2d64dfeb7..6de2163304 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6x.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power6x.S
@@ -29,4 +29,4 @@ 
 
 #define __isnan __isnan_power6x
 
-#include <sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S>
+#include <sysdeps/powerpc/powerpc64-common/power6x/fpu/s_isnan.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power7.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power7.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power7.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power7.S
index 8585808b51..fc1467f52d 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power7.S
@@ -29,4 +29,4 @@ 
 
 #define __isnan __isnan_power7
 
-#include <sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/fpu/s_isnan.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power8.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power8.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power8.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power8.S
index d501878cb2..ed9de051e6 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power8.S
@@ -29,4 +29,4 @@ 
 
 #define __isnan __isnan_power8
 
-#include <sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/fpu/s_isnan.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-ppc64.S
similarity index 95%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-ppc64.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-ppc64.S
index 82e14d8b2e..d5d5fc8abc 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-ppc64.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-ppc64.S
@@ -33,4 +33,4 @@ 
    .globl __GI___isnan ; .set __GI___isnan,__isnan_ppc64
 #endif
 
-#include <sysdeps/powerpc/powerpc64/fpu/s_isnan.S>
+#include <sysdeps/powerpc/powerpc64-common/fpu/s_isnan.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnanf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnanf.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnanf.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnanf.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power6x.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-power6x.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power6x.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-power6x.S
index 3de77d5c7a..8c0ab1374d 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power6x.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-power6x.S
@@ -27,4 +27,4 @@ 
 
 #define __llrint __llrint_power6x
 
-#include <sysdeps/powerpc/powerpc64/power6x/fpu/s_llrint.S>
+#include <sysdeps/powerpc/powerpc64-common/power6x/fpu/s_llrint.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power8.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-power8.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power8.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-power8.S
index 619527207f..b262a2891f 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-power8.S
@@ -27,4 +27,4 @@ 
 
 #define __llrint __llrint_power8
 
-#include <sysdeps/powerpc/powerpc64/power8/fpu/s_llrint.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/fpu/s_llrint.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-ppc64.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-ppc64.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-ppc64.S
index 093726628d..33f968bd24 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-ppc64.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-ppc64.S
@@ -27,4 +27,4 @@ 
 
 #define __llrint __llrint_ppc64
 
-#include <sysdeps/powerpc/powerpc64/fpu/s_llrint.S>
+#include <sysdeps/powerpc/powerpc64-common/fpu/s_llrint.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrintf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrintf.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrintf.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrintf.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power5+.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power5+.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power5+.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power5+.S
index 448ec22478..6d1ed561eb 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power5+.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power5+.S
@@ -28,4 +28,4 @@ 
 #define __llround __llround_power5plus
 #define __lround __lround_power5plus
 
-#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_llround.S>
+#include <sysdeps/powerpc/powerpc64-common/power5+/fpu/s_llround.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power6x.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power6x.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power6x.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power6x.S
index 9110148419..90a2ba31ce 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power6x.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power6x.S
@@ -28,4 +28,4 @@ 
 #define __llround __llround_power6x
 #define __lround __lround_power6x
 
-#include <sysdeps/powerpc/powerpc64/power6x/fpu/s_llround.S>
+#include <sysdeps/powerpc/powerpc64-common/power6x/fpu/s_llround.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power8.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power8.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power8.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power8.S
index 3bbb5924ee..82c27d580e 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power8.S
@@ -27,4 +27,4 @@ 
 
 #define __llround __llround_power8
 
-#include <sysdeps/powerpc/powerpc64/power8/fpu/s_llround.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/fpu/s_llround.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-ppc64.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-ppc64.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-ppc64.S
index c098210ade..a9d4a15c57 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-ppc64.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-ppc64.S
@@ -24,4 +24,4 @@ 
 #define __llround __llround_ppc64
 #define __lround __lround_ppc64
 
-#include <sysdeps/powerpc/powerpc64/fpu/s_llround.S>
+#include <sysdeps/powerpc/powerpc64-common/fpu/s_llround.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llroundf-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llroundf-ppc64.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llroundf-ppc64.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llroundf-ppc64.S
index 1af420a1d9..ee190afc52 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llroundf-ppc64.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llroundf-ppc64.S
@@ -28,4 +28,4 @@ 
 #define __llroundf __llroundf_ppc64
 #define __lroundf __lroundf_ppc64
 
-#include <sysdeps/powerpc/powerpc64/fpu/s_llroundf.S>
+#include <sysdeps/powerpc/powerpc64-common/fpu/s_llroundf.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llroundf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llroundf.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llroundf.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llroundf.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_logb-power7.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logb-power7.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_logb-power7.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logb-power7.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_logb-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logb-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_logb-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logb-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_logb.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logb.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_logb.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logb.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbf-power7.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbf-power7.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbf-power7.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbf-power7.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbf-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbf-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbf-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbf-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbf.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbf.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbf.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbl-power7.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbl-power7.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbl-power7.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbl-power7.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbl-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbl-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbl-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbl-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbl.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbl.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbl.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbl.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_lrint.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_lrint.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_lrint.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_lrint.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_lround.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_lround.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_lround.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_lround.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf-power5+.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modf-power5+.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf-power5+.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modf-power5+.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modf-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modf-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modf.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modf.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modff-power5+.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modff-power5+.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_modff-power5+.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modff-power5+.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modff-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modff-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_modff-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modff-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modff.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modff.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_modff.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modff.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-power5+.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_round-power5+.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-power5+.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_round-power5+.S
index 67c001005a..0a01632e68 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-power5+.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_round-power5+.S
@@ -27,4 +27,4 @@ 
 
 #define __round __round_power5plus
 
-#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_round.S>
+#include <sysdeps/powerpc/powerpc64-common/power5+/fpu/s_round.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_round-ppc64.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-ppc64.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_round-ppc64.S
index 43cf13ab38..d6791b9a82 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-ppc64.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_round-ppc64.S
@@ -27,4 +27,4 @@ 
 
 #define __round __round_ppc64
 
-#include <sysdeps/powerpc/powerpc64/fpu/s_round.S>
+#include <sysdeps/powerpc/powerpc64-common/fpu/s_round.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_round.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_round.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_round.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-power5+.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_roundf-power5+.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-power5+.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_roundf-power5+.S
index 6daf4c9f12..60d438b0c6 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-power5+.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_roundf-power5+.S
@@ -21,4 +21,4 @@ 
 
 #define __roundf __roundf_power5plus
 
-#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_roundf.S>
+#include <sysdeps/powerpc/powerpc64-common/power5+/fpu/s_roundf.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_roundf-ppc64.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-ppc64.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_roundf-ppc64.S
index 9500b278cf..caf8c051ce 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-ppc64.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_roundf-ppc64.S
@@ -21,4 +21,4 @@ 
 
 #define __roundf __roundf_ppc64
 
-#include <sysdeps/powerpc/powerpc64/fpu/s_roundf.S>
+#include <sysdeps/powerpc/powerpc64-common/fpu/s_roundf.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_roundf.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_roundf.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-power8.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_sinf-power8.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-power8.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_sinf-power8.S
index 6cc058e93c..ffe91d4dc4 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_sinf-power8.S
@@ -21,4 +21,4 @@ 
 
 #define __sinf __sinf_power8
 
-#include <sysdeps/powerpc/powerpc64/power8/fpu/s_sinf.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/fpu/s_sinf.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_sinf-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_sinf-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_sinf.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_sinf.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-power5+.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_trunc-power5+.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-power5+.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_trunc-power5+.S
index c3cb5d3f21..4f626cff2d 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-power5+.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_trunc-power5+.S
@@ -27,4 +27,4 @@ 
 
 #define __trunc __trunc_power5plus
 
-#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_trunc.S>
+#include <sysdeps/powerpc/powerpc64-common/power5+/fpu/s_trunc.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_trunc-ppc64.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-ppc64.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_trunc-ppc64.S
index 1cfe0531e8..5165cd18e5 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-ppc64.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_trunc-ppc64.S
@@ -27,4 +27,4 @@ 
 
 #define __trunc __trunc_ppc64
 
-#include <sysdeps/powerpc/powerpc64/fpu/s_trunc.S>
+#include <sysdeps/powerpc/powerpc64-common/fpu/s_trunc.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_trunc.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_trunc.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-power5+.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_truncf-power5+.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-power5+.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_truncf-power5+.S
index b40f00dd8e..3db1a3647d 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-power5+.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_truncf-power5+.S
@@ -21,4 +21,4 @@ 
 
 #define __truncf __truncf_power5plus
 
-#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_truncf.S>
+#include <sysdeps/powerpc/powerpc64-common/power5+/fpu/s_truncf.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_truncf-ppc64.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-ppc64.S
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_truncf-ppc64.S
index b05bbfd1e5..0986af7357 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-ppc64.S
+++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_truncf-ppc64.S
@@ -21,4 +21,4 @@ 
 
 #define __truncf __truncf_ppc64
 
-#include <sysdeps/powerpc/powerpc64/fpu/s_truncf.S>
+#include <sysdeps/powerpc/powerpc64-common/fpu/s_truncf.S>
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_truncf.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_truncf.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/w_expf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/w_expf.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/multiarch/w_expf.c
rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/w_expf.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_ceil.S b/sysdeps/powerpc/powerpc64-common/fpu/s_ceil.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_ceil.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_ceil.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_ceilf.S b/sysdeps/powerpc/powerpc64-common/fpu/s_ceilf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_ceilf.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_ceilf.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_copysign.S b/sysdeps/powerpc/powerpc64-common/fpu/s_copysign.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_copysign.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_copysign.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_copysignf.S b/sysdeps/powerpc/powerpc64-common/fpu/s_copysignf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_copysignf.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_copysignf.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_copysignl.S b/sysdeps/powerpc/powerpc64-common/fpu/s_copysignl.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_copysignl.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_copysignl.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_fabsl.S b/sysdeps/powerpc/powerpc64-common/fpu/s_fabsl.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_fabsl.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_fabsl.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_floor.S b/sysdeps/powerpc/powerpc64-common/fpu/s_floor.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_floor.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_floor.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_floorf.S b/sysdeps/powerpc/powerpc64-common/fpu/s_floorf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_floorf.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_floorf.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64-common/fpu/s_isnan.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_isnan.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_isnan.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_llrint.S b/sysdeps/powerpc/powerpc64-common/fpu/s_llrint.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_llrint.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_llrint.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_llrintf.S b/sysdeps/powerpc/powerpc64-common/fpu/s_llrintf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_llrintf.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_llrintf.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_llround.S b/sysdeps/powerpc/powerpc64-common/fpu/s_llround.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_llround.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_llround.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_llroundf.S b/sysdeps/powerpc/powerpc64-common/fpu/s_llroundf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_llroundf.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_llroundf.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_lrint.S b/sysdeps/powerpc/powerpc64-common/fpu/s_lrint.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_lrint.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_lrint.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_lround.S b/sysdeps/powerpc/powerpc64-common/fpu/s_lround.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_lround.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_lround.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_lroundf.S b/sysdeps/powerpc/powerpc64-common/fpu/s_lroundf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_lroundf.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_lroundf.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_nearbyint.S b/sysdeps/powerpc/powerpc64-common/fpu/s_nearbyint.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_nearbyint.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_nearbyint.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_nearbyintf.S b/sysdeps/powerpc/powerpc64-common/fpu/s_nearbyintf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_nearbyintf.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_nearbyintf.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_rint.S b/sysdeps/powerpc/powerpc64-common/fpu/s_rint.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_rint.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_rint.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_rintf.S b/sysdeps/powerpc/powerpc64-common/fpu/s_rintf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_rintf.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_rintf.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_round.S b/sysdeps/powerpc/powerpc64-common/fpu/s_round.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_round.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_round.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_roundf.S b/sysdeps/powerpc/powerpc64-common/fpu/s_roundf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_roundf.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_roundf.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_trunc.S b/sysdeps/powerpc/powerpc64-common/fpu/s_trunc.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_trunc.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_trunc.S
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_truncf.S b/sysdeps/powerpc/powerpc64-common/fpu/s_truncf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/fpu/s_truncf.S
rename to sysdeps/powerpc/powerpc64-common/fpu/s_truncf.S
diff --git a/sysdeps/powerpc/powerpc64/hp-timing.h b/sysdeps/powerpc/powerpc64-common/hp-timing.h
similarity index 100%
rename from sysdeps/powerpc/powerpc64/hp-timing.h
rename to sysdeps/powerpc/powerpc64-common/hp-timing.h
diff --git a/sysdeps/powerpc/powerpc64/lshift.S b/sysdeps/powerpc/powerpc64-common/lshift.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/lshift.S
rename to sysdeps/powerpc/powerpc64-common/lshift.S
diff --git a/sysdeps/powerpc/powerpc64/memcpy.S b/sysdeps/powerpc/powerpc64-common/memcpy.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/memcpy.S
rename to sysdeps/powerpc/powerpc64-common/memcpy.S
diff --git a/sysdeps/powerpc/powerpc64/memset.S b/sysdeps/powerpc/powerpc64-common/memset.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/memset.S
rename to sysdeps/powerpc/powerpc64-common/memset.S
diff --git a/sysdeps/powerpc/powerpc64/mul_1.S b/sysdeps/powerpc/powerpc64-common/mul_1.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/mul_1.S
rename to sysdeps/powerpc/powerpc64-common/mul_1.S
diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64-common/multiarch/Makefile
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/Makefile
rename to sysdeps/powerpc/powerpc64-common/multiarch/Makefile
diff --git a/sysdeps/powerpc/powerpc64/multiarch/bcopy-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/bcopy-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/bcopy-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/bcopy-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/bcopy.c b/sysdeps/powerpc/powerpc64-common/multiarch/bcopy.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/bcopy.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/bcopy.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/bzero.c b/sysdeps/powerpc/powerpc64-common/multiarch/bzero.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/bzero.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/bzero.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c b/sysdeps/powerpc/powerpc64-common/multiarch/ifunc-impl-list.c
similarity index 84%
rename from sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/ifunc-impl-list.c
index 38a21e478e..e9f7b46c24 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/ifunc-impl-list.c
@@ -49,7 +49,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
     hwcap |= PPC_FEATURE_POWER4;
 
 #ifdef SHARED
-  /* Support sysdeps/powerpc/powerpc64/multiarch/memcpy.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/memcpy.c.  */
   IFUNC_IMPL (i, name, memcpy,
 	      IFUNC_IMPL_ADD (array, i, memcpy, hwcap2 & PPC_FEATURE2_ARCH_2_07,
 			      __memcpy_power8_cached)
@@ -65,13 +65,13 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 			      __memcpy_power4)
 	      IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/memmove.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/memmove.c.  */
   IFUNC_IMPL (i, name, memmove,
 	      IFUNC_IMPL_ADD (array, i, memmove, hwcap & PPC_FEATURE_HAS_VSX,
 			      __memmove_power7)
 	      IFUNC_IMPL_ADD (array, i, memmove, 1, __memmove_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/memset.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/memset.c.  */
   IFUNC_IMPL (i, name, memset,
 	      IFUNC_IMPL_ADD (array, i, memset, hwcap2 & PPC_FEATURE2_ARCH_2_07,
 			      __memset_power8)
@@ -83,7 +83,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 			      __memset_power4)
 	      IFUNC_IMPL_ADD (array, i, memset, 1, __memset_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/strcpy.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/strcpy.c.  */
   IFUNC_IMPL (i, name, strcpy,
 	      IFUNC_IMPL_ADD (array, i, strcpy, hwcap2 & PPC_FEATURE2_ARCH_2_07,
 			      __strcpy_power8)
@@ -92,7 +92,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, strcpy, 1,
 			      __strcpy_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/stpcpy.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/stpcpy.c.  */
   IFUNC_IMPL (i, name, stpcpy,
 	      IFUNC_IMPL_ADD (array, i, stpcpy, hwcap2 & PPC_FEATURE2_ARCH_2_07,
 			      __stpcpy_power8)
@@ -101,7 +101,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, stpcpy, 1,
 			      __stpcpy_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/strlen.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/strlen.c.  */
   IFUNC_IMPL (i, name, strlen,
 	      IFUNC_IMPL_ADD (array, i, strlen, hwcap2 & PPC_FEATURE2_ARCH_2_07,
 			      __strlen_power8)
@@ -110,7 +110,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, strlen, 1,
 			      __strlen_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/strncmp.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/strncmp.c.  */
   IFUNC_IMPL (i, name, strncmp,
 	      IFUNC_IMPL_ADD (array, i, strncmp, hwcap2 & PPC_FEATURE2_ARCH_3_00,
 			      __strncmp_power9)
@@ -123,7 +123,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, strncmp, 1,
 			      __strncmp_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/strchr.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/strchr.c.  */
   IFUNC_IMPL (i, name, strchr,
 	      IFUNC_IMPL_ADD (array, i, strchr,
 			      hwcap2 & PPC_FEATURE2_ARCH_2_07,
@@ -134,7 +134,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, strchr, 1,
 			      __strchr_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/strchrnul.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/strchrnul.c.  */
   IFUNC_IMPL (i, name, strchrnul,
 	      IFUNC_IMPL_ADD (array, i, strchrnul,
 			      hwcap2 & PPC_FEATURE2_ARCH_2_07,
@@ -146,7 +146,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 			      __strchrnul_ppc))
 #endif
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/memcmp.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/memcmp.c.  */
   IFUNC_IMPL (i, name, memcmp,
 	      IFUNC_IMPL_ADD (array, i, memcmp, hwcap2 & PPC_FEATURE2_ARCH_2_07,
 			      __memcmp_power8)
@@ -156,7 +156,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 			      __memcmp_power4)
 	      IFUNC_IMPL_ADD (array, i, memcmp, 1, __memcmp_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/bzero.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/bzero.c.  */
   IFUNC_IMPL (i, name, bzero,
 	      IFUNC_IMPL_ADD (array, i, bzero, hwcap2 & PPC_FEATURE2_ARCH_2_07,
 			      __bzero_power8)
@@ -168,13 +168,13 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 			      __bzero_power4)
 	      IFUNC_IMPL_ADD (array, i, bzero, 1, __bzero_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/bcopy.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/bcopy.c.  */
   IFUNC_IMPL (i, name, bcopy,
 	      IFUNC_IMPL_ADD (array, i, bcopy, hwcap & PPC_FEATURE_HAS_VSX,
 			      __bcopy_power7)
 	      IFUNC_IMPL_ADD (array, i, bcopy, 1, __bcopy_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/mempcpy.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/mempcpy.c.  */
   IFUNC_IMPL (i, name, mempcpy,
 	      IFUNC_IMPL_ADD (array, i, mempcpy,
 			      hwcap & PPC_FEATURE_HAS_VSX,
@@ -182,7 +182,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, mempcpy, 1,
 			      __mempcpy_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/memchr.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/memchr.c.  */
   IFUNC_IMPL (i, name, memchr,
 	      IFUNC_IMPL_ADD (array, i, memchr,
 			      hwcap2 & PPC_FEATURE2_ARCH_2_07,
@@ -193,7 +193,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, memchr, 1,
 			      __memchr_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/memrchr.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/memrchr.c.  */
   IFUNC_IMPL (i, name, memrchr,
 	      IFUNC_IMPL_ADD (array, i, memrchr,
 			      hwcap2 & PPC_FEATURE2_ARCH_2_07,
@@ -204,7 +204,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, memrchr, 1,
 			      __memrchr_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/rawmemchr.c.  */
   IFUNC_IMPL (i, name, rawmemchr,
 	      IFUNC_IMPL_ADD (array, i, rawmemchr,
 			      hwcap & PPC_FEATURE_HAS_VSX,
@@ -212,7 +212,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, rawmemchr, 1,
 			      __rawmemchr_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/strnlen.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/strnlen.c.  */
   IFUNC_IMPL (i, name, strnlen,
 	      IFUNC_IMPL_ADD (array, i, strnlen,
 			      hwcap2 & PPC_FEATURE2_ARCH_2_07,
@@ -222,7 +222,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, strnlen, 1,
 			      __strnlen_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/strcasecmp.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp.c.  */
   IFUNC_IMPL (i, name, strcasecmp,
 	      IFUNC_IMPL_ADD (array, i, strcasecmp,
 			      hwcap2 & PPC_FEATURE2_ARCH_2_07,
@@ -232,7 +232,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 			      __strcasecmp_power7)
 	      IFUNC_IMPL_ADD (array, i, strcasecmp, 1, __strcasecmp_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp_l.c.  */
   IFUNC_IMPL (i, name, strcasecmp_l,
 	      IFUNC_IMPL_ADD (array, i, strcasecmp_l,
 			      hwcap & PPC_FEATURE_HAS_VSX,
@@ -240,7 +240,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, strcasecmp_l, 1,
 			      __strcasecmp_l_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/strncase.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/strncase.c.  */
   IFUNC_IMPL (i, name, strncasecmp,
 	      IFUNC_IMPL_ADD (array, i, strncasecmp,
 			      hwcap2 & PPC_FEATURE2_ARCH_2_07,
@@ -250,7 +250,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 			      __strncasecmp_power7)
 	      IFUNC_IMPL_ADD (array, i, strncasecmp, 1, __strncasecmp_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/strncase_l.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/strncase_l.c.  */
   IFUNC_IMPL (i, name, strncasecmp_l,
 	      IFUNC_IMPL_ADD (array, i, strncasecmp_l,
 			      hwcap & PPC_FEATURE_HAS_VSX,
@@ -258,7 +258,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, strncasecmp_l, 1,
 			      __strncasecmp_l_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/wcschr.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/wcschr.c.  */
   IFUNC_IMPL (i, name, wcschr,
 	      IFUNC_IMPL_ADD (array, i, wcschr,
 			      hwcap & PPC_FEATURE_HAS_VSX,
@@ -269,7 +269,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, wcschr, 1,
 			      __wcschr_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/wcschr.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/wcschr.c.  */
   IFUNC_IMPL (i, name, wcsrchr,
 	      IFUNC_IMPL_ADD (array, i, wcsrchr,
 			      hwcap & PPC_FEATURE_HAS_VSX,
@@ -280,7 +280,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, wcsrchr, 1,
 			      __wcsrchr_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/wcscpy.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/wcscpy.c.  */
   IFUNC_IMPL (i, name, wcscpy,
 	      IFUNC_IMPL_ADD (array, i, wcscpy,
 			      hwcap & PPC_FEATURE_HAS_VSX,
@@ -291,7 +291,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, wcscpy, 1,
 			      __wcscpy_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/strrchr.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/strrchr.c.  */
   IFUNC_IMPL (i, name, strrchr,
 	      IFUNC_IMPL_ADD (array, i, strrchr,
 			      hwcap2 & PPC_FEATURE2_ARCH_2_07,
@@ -302,7 +302,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, strrchr, 1,
 			      __strrchr_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/strncat.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/strncat.c.  */
   IFUNC_IMPL (i, name, strncat,
 	      IFUNC_IMPL_ADD (array, i, strncat,
 			      hwcap2 & PPC_FEATURE2_ARCH_2_07,
@@ -313,7 +313,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, strncat, 1,
 			      __strncat_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/strncpy.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/strncpy.c.  */
   IFUNC_IMPL (i, name, strncpy,
 	      IFUNC_IMPL_ADD (array, i, strncpy,
 			      hwcap2 & PPC_FEATURE2_ARCH_2_07,
@@ -324,7 +324,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, strncpy, 1,
 			     __strncpy_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/stpncpy.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/stpncpy.c.  */
   IFUNC_IMPL (i, name, stpncpy,
 	      IFUNC_IMPL_ADD (array, i, stpncpy,
 			      hwcap2 & PPC_FEATURE2_ARCH_2_07,
@@ -335,7 +335,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, stpncpy, 1,
 			     __stpncpy_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/strcmp.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/strcmp.c.  */
   IFUNC_IMPL (i, name, strcmp,
 	      IFUNC_IMPL_ADD (array, i, strcmp,
 			      hwcap2 & PPC_FEATURE2_ARCH_3_00,
@@ -349,7 +349,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, strcmp, 1,
 			     __strcmp_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/strcat.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/strcat.c.  */
   IFUNC_IMPL (i, name, strcat,
 	      IFUNC_IMPL_ADD (array, i, strcat,
 			      hwcap2 & PPC_FEATURE2_ARCH_2_07,
@@ -360,7 +360,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, strcat, 1,
 			     __strcat_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/strspn.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/strspn.c.  */
   IFUNC_IMPL (i, name, strspn,
              IFUNC_IMPL_ADD (array, i, strspn,
                              hwcap2 & PPC_FEATURE2_ARCH_2_07,
@@ -368,7 +368,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
              IFUNC_IMPL_ADD (array, i, strspn, 1,
                              __strspn_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/strcspn.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/strcspn.c.  */
   IFUNC_IMPL (i, name, strcspn,
              IFUNC_IMPL_ADD (array, i, strcspn,
                              hwcap2 & PPC_FEATURE2_ARCH_2_07,
@@ -376,7 +376,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
              IFUNC_IMPL_ADD (array, i, strcspn, 1,
                              __strcspn_ppc))
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/strstr.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/strstr.c.  */
   IFUNC_IMPL (i, name, strstr,
              IFUNC_IMPL_ADD (array, i, strstr,
                              hwcap & PPC_FEATURE_HAS_VSX,
@@ -385,7 +385,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
                              __strstr_ppc))
 
 
-  /* Support sysdeps/powerpc/powerpc64/multiarch/strcasestr.c.  */
+  /* Support sysdeps/powerpc/powerpc64-common/multiarch/strcasestr.c.  */
   IFUNC_IMPL (i, name, strcasestr,
 	      IFUNC_IMPL_ADD (array, i, strcasestr,
 			      hwcap2 & PPC_FEATURE2_ARCH_2_07,
diff --git a/sysdeps/powerpc/powerpc64/multiarch/init-arch.h b/sysdeps/powerpc/powerpc64-common/multiarch/init-arch.h
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/init-arch.h
rename to sysdeps/powerpc/powerpc64-common/multiarch/init-arch.h
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memchr-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/memchr-power7.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/memchr-power7.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/memchr-power7.S
index 33b565f1e5..3489c335cb 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memchr-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/memchr-power7.S
@@ -23,4 +23,4 @@ 
 #undef weak_alias
 #define weak_alias(name,alias)
 
-#include <sysdeps/powerpc/powerpc64/power7/memchr.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/memchr.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memchr-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/memchr-power8.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/memchr-power8.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/memchr-power8.S
index cb1f0face9..e9b214e0d7 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memchr-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/memchr-power8.S
@@ -23,4 +23,4 @@ 
 #undef weak_alias
 #define weak_alias(name,alias)
 
-#include <sysdeps/powerpc/powerpc64/power8/memchr.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/memchr.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memchr-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/memchr-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/memchr-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/memchr-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memchr.c b/sysdeps/powerpc/powerpc64-common/multiarch/memchr.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/memchr.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/memchr.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power4.S b/sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power4.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/memcmp-power4.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power4.S
index 26879a2b0f..23109a1ce0 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power4.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power4.S
@@ -23,4 +23,4 @@ 
 #undef weak_alias
 #define weak_alias(name,alias)
 
-#include <sysdeps/powerpc/powerpc64/power4/memcmp.S>
+#include <sysdeps/powerpc/powerpc64-common/power4/memcmp.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power7.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/memcmp-power7.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power7.S
index 9715d11d8d..5311d07dfc 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power7.S
@@ -23,4 +23,4 @@ 
 #undef weak_alias
 #define weak_alias(name,alias)
 
-#include <sysdeps/powerpc/powerpc64/power7/memcmp.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/memcmp.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power8.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/memcmp-power8.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power8.S
index c4da81c64e..1a1b579c40 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power8.S
@@ -23,4 +23,4 @@ 
 #undef weak_alias
 #define weak_alias(name,alias)
 
-#include <sysdeps/powerpc/powerpc64/power8/memcmp.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/memcmp.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/memcmp-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/memcmp-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/memcmp-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp.c b/sysdeps/powerpc/powerpc64-common/multiarch/memcmp.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/memcmp.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/memcmp.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-a2.S b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-a2.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/memcpy-a2.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/memcpy-a2.S
index 91eddcebe9..b897db133e 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memcpy-a2.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-a2.S
@@ -21,4 +21,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/a2/memcpy.S>
+#include <sysdeps/powerpc/powerpc64-common/a2/memcpy.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-cell.S b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-cell.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/memcpy-cell.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/memcpy-cell.S
index a93f5146fb..ce75028c25 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memcpy-cell.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-cell.S
@@ -21,4 +21,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/cell/memcpy.S>
+#include <sysdeps/powerpc/powerpc64-common/cell/memcpy.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-power4.S b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power4.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/memcpy-power4.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power4.S
index bc6844535b..cc4339a2b7 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memcpy-power4.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power4.S
@@ -21,4 +21,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power4/memcpy.S>
+#include <sysdeps/powerpc/powerpc64-common/power4/memcpy.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-power6.S b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power6.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/memcpy-power6.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power6.S
index 9d4c9927d9..fdacebd56d 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memcpy-power6.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power6.S
@@ -21,4 +21,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power6/memcpy.S>
+#include <sysdeps/powerpc/powerpc64-common/power6/memcpy.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power7.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/memcpy-power7.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power7.S
index b24452e29c..9a155948e4 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memcpy-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power7.S
@@ -21,4 +21,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power7/memcpy.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/memcpy.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-power8-cached.S b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power8-cached.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/memcpy-power8-cached.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power8-cached.S
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-ppc64.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/memcpy-ppc64.S
index 55036676b3..732c2d52c1 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-ppc64.S
@@ -23,4 +23,4 @@ 
 # define libc_hidden_builtin_def(name)
 #endif
 
-#include <sysdeps/powerpc/powerpc64/memcpy.S>
+#include <sysdeps/powerpc/powerpc64-common/memcpy.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy.c b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/memcpy.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/memcpy.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memmove-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/memmove-power7.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/memmove-power7.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/memmove-power7.S
index 0b251d0f5f..76f94b3162 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memmove-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/memmove-power7.S
@@ -24,4 +24,4 @@ 
 #undef bcopy
 #define bcopy __bcopy_power7
 
-#include <sysdeps/powerpc/powerpc64/power7/memmove.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/memmove.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/memmove-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/memmove-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memmove.c b/sysdeps/powerpc/powerpc64-common/multiarch/memmove.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/memmove.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/memmove.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/mempcpy-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/mempcpy-power7.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/mempcpy-power7.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/mempcpy-power7.S
index bee44f0364..01d65fd741 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/mempcpy-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/mempcpy-power7.S
@@ -23,4 +23,4 @@ 
 #undef weak_alias
 #define weak_alias(name, alias)
 
-#include <sysdeps/powerpc/powerpc64/power7/mempcpy.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/mempcpy.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/mempcpy-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/mempcpy-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/mempcpy-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/mempcpy-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c b/sysdeps/powerpc/powerpc64-common/multiarch/mempcpy.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/mempcpy.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/mempcpy.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memrchr-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/memrchr-power7.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/memrchr-power7.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/memrchr-power7.S
index afaae46dec..309a336737 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memrchr-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/memrchr-power7.S
@@ -23,4 +23,4 @@ 
 #undef weak_alias
 #define weak_alias(name,alias)
 
-#include <sysdeps/powerpc/powerpc64/power7/memrchr.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/memrchr.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memrchr-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/memrchr-power8.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/memrchr-power8.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/memrchr-power8.S
index 453e2b620e..ba8e70e8a6 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memrchr-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/memrchr-power8.S
@@ -23,4 +23,4 @@ 
 #undef weak_alias
 #define weak_alias(name,alias)
 
-#include <sysdeps/powerpc/powerpc64/power8/memrchr.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/memrchr.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memrchr-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/memrchr-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/memrchr-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/memrchr-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memrchr.c b/sysdeps/powerpc/powerpc64-common/multiarch/memrchr.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/memrchr.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/memrchr.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset-power4.S b/sysdeps/powerpc/powerpc64-common/multiarch/memset-power4.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/memset-power4.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/memset-power4.S
index 78d6de9e19..b5a7aeacde 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memset-power4.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/memset-power4.S
@@ -24,4 +24,4 @@ 
 #undef __bzero
 #define __bzero __bzero_power4
 
-#include <sysdeps/powerpc/powerpc64/power4/memset.S>
+#include <sysdeps/powerpc/powerpc64-common/power4/memset.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset-power6.S b/sysdeps/powerpc/powerpc64-common/multiarch/memset-power6.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/memset-power6.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/memset-power6.S
index 79d93c7615..bdd0d23517 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memset-power6.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/memset-power6.S
@@ -24,4 +24,4 @@ 
 #undef __bzero
 #define __bzero __bzero_power6
 
-#include <sysdeps/powerpc/powerpc64/power6/memset.S>
+#include <sysdeps/powerpc/powerpc64-common/power6/memset.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/memset-power7.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/memset-power7.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/memset-power7.S
index 02d1855186..fbeda6d58e 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memset-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/memset-power7.S
@@ -23,4 +23,4 @@ 
 
 #undef __bzero
 #define __bzero __bzero_power7
-#include <sysdeps/powerpc/powerpc64/power7/memset.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/memset.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/memset-power8.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/memset-power8.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/memset-power8.S
index 932eeefca1..83123a308c 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memset-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/memset-power8.S
@@ -24,4 +24,4 @@ 
 #undef __bzero
 #define __bzero __bzero_power8
 
-#include <sysdeps/powerpc/powerpc64/power8/memset.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/memset.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S b/sysdeps/powerpc/powerpc64-common/multiarch/memset-ppc64.S
similarity index 96%
rename from sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/memset-ppc64.S
index 61f4bc5089..6f46834772 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/memset-ppc64.S
@@ -39,4 +39,4 @@  END_GEN_TB (__bzero_ppc,TB_TOCLESS)
 /* Do not implement __bzero at powerpc64/memset.S.  */
 #define NO_BZERO_IMPL
 
-#include <sysdeps/powerpc/powerpc64/memset.S>
+#include <sysdeps/powerpc/powerpc64-common/memset.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset.c b/sysdeps/powerpc/powerpc64-common/multiarch/memset.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/memset.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/memset.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/rawmemchr-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/rawmemchr-power7.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/multiarch/rawmemchr-power7.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/rawmemchr-power7.S
index a268376729..6babf28a43 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/rawmemchr-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/rawmemchr-power7.S
@@ -18,4 +18,4 @@ 
 
 #define RAWMEMCHR __rawmemchr_power7
 
-#include <sysdeps/powerpc/powerpc64/power7/rawmemchr.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/rawmemchr.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/rawmemchr-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/rawmemchr-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/rawmemchr-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/rawmemchr-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c b/sysdeps/powerpc/powerpc64-common/multiarch/rawmemchr.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/rawmemchr.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/rtld-memset.c b/sysdeps/powerpc/powerpc64-common/multiarch/rtld-memset.c
similarity index 93%
rename from sysdeps/powerpc/powerpc64/multiarch/rtld-memset.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/rtld-memset.c
index 611eff4bf6..586114373a 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/rtld-memset.c
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/rtld-memset.c
@@ -15,4 +15,4 @@ 
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <sysdeps/powerpc/powerpc64/rtld-memset.c>
+#include <sysdeps/powerpc/powerpc64-common/rtld-memset.c>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/rtld-strchr.S b/sysdeps/powerpc/powerpc64-common/multiarch/rtld-strchr.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/multiarch/rtld-strchr.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/rtld-strchr.S
index 9ec081aebd..5ed12257ac 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/rtld-strchr.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/rtld-strchr.S
@@ -15,4 +15,4 @@ 
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <sysdeps/powerpc/powerpc64/strchr.S>
+#include <sysdeps/powerpc/powerpc64-common/strchr.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpcpy-power7.c b/sysdeps/powerpc/powerpc64-common/multiarch/stpcpy-power7.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/stpcpy-power7.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/stpcpy-power7.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpcpy-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/stpcpy-power8.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/stpcpy-power8.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/stpcpy-power8.S
index 7718869370..4e859c121e 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/stpcpy-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/stpcpy-power8.S
@@ -21,4 +21,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power8/stpcpy.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/stpcpy.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/stpcpy-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/stpcpy-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c b/sysdeps/powerpc/powerpc64-common/multiarch/stpcpy.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/stpcpy.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/stpcpy.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpncpy-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/stpncpy-power7.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/stpncpy-power7.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/stpncpy-power7.S
index 6af2557c5d..ee0cfe43c1 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/stpncpy-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/stpncpy-power7.S
@@ -28,4 +28,4 @@ 
 #define MEMSET_is_local
 #endif
 
-#include <sysdeps/powerpc/powerpc64/power7/stpncpy.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/stpncpy.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpncpy-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/stpncpy-power8.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/stpncpy-power8.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/stpncpy-power8.S
index 4fea202a54..0f94871df7 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/stpncpy-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/stpncpy-power8.S
@@ -26,4 +26,4 @@ 
 #define MEMSET_is_local
 #endif
 
-#include <sysdeps/powerpc/powerpc64/power8/stpncpy.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/stpncpy.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpncpy-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/stpncpy-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/stpncpy-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/stpncpy-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpncpy.c b/sysdeps/powerpc/powerpc64-common/multiarch/stpncpy.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/stpncpy.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/stpncpy.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp-power7.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power7.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp-power7.S
index bec2f30703..6ba1244088 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp-power7.S
@@ -23,4 +23,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power7/strcasecmp.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/strcasecmp.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp-power8.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power8.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp-power8.S
index 29453ff80d..fc004cd036 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp-power8.S
@@ -23,4 +23,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power8/strcasecmp.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strcasecmp.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strcasecmp-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strcasecmp.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp_l-power7.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp_l-power7.S
index 07e716950a..09a2449a3d 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp_l-power7.S
@@ -28,4 +28,4 @@ 
 #define __STRCMP __strcasecmp_l
 #define STRCMP   strcasecmp_l
 
-#include <sysdeps/powerpc/powerpc64/power7/strcasecmp.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/strcasecmp.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp_l.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp_l.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasestr-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strcasestr-power8.S
similarity index 95%
rename from sysdeps/powerpc/powerpc64/multiarch/strcasestr-power8.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcasestr-power8.S
index 985f4e4e7d..acd9139e61 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcasestr-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strcasestr-power8.S
@@ -30,4 +30,4 @@ 
 /* strchr is used to check if first char of r4 is present in r3.  */
 #define STRCHR __strchr_power8
 
-#include <sysdeps/powerpc/powerpc64/power8/strcasestr.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strcasestr.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasestr-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcasestr-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strcasestr-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcasestr-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasestr.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcasestr.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strcasestr.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcasestr.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcat-power7.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcat-power7.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strcat-power7.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcat-power7.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcat-power8.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcat-power8.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcat-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcat-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strcat-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcat-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcat.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcat.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strcat.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcat.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchr-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strchr-power7.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/multiarch/strchr-power7.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strchr-power7.S
index f91b809984..2fc56849d8 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strchr-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strchr-power7.S
@@ -21,4 +21,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power7/strchr.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/strchr.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchr-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strchr-power8.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/multiarch/strchr-power8.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strchr-power8.S
index 16a484dbda..cecdf4880e 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strchr-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strchr-power8.S
@@ -21,4 +21,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power8/strchr.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strchr.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchr-ppc64.S b/sysdeps/powerpc/powerpc64-common/multiarch/strchr-ppc64.S
similarity index 95%
rename from sysdeps/powerpc/powerpc64/multiarch/strchr-ppc64.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strchr-ppc64.S
index cdbb9c151e..863a5e1be9 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strchr-ppc64.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strchr-ppc64.S
@@ -24,4 +24,4 @@ 
     .globl __GI_strchr; __GI_strchr = __strchr_ppc
 #endif
 
-#include <sysdeps/powerpc/powerpc64/strchr.S>
+#include <sysdeps/powerpc/powerpc64-common/strchr.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchr.c b/sysdeps/powerpc/powerpc64-common/multiarch/strchr.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strchr.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strchr.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strchrnul-power7.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strchrnul-power7.S
index fee140926b..e400bd4295 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strchrnul-power7.S
@@ -21,4 +21,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power7/strchrnul.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/strchrnul.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strchrnul-power8.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/multiarch/strchrnul-power8.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strchrnul-power8.S
index e17e918d00..6dc60b6d02 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strchrnul-power8.S
@@ -21,4 +21,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power8/strchrnul.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strchrnul.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchrnul-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strchrnul-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strchrnul-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strchrnul-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c b/sysdeps/powerpc/powerpc64-common/multiarch/strchrnul.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strchrnul.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strchrnul.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power7.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/multiarch/strcmp-power7.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power7.S
index 814d472680..0ba28e7af3 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power7.S
@@ -21,4 +21,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power7/strcmp.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/strcmp.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power8.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/strcmp-power8.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power8.S
index 68803ffc1b..d1adc15391 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power8.S
@@ -22,5 +22,5 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power8/strcmp.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strcmp.S>
 #endif
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power9.S b/sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power9.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/strcmp-power9.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power9.S
index 8b569d38be..0c3a1df298 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power9.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power9.S
@@ -22,5 +22,5 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power9/strcmp.S>
+#include <sysdeps/powerpc/powerpc64-common/power9/strcmp.S>
 #endif
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S b/sysdeps/powerpc/powerpc64-common/multiarch/strcmp-ppc64.S
similarity index 95%
rename from sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcmp-ppc64.S
index 43e1c6f697..65c19fd60e 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strcmp-ppc64.S
@@ -24,4 +24,4 @@ 
     .globl __GI_strcmp; __GI_strcmp = __strcmp_ppc
 #endif /* SHARED && IS_IN  */
 
-#include <sysdeps/powerpc/powerpc64/strcmp.S>
+#include <sysdeps/powerpc/powerpc64-common/strcmp.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcmp.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strcmp.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcmp.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcpy-power7.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcpy-power7.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strcpy-power7.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcpy-power7.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcpy-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strcpy-power8.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/strcpy-power8.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcpy-power8.S
index 5b68fc970e..6ae2c6a252 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcpy-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strcpy-power8.S
@@ -21,4 +21,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power8/strcpy.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strcpy.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcpy-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcpy-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strcpy-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcpy-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcpy.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcpy.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strcpy.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcpy.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcspn-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strcspn-power8.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/multiarch/strcspn-power8.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcspn-power8.S
index 23bf1c1e5f..a064a5d216 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcspn-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strcspn-power8.S
@@ -20,4 +20,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power8/strcspn.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strcspn.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcspn-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcspn-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strcspn-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcspn-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcspn.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcspn.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strcspn.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strcspn.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strlen-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strlen-power7.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/multiarch/strlen-power7.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strlen-power7.S
index 5f4591ff6c..80c1ac0c65 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strlen-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strlen-power7.S
@@ -21,4 +21,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power7/strlen.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/strlen.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strlen-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strlen-power8.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/multiarch/strlen-power8.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strlen-power8.S
index fb8ffbf970..fc97d842c2 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strlen-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strlen-power8.S
@@ -21,4 +21,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power8/strlen.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strlen.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S b/sysdeps/powerpc/powerpc64-common/multiarch/strlen-ppc64.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strlen-ppc64.S
index 3e9e4814c9..ad6309d1a5 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strlen-ppc64.S
@@ -23,4 +23,4 @@ 
 # define libc_hidden_builtin_def(name)
 #endif
 
-#include <sysdeps/powerpc/powerpc64/strlen.S>
+#include <sysdeps/powerpc/powerpc64-common/strlen.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strlen.c b/sysdeps/powerpc/powerpc64-common/multiarch/strlen.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strlen.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strlen.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncase-power7.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncase-power7.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strncase-power7.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strncase-power7.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncase-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strncase-power8.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/strncase-power8.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strncase-power8.S
index c0a0901a28..0d19c2c78b 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strncase-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strncase-power8.S
@@ -23,4 +23,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power8/strncase.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strncase.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncase-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncase-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strncase-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strncase-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncase.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncase.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strncase.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strncase.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncase_l-power7.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strncase_l-power7.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncase_l.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncase_l.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strncase_l.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strncase_l.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncat-power7.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncat-power7.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strncat-power7.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strncat-power7.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncat-power8.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncat-power8.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strncat-power8.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strncat-power8.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncat-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncat-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strncat-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strncat-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncat.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncat.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strncat.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strncat.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power4.S b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power4.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/multiarch/strncmp-power4.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power4.S
index 860f2ec18a..677dcc524f 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power4.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power4.S
@@ -20,4 +20,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power4/strncmp.S>
+#include <sysdeps/powerpc/powerpc64-common/power4/strncmp.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power7.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/multiarch/strncmp-power7.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power7.S
index 8d4108e1ba..7d569e7c11 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power7.S
@@ -20,4 +20,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power7/strncmp.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/strncmp.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power8.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/multiarch/strncmp-power8.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power8.S
index e8a5fb804f..6e1483ac62 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power8.S
@@ -21,5 +21,5 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power8/strncmp.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strncmp.S>
 #endif
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power9.S b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power9.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/multiarch/strncmp-power9.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power9.S
index 3356f72527..ea99f8440d 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power9.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power9.S
@@ -21,5 +21,5 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power9/strncmp.S>
+#include <sysdeps/powerpc/powerpc64-common/power9/strncmp.S>
 #endif
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp-ppc64.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strncmp-ppc64.S
index 1b5704a079..9a8d39e6aa 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp-ppc64.S
@@ -23,4 +23,4 @@ 
     .globl __GI_strncmp; __GI_strncmp = __strncmp_ppc
 #endif
 
-#include <sysdeps/powerpc/powerpc64/strncmp.S>
+#include <sysdeps/powerpc/powerpc64-common/strncmp.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strncmp.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strncmp.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncpy-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strncpy-power7.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/strncpy-power7.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strncpy-power7.S
index a044c11327..0f6b0c279a 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strncpy-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strncpy-power7.S
@@ -26,4 +26,4 @@ 
 #define MEMSET_is_local
 #endif
 
-#include <sysdeps/powerpc/powerpc64/power7/strncpy.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/strncpy.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncpy-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strncpy-power8.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/strncpy-power8.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strncpy-power8.S
index 10b8453f58..84502c80d5 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strncpy-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strncpy-power8.S
@@ -27,4 +27,4 @@ 
 #define MEMSET_is_local
 #endif
 
-#include <sysdeps/powerpc/powerpc64/power8/strncpy.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strncpy.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncpy-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncpy-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strncpy-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strncpy-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncpy.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncpy.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strncpy.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strncpy.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strnlen-power7.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strnlen-power7.S
index 565937b534..66d48f6c0e 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strnlen-power7.S
@@ -23,4 +23,4 @@ 
 #undef weak_alias
 #define weak_alias(name, alias)
 
-#include <sysdeps/powerpc/powerpc64/power7/strnlen.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/strnlen.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strnlen-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strnlen-power8.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/strnlen-power8.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strnlen-power8.S
index ed5b67e607..d409d55294 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strnlen-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strnlen-power8.S
@@ -23,4 +23,4 @@ 
 #undef weak_alias
 #define weak_alias(name, alias)
 
-#include <sysdeps/powerpc/powerpc64/power8/strnlen.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strnlen.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strnlen-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strnlen-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strnlen-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strnlen-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strnlen.c b/sysdeps/powerpc/powerpc64-common/multiarch/strnlen.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strnlen.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strnlen.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strrchr-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strrchr-power7.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/multiarch/strrchr-power7.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strrchr-power7.S
index 949803031e..99c95c744f 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strrchr-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strrchr-power7.S
@@ -21,4 +21,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power7/strrchr.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/strrchr.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strrchr-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strrchr-power8.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/multiarch/strrchr-power8.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strrchr-power8.S
index 342d02a38c..29bcc1ccf4 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strrchr-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strrchr-power8.S
@@ -21,4 +21,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power8/strrchr.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strrchr.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strrchr-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strrchr-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strrchr.c b/sysdeps/powerpc/powerpc64-common/multiarch/strrchr.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strrchr.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strrchr.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strspn-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strspn-power8.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/multiarch/strspn-power8.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strspn-power8.S
index bc9f493cf7..a6350570a8 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strspn-power8.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strspn-power8.S
@@ -20,4 +20,4 @@ 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
-#include <sysdeps/powerpc/powerpc64/power8/strspn.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strspn.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strspn-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strspn-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strspn-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strspn-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strspn.c b/sysdeps/powerpc/powerpc64-common/multiarch/strspn.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strspn.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strspn.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strstr-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strstr-power7.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/multiarch/strstr-power7.S
rename to sysdeps/powerpc/powerpc64-common/multiarch/strstr-power7.S
index a24ab585f4..4cc373a065 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strstr-power7.S
+++ b/sysdeps/powerpc/powerpc64-common/multiarch/strstr-power7.S
@@ -30,4 +30,4 @@ 
 #define STRCHR_is_local
 #endif
 
-#include <sysdeps/powerpc/powerpc64/power7/strstr.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/strstr.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strstr-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strstr-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strstr-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strstr-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strstr.c b/sysdeps/powerpc/powerpc64-common/multiarch/strstr.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/strstr.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/strstr.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcschr-power6.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcschr-power6.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/wcschr-power6.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/wcschr-power6.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcschr-power7.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcschr-power7.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/wcschr-power7.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/wcschr-power7.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcschr-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcschr-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/wcschr-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/wcschr-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcschr.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcschr.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/wcschr.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/wcschr.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcscpy-power6.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcscpy-power6.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/wcscpy-power6.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/wcscpy-power6.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcscpy-power7.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcscpy-power7.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/wcscpy-power7.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/wcscpy-power7.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcscpy-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcscpy-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/wcscpy-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/wcscpy-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcscpy.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcscpy.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/wcscpy.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/wcscpy.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcsrchr-power6.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcsrchr-power6.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/wcsrchr-power6.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/wcsrchr-power6.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcsrchr-power7.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcsrchr-power7.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/wcsrchr-power7.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/wcsrchr-power7.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcsrchr-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcsrchr-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/wcsrchr-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/wcsrchr-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcsrchr.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcsrchr.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/wcsrchr.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/wcsrchr.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/wordcopy-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/multiarch/wordcopy-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/power4/Makefile b/sysdeps/powerpc/powerpc64-common/power4/Makefile
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power4/Makefile
rename to sysdeps/powerpc/powerpc64-common/power4/Makefile
diff --git a/sysdeps/powerpc/powerpc64/power4/memcmp.S b/sysdeps/powerpc/powerpc64-common/power4/memcmp.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power4/memcmp.S
rename to sysdeps/powerpc/powerpc64-common/power4/memcmp.S
diff --git a/sysdeps/powerpc/powerpc64/power4/memcopy.h b/sysdeps/powerpc/powerpc64-common/power4/memcopy.h
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power4/memcopy.h
rename to sysdeps/powerpc/powerpc64-common/power4/memcopy.h
diff --git a/sysdeps/powerpc/powerpc64/power4/memcpy.S b/sysdeps/powerpc/powerpc64-common/power4/memcpy.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power4/memcpy.S
rename to sysdeps/powerpc/powerpc64-common/power4/memcpy.S
diff --git a/sysdeps/powerpc/powerpc64/power4/memset.S b/sysdeps/powerpc/powerpc64-common/power4/memset.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power4/memset.S
rename to sysdeps/powerpc/powerpc64-common/power4/memset.S
diff --git a/sysdeps/powerpc/powerpc64/power4/strncmp.S b/sysdeps/powerpc/powerpc64-common/power4/strncmp.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power4/strncmp.S
rename to sysdeps/powerpc/powerpc64-common/power4/strncmp.S
diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/s_ceil.S b/sysdeps/powerpc/powerpc64-common/power5+/fpu/s_ceil.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power5+/fpu/s_ceil.S
rename to sysdeps/powerpc/powerpc64-common/power5+/fpu/s_ceil.S
diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/s_ceilf.S b/sysdeps/powerpc/powerpc64-common/power5+/fpu/s_ceilf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power5+/fpu/s_ceilf.S
rename to sysdeps/powerpc/powerpc64-common/power5+/fpu/s_ceilf.S
diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/s_floor.S b/sysdeps/powerpc/powerpc64-common/power5+/fpu/s_floor.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power5+/fpu/s_floor.S
rename to sysdeps/powerpc/powerpc64-common/power5+/fpu/s_floor.S
diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/s_floorf.S b/sysdeps/powerpc/powerpc64-common/power5+/fpu/s_floorf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power5+/fpu/s_floorf.S
rename to sysdeps/powerpc/powerpc64-common/power5+/fpu/s_floorf.S
diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/s_llround.S b/sysdeps/powerpc/powerpc64-common/power5+/fpu/s_llround.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power5+/fpu/s_llround.S
rename to sysdeps/powerpc/powerpc64-common/power5+/fpu/s_llround.S
diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/s_llroundf.S b/sysdeps/powerpc/powerpc64-common/power5+/fpu/s_llroundf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power5+/fpu/s_llroundf.S
rename to sysdeps/powerpc/powerpc64-common/power5+/fpu/s_llroundf.S
diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/s_round.S b/sysdeps/powerpc/powerpc64-common/power5+/fpu/s_round.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power5+/fpu/s_round.S
rename to sysdeps/powerpc/powerpc64-common/power5+/fpu/s_round.S
diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/s_roundf.S b/sysdeps/powerpc/powerpc64-common/power5+/fpu/s_roundf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power5+/fpu/s_roundf.S
rename to sysdeps/powerpc/powerpc64-common/power5+/fpu/s_roundf.S
diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/s_trunc.S b/sysdeps/powerpc/powerpc64-common/power5+/fpu/s_trunc.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power5+/fpu/s_trunc.S
rename to sysdeps/powerpc/powerpc64-common/power5+/fpu/s_trunc.S
diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/s_truncf.S b/sysdeps/powerpc/powerpc64-common/power5+/fpu/s_truncf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power5+/fpu/s_truncf.S
rename to sysdeps/powerpc/powerpc64-common/power5+/fpu/s_truncf.S
diff --git a/sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64-common/power5/fpu/s_isnan.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S
rename to sysdeps/powerpc/powerpc64-common/power5/fpu/s_isnan.S
diff --git a/sysdeps/powerpc/powerpc64/power6/fpu/s_copysign.S b/sysdeps/powerpc/powerpc64-common/power6/fpu/s_copysign.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power6/fpu/s_copysign.S
rename to sysdeps/powerpc/powerpc64-common/power6/fpu/s_copysign.S
diff --git a/sysdeps/powerpc/powerpc64/power6/fpu/s_copysignf.S b/sysdeps/powerpc/powerpc64-common/power6/fpu/s_copysignf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power6/fpu/s_copysignf.S
rename to sysdeps/powerpc/powerpc64-common/power6/fpu/s_copysignf.S
diff --git a/sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64-common/power6/fpu/s_isnan.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S
rename to sysdeps/powerpc/powerpc64-common/power6/fpu/s_isnan.S
diff --git a/sysdeps/powerpc/powerpc64/power6/memcpy.S b/sysdeps/powerpc/powerpc64-common/power6/memcpy.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power6/memcpy.S
rename to sysdeps/powerpc/powerpc64-common/power6/memcpy.S
diff --git a/sysdeps/powerpc/powerpc64/power6/memset.S b/sysdeps/powerpc/powerpc64-common/power6/memset.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power6/memset.S
rename to sysdeps/powerpc/powerpc64-common/power6/memset.S
diff --git a/sysdeps/powerpc/powerpc64/power6/wcschr.c b/sysdeps/powerpc/powerpc64-common/power6/wcschr.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power6/wcschr.c
rename to sysdeps/powerpc/powerpc64-common/power6/wcschr.c
diff --git a/sysdeps/powerpc/powerpc64/power6/wcscpy.c b/sysdeps/powerpc/powerpc64-common/power6/wcscpy.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power6/wcscpy.c
rename to sysdeps/powerpc/powerpc64-common/power6/wcscpy.c
diff --git a/sysdeps/powerpc/powerpc64/power6/wcsrchr.c b/sysdeps/powerpc/powerpc64-common/power6/wcsrchr.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power6/wcsrchr.c
rename to sysdeps/powerpc/powerpc64-common/power6/wcsrchr.c
diff --git a/sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64-common/power6x/fpu/s_isnan.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S
rename to sysdeps/powerpc/powerpc64-common/power6x/fpu/s_isnan.S
diff --git a/sysdeps/powerpc/powerpc64/power6x/fpu/s_llrint.S b/sysdeps/powerpc/powerpc64-common/power6x/fpu/s_llrint.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power6x/fpu/s_llrint.S
rename to sysdeps/powerpc/powerpc64-common/power6x/fpu/s_llrint.S
diff --git a/sysdeps/powerpc/powerpc64/power6x/fpu/s_llround.S b/sysdeps/powerpc/powerpc64-common/power6x/fpu/s_llround.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power6x/fpu/s_llround.S
rename to sysdeps/powerpc/powerpc64-common/power6x/fpu/s_llround.S
diff --git a/sysdeps/powerpc/powerpc64/power6x/fpu/s_llroundf.S b/sysdeps/powerpc/powerpc64-common/power6x/fpu/s_llroundf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power6x/fpu/s_llroundf.S
rename to sysdeps/powerpc/powerpc64-common/power6x/fpu/s_llroundf.S
diff --git a/sysdeps/powerpc/powerpc64/power7/Makefile b/sysdeps/powerpc/powerpc64-common/power7/Makefile
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/Makefile
rename to sysdeps/powerpc/powerpc64-common/power7/Makefile
diff --git a/sysdeps/powerpc/powerpc64/power7/add_n.S b/sysdeps/powerpc/powerpc64-common/power7/add_n.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/add_n.S
rename to sysdeps/powerpc/powerpc64-common/power7/add_n.S
diff --git a/sysdeps/powerpc/powerpc64/power7/bcopy.c b/sysdeps/powerpc/powerpc64-common/power7/bcopy.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/bcopy.c
rename to sysdeps/powerpc/powerpc64-common/power7/bcopy.c
diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S b/sysdeps/powerpc/powerpc64-common/power7/fpu/s_finite.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S
rename to sysdeps/powerpc/powerpc64-common/power7/fpu/s_finite.S
diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_finitef.S b/sysdeps/powerpc/powerpc64-common/power7/fpu/s_finitef.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/fpu/s_finitef.S
rename to sysdeps/powerpc/powerpc64-common/power7/fpu/s_finitef.S
diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S b/sysdeps/powerpc/powerpc64-common/power7/fpu/s_isinf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S
rename to sysdeps/powerpc/powerpc64-common/power7/fpu/s_isinf.S
diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_isinff.S b/sysdeps/powerpc/powerpc64-common/power7/fpu/s_isinff.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/fpu/s_isinff.S
rename to sysdeps/powerpc/powerpc64-common/power7/fpu/s_isinff.S
diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64-common/power7/fpu/s_isnan.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S
rename to sysdeps/powerpc/powerpc64-common/power7/fpu/s_isnan.S
diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_isnanf.S b/sysdeps/powerpc/powerpc64-common/power7/fpu/s_isnanf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/fpu/s_isnanf.S
rename to sysdeps/powerpc/powerpc64-common/power7/fpu/s_isnanf.S
diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_logb.c b/sysdeps/powerpc/powerpc64-common/power7/fpu/s_logb.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/fpu/s_logb.c
rename to sysdeps/powerpc/powerpc64-common/power7/fpu/s_logb.c
diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_logbf.c b/sysdeps/powerpc/powerpc64-common/power7/fpu/s_logbf.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/fpu/s_logbf.c
rename to sysdeps/powerpc/powerpc64-common/power7/fpu/s_logbf.c
diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_logbl.c b/sysdeps/powerpc/powerpc64-common/power7/fpu/s_logbl.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/fpu/s_logbl.c
rename to sysdeps/powerpc/powerpc64-common/power7/fpu/s_logbl.c
diff --git a/sysdeps/powerpc/powerpc64/power7/memchr.S b/sysdeps/powerpc/powerpc64-common/power7/memchr.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/memchr.S
rename to sysdeps/powerpc/powerpc64-common/power7/memchr.S
diff --git a/sysdeps/powerpc/powerpc64/power7/memcmp.S b/sysdeps/powerpc/powerpc64-common/power7/memcmp.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/memcmp.S
rename to sysdeps/powerpc/powerpc64-common/power7/memcmp.S
diff --git a/sysdeps/powerpc/powerpc64/power7/memcpy.S b/sysdeps/powerpc/powerpc64-common/power7/memcpy.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/memcpy.S
rename to sysdeps/powerpc/powerpc64-common/power7/memcpy.S
diff --git a/sysdeps/powerpc/powerpc64/power7/memmove.S b/sysdeps/powerpc/powerpc64-common/power7/memmove.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/memmove.S
rename to sysdeps/powerpc/powerpc64-common/power7/memmove.S
diff --git a/sysdeps/powerpc/powerpc64/power7/mempcpy.S b/sysdeps/powerpc/powerpc64-common/power7/mempcpy.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/mempcpy.S
rename to sysdeps/powerpc/powerpc64-common/power7/mempcpy.S
diff --git a/sysdeps/powerpc/powerpc64/power7/memrchr.S b/sysdeps/powerpc/powerpc64-common/power7/memrchr.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/memrchr.S
rename to sysdeps/powerpc/powerpc64-common/power7/memrchr.S
diff --git a/sysdeps/powerpc/powerpc64/power7/memset.S b/sysdeps/powerpc/powerpc64-common/power7/memset.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/memset.S
rename to sysdeps/powerpc/powerpc64-common/power7/memset.S
diff --git a/sysdeps/powerpc/powerpc64/power7/rawmemchr.S b/sysdeps/powerpc/powerpc64-common/power7/rawmemchr.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/rawmemchr.S
rename to sysdeps/powerpc/powerpc64-common/power7/rawmemchr.S
diff --git a/sysdeps/powerpc/powerpc64/power7/stpncpy.S b/sysdeps/powerpc/powerpc64-common/power7/stpncpy.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/power7/stpncpy.S
rename to sysdeps/powerpc/powerpc64-common/power7/stpncpy.S
index 279ce83973..bc56a13970 100644
--- a/sysdeps/powerpc/powerpc64/power7/stpncpy.S
+++ b/sysdeps/powerpc/powerpc64-common/power7/stpncpy.S
@@ -17,7 +17,7 @@ 
    <http://www.gnu.org/licenses/>.  */
 
 #define USE_AS_STPNCPY
-#include <sysdeps/powerpc/powerpc64/power7/strncpy.S>
+#include <sysdeps/powerpc/powerpc64-common/power7/strncpy.S>
 
 weak_alias (__stpncpy, stpncpy)
 libc_hidden_def (__stpncpy)
diff --git a/sysdeps/powerpc/powerpc64/power7/strcasecmp.S b/sysdeps/powerpc/powerpc64-common/power7/strcasecmp.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/strcasecmp.S
rename to sysdeps/powerpc/powerpc64-common/power7/strcasecmp.S
diff --git a/sysdeps/powerpc/powerpc64/power7/strcasecmp_l.S b/sysdeps/powerpc/powerpc64-common/power7/strcasecmp_l.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/strcasecmp_l.S
rename to sysdeps/powerpc/powerpc64-common/power7/strcasecmp_l.S
diff --git a/sysdeps/powerpc/powerpc64/power7/strchr.S b/sysdeps/powerpc/powerpc64-common/power7/strchr.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/strchr.S
rename to sysdeps/powerpc/powerpc64-common/power7/strchr.S
diff --git a/sysdeps/powerpc/powerpc64/power7/strchrnul.S b/sysdeps/powerpc/powerpc64-common/power7/strchrnul.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/strchrnul.S
rename to sysdeps/powerpc/powerpc64-common/power7/strchrnul.S
diff --git a/sysdeps/powerpc/powerpc64/power7/strcmp.S b/sysdeps/powerpc/powerpc64-common/power7/strcmp.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/strcmp.S
rename to sysdeps/powerpc/powerpc64-common/power7/strcmp.S
diff --git a/sysdeps/powerpc/powerpc64/power7/strlen.S b/sysdeps/powerpc/powerpc64-common/power7/strlen.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/strlen.S
rename to sysdeps/powerpc/powerpc64-common/power7/strlen.S
diff --git a/sysdeps/powerpc/powerpc64/power7/strncmp.S b/sysdeps/powerpc/powerpc64-common/power7/strncmp.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/strncmp.S
rename to sysdeps/powerpc/powerpc64-common/power7/strncmp.S
diff --git a/sysdeps/powerpc/powerpc64/power7/strncpy.S b/sysdeps/powerpc/powerpc64-common/power7/strncpy.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/strncpy.S
rename to sysdeps/powerpc/powerpc64-common/power7/strncpy.S
diff --git a/sysdeps/powerpc/powerpc64/power7/strnlen.S b/sysdeps/powerpc/powerpc64-common/power7/strnlen.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/strnlen.S
rename to sysdeps/powerpc/powerpc64-common/power7/strnlen.S
diff --git a/sysdeps/powerpc/powerpc64/power7/strrchr.S b/sysdeps/powerpc/powerpc64-common/power7/strrchr.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/strrchr.S
rename to sysdeps/powerpc/powerpc64-common/power7/strrchr.S
diff --git a/sysdeps/powerpc/powerpc64/power7/strstr-ppc64.c b/sysdeps/powerpc/powerpc64-common/power7/strstr-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/strstr-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/power7/strstr-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/power7/strstr.S b/sysdeps/powerpc/powerpc64-common/power7/strstr.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/strstr.S
rename to sysdeps/powerpc/powerpc64-common/power7/strstr.S
diff --git a/sysdeps/powerpc/powerpc64/power7/sub_n.S b/sysdeps/powerpc/powerpc64-common/power7/sub_n.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power7/sub_n.S
rename to sysdeps/powerpc/powerpc64-common/power7/sub_n.S
diff --git a/sysdeps/powerpc/powerpc64/power8/Makefile b/sysdeps/powerpc/powerpc64-common/power8/Makefile
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/Makefile
rename to sysdeps/powerpc/powerpc64-common/power8/Makefile
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/e_expf.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/e_expf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/fpu/e_expf.S
rename to sysdeps/powerpc/powerpc64-common/power8/fpu/e_expf.S
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_cosf.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_cosf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/fpu/s_cosf.S
rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_cosf.S
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_finite.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_finite.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/fpu/s_finite.S
rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_finite.S
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_finitef.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_finitef.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/fpu/s_finitef.S
rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_finitef.S
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_isinf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S
rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_isinf.S
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_isinff.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_isinff.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/fpu/s_isinff.S
rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_isinff.S
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_isnan.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S
rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_isnan.S
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_isnanf.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_isnanf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/fpu/s_isnanf.S
rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_isnanf.S
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_llrint.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_llrint.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/fpu/s_llrint.S
rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_llrint.S
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_llround.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_llround.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/fpu/s_llround.S
rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_llround.S
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_llroundf.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_llroundf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/fpu/s_llroundf.S
rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_llroundf.S
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_sinf.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_sinf.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/fpu/s_sinf.S
rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_sinf.S
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/w_expf.c b/sysdeps/powerpc/powerpc64-common/power8/fpu/w_expf.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/fpu/w_expf.c
rename to sysdeps/powerpc/powerpc64-common/power8/fpu/w_expf.c
diff --git a/sysdeps/powerpc/powerpc64/power8/memchr.S b/sysdeps/powerpc/powerpc64-common/power8/memchr.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/memchr.S
rename to sysdeps/powerpc/powerpc64-common/power8/memchr.S
diff --git a/sysdeps/powerpc/powerpc64/power8/memcmp.S b/sysdeps/powerpc/powerpc64-common/power8/memcmp.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/memcmp.S
rename to sysdeps/powerpc/powerpc64-common/power8/memcmp.S
diff --git a/sysdeps/powerpc/powerpc64/power8/memrchr.S b/sysdeps/powerpc/powerpc64-common/power8/memrchr.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/memrchr.S
rename to sysdeps/powerpc/powerpc64-common/power8/memrchr.S
diff --git a/sysdeps/powerpc/powerpc64/power8/memset.S b/sysdeps/powerpc/powerpc64-common/power8/memset.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/memset.S
rename to sysdeps/powerpc/powerpc64-common/power8/memset.S
diff --git a/sysdeps/powerpc/powerpc64/power8/stpcpy.S b/sysdeps/powerpc/powerpc64-common/power8/stpcpy.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/power8/stpcpy.S
rename to sysdeps/powerpc/powerpc64-common/power8/stpcpy.S
index ebdfaab97c..8dd8d65e77 100644
--- a/sysdeps/powerpc/powerpc64/power8/stpcpy.S
+++ b/sysdeps/powerpc/powerpc64-common/power8/stpcpy.S
@@ -17,7 +17,7 @@ 
    <http://www.gnu.org/licenses/>.  */
 
 #define USE_AS_STPCPY
-#include <sysdeps/powerpc/powerpc64/power8/strcpy.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strcpy.S>
 
 weak_alias (__stpcpy, stpcpy)
 libc_hidden_def (__stpcpy)
diff --git a/sysdeps/powerpc/powerpc64/power8/stpncpy.S b/sysdeps/powerpc/powerpc64-common/power8/stpncpy.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/power8/stpncpy.S
rename to sysdeps/powerpc/powerpc64-common/power8/stpncpy.S
index 95c86e9677..dca35c64f7 100644
--- a/sysdeps/powerpc/powerpc64/power8/stpncpy.S
+++ b/sysdeps/powerpc/powerpc64-common/power8/stpncpy.S
@@ -17,7 +17,7 @@ 
    <http://www.gnu.org/licenses/>.  */
 
 #define USE_AS_STPNCPY
-#include <sysdeps/powerpc/powerpc64/power8/strncpy.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strncpy.S>
 
 weak_alias (__stpncpy, stpncpy)
 libc_hidden_def (__stpncpy)
diff --git a/sysdeps/powerpc/powerpc64/power8/strcasecmp.S b/sysdeps/powerpc/powerpc64-common/power8/strcasecmp.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/strcasecmp.S
rename to sysdeps/powerpc/powerpc64-common/power8/strcasecmp.S
diff --git a/sysdeps/powerpc/powerpc64/power8/strcasestr-ppc64.c b/sysdeps/powerpc/powerpc64-common/power8/strcasestr-ppc64.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/strcasestr-ppc64.c
rename to sysdeps/powerpc/powerpc64-common/power8/strcasestr-ppc64.c
diff --git a/sysdeps/powerpc/powerpc64/power8/strcasestr.S b/sysdeps/powerpc/powerpc64-common/power8/strcasestr.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/strcasestr.S
rename to sysdeps/powerpc/powerpc64-common/power8/strcasestr.S
diff --git a/sysdeps/powerpc/powerpc64/power8/strchr.S b/sysdeps/powerpc/powerpc64-common/power8/strchr.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/strchr.S
rename to sysdeps/powerpc/powerpc64-common/power8/strchr.S
diff --git a/sysdeps/powerpc/powerpc64/power8/strchrnul.S b/sysdeps/powerpc/powerpc64-common/power8/strchrnul.S
similarity index 94%
rename from sysdeps/powerpc/powerpc64/power8/strchrnul.S
rename to sysdeps/powerpc/powerpc64-common/power8/strchrnul.S
index 022ad67a6b..2ec26f6102 100644
--- a/sysdeps/powerpc/powerpc64/power8/strchrnul.S
+++ b/sysdeps/powerpc/powerpc64-common/power8/strchrnul.S
@@ -17,7 +17,7 @@ 
    <http://www.gnu.org/licenses/>.  */
 
 #define USE_AS_STRCHRNUL 1
-#include <sysdeps/powerpc/powerpc64/power8/strchr.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strchr.S>
 
 weak_alias (__strchrnul,strchrnul)
 libc_hidden_builtin_def (__strchrnul)
diff --git a/sysdeps/powerpc/powerpc64/power8/strcmp.S b/sysdeps/powerpc/powerpc64-common/power8/strcmp.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/strcmp.S
rename to sysdeps/powerpc/powerpc64-common/power8/strcmp.S
diff --git a/sysdeps/powerpc/powerpc64/power8/strcpy.S b/sysdeps/powerpc/powerpc64-common/power8/strcpy.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/strcpy.S
rename to sysdeps/powerpc/powerpc64-common/power8/strcpy.S
diff --git a/sysdeps/powerpc/powerpc64/power8/strcspn.S b/sysdeps/powerpc/powerpc64-common/power8/strcspn.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/power8/strcspn.S
rename to sysdeps/powerpc/powerpc64-common/power8/strcspn.S
index c2d130e7db..dda3904428 100644
--- a/sysdeps/powerpc/powerpc64/power8/strcspn.S
+++ b/sysdeps/powerpc/powerpc64-common/power8/strcspn.S
@@ -17,4 +17,4 @@ 
    <http://www.gnu.org/licenses/>.  */
 
 #define USE_AS_STRCSPN 1
-#include <sysdeps/powerpc/powerpc64/power8/strspn.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strspn.S>
diff --git a/sysdeps/powerpc/powerpc64/power8/strlen.S b/sysdeps/powerpc/powerpc64-common/power8/strlen.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/strlen.S
rename to sysdeps/powerpc/powerpc64-common/power8/strlen.S
diff --git a/sysdeps/powerpc/powerpc64/power8/strncase.S b/sysdeps/powerpc/powerpc64-common/power8/strncase.S
similarity index 93%
rename from sysdeps/powerpc/powerpc64/power8/strncase.S
rename to sysdeps/powerpc/powerpc64-common/power8/strncase.S
index 050b63ab91..c5293bd37e 100644
--- a/sysdeps/powerpc/powerpc64/power8/strncase.S
+++ b/sysdeps/powerpc/powerpc64-common/power8/strncase.S
@@ -17,4 +17,4 @@ 
    <http://www.gnu.org/licenses/>.  */
 
 #define USE_AS_STRNCASECMP 1
-#include <sysdeps/powerpc/powerpc64/power8/strcasecmp.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strcasecmp.S>
diff --git a/sysdeps/powerpc/powerpc64/power8/strncmp.S b/sysdeps/powerpc/powerpc64-common/power8/strncmp.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/strncmp.S
rename to sysdeps/powerpc/powerpc64-common/power8/strncmp.S
diff --git a/sysdeps/powerpc/powerpc64/power8/strncpy.S b/sysdeps/powerpc/powerpc64-common/power8/strncpy.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/strncpy.S
rename to sysdeps/powerpc/powerpc64-common/power8/strncpy.S
diff --git a/sysdeps/powerpc/powerpc64/power8/strnlen.S b/sysdeps/powerpc/powerpc64-common/power8/strnlen.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/strnlen.S
rename to sysdeps/powerpc/powerpc64-common/power8/strnlen.S
diff --git a/sysdeps/powerpc/powerpc64/power8/strrchr.S b/sysdeps/powerpc/powerpc64-common/power8/strrchr.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/strrchr.S
rename to sysdeps/powerpc/powerpc64-common/power8/strrchr.S
diff --git a/sysdeps/powerpc/powerpc64/power8/strspn.S b/sysdeps/powerpc/powerpc64-common/power8/strspn.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/power8/strspn.S
rename to sysdeps/powerpc/powerpc64-common/power8/strspn.S
diff --git a/sysdeps/powerpc/powerpc64/power9/strcmp.S b/sysdeps/powerpc/powerpc64-common/power9/strcmp.S
similarity index 99%
rename from sysdeps/powerpc/powerpc64/power9/strcmp.S
rename to sysdeps/powerpc/powerpc64-common/power9/strcmp.S
index 98243a9d51..bbf813f3f9 100644
--- a/sysdeps/powerpc/powerpc64/power9/strcmp.S
+++ b/sysdeps/powerpc/powerpc64-common/power9/strcmp.S
@@ -264,5 +264,5 @@  L(pagecross_nullfound):
 END (STRCMP)
 libc_hidden_builtin_def (strcmp)
 #else
-#include <sysdeps/powerpc/powerpc64/power8/strcmp.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strcmp.S>
 #endif
diff --git a/sysdeps/powerpc/powerpc64/power9/strncmp.S b/sysdeps/powerpc/powerpc64-common/power9/strncmp.S
similarity index 99%
rename from sysdeps/powerpc/powerpc64/power9/strncmp.S
rename to sysdeps/powerpc/powerpc64-common/power9/strncmp.S
index 40be98ff45..1538c6e495 100644
--- a/sysdeps/powerpc/powerpc64/power9/strncmp.S
+++ b/sysdeps/powerpc/powerpc64-common/power9/strncmp.S
@@ -375,5 +375,5 @@  L(byte_ne_3):
 END(STRNCMP)
 libc_hidden_builtin_def(strncmp)
 #else
-#include <sysdeps/powerpc/powerpc64/power8/strncmp.S>
+#include <sysdeps/powerpc/powerpc64-common/power8/strncmp.S>
 #endif
diff --git a/sysdeps/powerpc/powerpc64/ppc-mcount.S b/sysdeps/powerpc/powerpc64-common/ppc-mcount.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/ppc-mcount.S
rename to sysdeps/powerpc/powerpc64-common/ppc-mcount.S
diff --git a/sysdeps/powerpc/powerpc64/register-dump.h b/sysdeps/powerpc/powerpc64-common/register-dump.h
similarity index 100%
rename from sysdeps/powerpc/powerpc64/register-dump.h
rename to sysdeps/powerpc/powerpc64-common/register-dump.h
diff --git a/sysdeps/powerpc/powerpc64/rtld-memset.c b/sysdeps/powerpc/powerpc64-common/rtld-memset.c
similarity index 100%
rename from sysdeps/powerpc/powerpc64/rtld-memset.c
rename to sysdeps/powerpc/powerpc64-common/rtld-memset.c
diff --git a/sysdeps/powerpc/powerpc64/setjmp-common.S b/sysdeps/powerpc/powerpc64-common/setjmp-common.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/setjmp-common.S
rename to sysdeps/powerpc/powerpc64-common/setjmp-common.S
diff --git a/sysdeps/powerpc/powerpc64/setjmp.S b/sysdeps/powerpc/powerpc64-common/setjmp.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/setjmp.S
rename to sysdeps/powerpc/powerpc64-common/setjmp.S
diff --git a/sysdeps/powerpc/powerpc64/stackguard-macros.h b/sysdeps/powerpc/powerpc64-common/stackguard-macros.h
similarity index 100%
rename from sysdeps/powerpc/powerpc64/stackguard-macros.h
rename to sysdeps/powerpc/powerpc64-common/stackguard-macros.h
diff --git a/sysdeps/powerpc/powerpc64/start.S b/sysdeps/powerpc/powerpc64-common/start.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/start.S
rename to sysdeps/powerpc/powerpc64-common/start.S
diff --git a/sysdeps/powerpc/powerpc64/strchr.S b/sysdeps/powerpc/powerpc64-common/strchr.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/strchr.S
rename to sysdeps/powerpc/powerpc64-common/strchr.S
diff --git a/sysdeps/powerpc/powerpc64/strcmp.S b/sysdeps/powerpc/powerpc64-common/strcmp.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/strcmp.S
rename to sysdeps/powerpc/powerpc64-common/strcmp.S
diff --git a/sysdeps/powerpc/powerpc64/strlen.S b/sysdeps/powerpc/powerpc64-common/strlen.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/strlen.S
rename to sysdeps/powerpc/powerpc64-common/strlen.S
diff --git a/sysdeps/powerpc/powerpc64/strncmp.S b/sysdeps/powerpc/powerpc64-common/strncmp.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/strncmp.S
rename to sysdeps/powerpc/powerpc64-common/strncmp.S
diff --git a/sysdeps/powerpc/powerpc64/submul_1.S b/sysdeps/powerpc/powerpc64-common/submul_1.S
similarity index 100%
rename from sysdeps/powerpc/powerpc64/submul_1.S
rename to sysdeps/powerpc/powerpc64-common/submul_1.S
diff --git a/sysdeps/powerpc/powerpc64/sysdep.h b/sysdeps/powerpc/powerpc64-common/sysdep.h
similarity index 100%
rename from sysdeps/powerpc/powerpc64/sysdep.h
rename to sysdeps/powerpc/powerpc64-common/sysdep.h
diff --git a/sysdeps/powerpc/powerpc64/tls-macros.h b/sysdeps/powerpc/powerpc64-common/tls-macros.h
similarity index 100%
rename from sysdeps/powerpc/powerpc64/tls-macros.h
rename to sysdeps/powerpc/powerpc64-common/tls-macros.h
diff --git a/sysdeps/powerpc/powerpc64/tst-audit.h b/sysdeps/powerpc/powerpc64-common/tst-audit.h
similarity index 100%
rename from sysdeps/powerpc/powerpc64/tst-audit.h
rename to sysdeps/powerpc/powerpc64-common/tst-audit.h
diff --git a/sysdeps/powerpc/powerpc64/970/Implies b/sysdeps/powerpc/powerpc64/970/Implies
index bedb20b65c..876568a8ad 100644
--- a/sysdeps/powerpc/powerpc64/970/Implies
+++ b/sysdeps/powerpc/powerpc64/970/Implies
@@ -1,2 +1,3 @@ 
+powerpc/powerpc64-common/970
 powerpc/powerpc64/power4/fpu
 powerpc/powerpc64/power4
diff --git a/sysdeps/powerpc/powerpc64/Implies b/sysdeps/powerpc/powerpc64/Implies
index a8cae95f9d..f8d7ded895 100644
--- a/sysdeps/powerpc/powerpc64/Implies
+++ b/sysdeps/powerpc/powerpc64/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common
 wordsize-64
diff --git a/sysdeps/powerpc/powerpc64/a2/Implies b/sysdeps/powerpc/powerpc64/a2/Implies
new file mode 100644
index 0000000000..8e79a6c1ab
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/a2/Implies
@@ -0,0 +1 @@ 
+powerpc/powerpc64-common/a2
diff --git a/sysdeps/powerpc/powerpc64/cell/Implies b/sysdeps/powerpc/powerpc64/cell/Implies
new file mode 100644
index 0000000000..b99d6f5a80
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/cell/Implies
@@ -0,0 +1 @@ 
+powerpc/powerpc64-common/cell
diff --git a/sysdeps/powerpc/powerpc64/fpu/Implies b/sysdeps/powerpc/powerpc64/fpu/Implies
new file mode 100644
index 0000000000..26682593f0
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/fpu/Implies
@@ -0,0 +1 @@ 
+powerpc/powerpc64-common/fpu
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/fpu/multiarch/Implies
new file mode 100644
index 0000000000..be8c678700
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/Implies
@@ -0,0 +1 @@ 
+powerpc/powerpc64-common/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/multiarch/Implies b/sysdeps/powerpc/powerpc64/multiarch/Implies
new file mode 100644
index 0000000000..69d9709b4f
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/multiarch/Implies
@@ -0,0 +1 @@ 
+powerpc/powerpc64-common/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power4/Implies b/sysdeps/powerpc/powerpc64/power4/Implies
index a372141bb7..9caa77fbe9 100644
--- a/sysdeps/powerpc/powerpc64/power4/Implies
+++ b/sysdeps/powerpc/powerpc64/power4/Implies
@@ -1,2 +1,3 @@ 
+powerpc/powerpc64-common/power4
 powerpc/power4/fpu
 powerpc/power4
diff --git a/sysdeps/powerpc/powerpc64/power4/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power4/fpu/multiarch/Implies
index 8d6531a174..4e81648ab6 100644
--- a/sysdeps/powerpc/powerpc64/power4/fpu/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64/power4/fpu/multiarch/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power4/fpu/multiarch
 powerpc/powerpc64/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power4/multiarch/Implies b/sysdeps/powerpc/powerpc64/power4/multiarch/Implies
index 30edcf7f9d..9805a4632a 100644
--- a/sysdeps/powerpc/powerpc64/power4/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64/power4/multiarch/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power4/multiarch
 powerpc/powerpc64/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power5+/Implies b/sysdeps/powerpc/powerpc64/power5+/Implies
index 565bc94471..471085ce9f 100644
--- a/sysdeps/powerpc/powerpc64/power5+/Implies
+++ b/sysdeps/powerpc/powerpc64/power5+/Implies
@@ -1,3 +1,4 @@ 
+powerpc/powerpc64-common/power5+
 powerpc/power5+/fpu
 powerpc/power5+
 powerpc/powerpc64/power5/fpu
diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/Implies b/sysdeps/powerpc/powerpc64/power5+/fpu/Implies
index f00c50fb49..e718df9d94 100644
--- a/sysdeps/powerpc/powerpc64/power5+/fpu/Implies
+++ b/sysdeps/powerpc/powerpc64/power5+/fpu/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power5+/fpu
 powerpc/powerpc64/power5/fpu
diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power5+/fpu/multiarch/Implies
index c0e67848e2..d2aa42a032 100644
--- a/sysdeps/powerpc/powerpc64/power5+/fpu/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64/power5+/fpu/multiarch/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power5+/fpu/multiarch
 powerpc/powerpc64/power5/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power5+/multiarch/Implies b/sysdeps/powerpc/powerpc64/power5+/multiarch/Implies
index 0851b19fa2..6e408499ce 100644
--- a/sysdeps/powerpc/powerpc64/power5+/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64/power5+/multiarch/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power5+/multiarch
 powerpc/powerpc64/power5/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power5/Implies b/sysdeps/powerpc/powerpc64/power5/Implies
index bedb20b65c..67a06aae30 100644
--- a/sysdeps/powerpc/powerpc64/power5/Implies
+++ b/sysdeps/powerpc/powerpc64/power5/Implies
@@ -1,2 +1,3 @@ 
+powerpc/powerpc64-common/power5
 powerpc/powerpc64/power4/fpu
 powerpc/powerpc64/power4
diff --git a/sysdeps/powerpc/powerpc64/power5/fpu/Implies b/sysdeps/powerpc/powerpc64/power5/fpu/Implies
index 6b8c23efa6..2f5e46ea51 100644
--- a/sysdeps/powerpc/powerpc64/power5/fpu/Implies
+++ b/sysdeps/powerpc/powerpc64/power5/fpu/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power5/fpu
 powerpc/powerpc64/power4/fpu/
diff --git a/sysdeps/powerpc/powerpc64/power5/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power5/fpu/multiarch/Implies
index 3740d050a6..f4dc043c40 100644
--- a/sysdeps/powerpc/powerpc64/power5/fpu/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64/power5/fpu/multiarch/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power5/fpu/multiarch
 powerpc/powerpc64/power4/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power5/multiarch/Implies b/sysdeps/powerpc/powerpc64/power5/multiarch/Implies
index 9a3cbb0938..606213da1d 100644
--- a/sysdeps/powerpc/powerpc64/power5/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64/power5/multiarch/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power5/multiarch
 powerpc/powerpc64/power4/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power6/Implies b/sysdeps/powerpc/powerpc64/power6/Implies
index 4c782d4122..a1226e0fe6 100644
--- a/sysdeps/powerpc/powerpc64/power6/Implies
+++ b/sysdeps/powerpc/powerpc64/power6/Implies
@@ -1,2 +1,3 @@ 
+powerpc/powerpc64-common/power6
 powerpc/powerpc64/power5+/fpu
 powerpc/powerpc64/power5+
diff --git a/sysdeps/powerpc/powerpc64/power6/fpu/Implies b/sysdeps/powerpc/powerpc64/power6/fpu/Implies
index f09854edb6..62469539ac 100644
--- a/sysdeps/powerpc/powerpc64/power6/fpu/Implies
+++ b/sysdeps/powerpc/powerpc64/power6/fpu/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power6/fpu
 powerpc/powerpc64/power5+/fpu
diff --git a/sysdeps/powerpc/powerpc64/power6/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power6/fpu/multiarch/Implies
index fca8a4ef0f..89bee4782a 100644
--- a/sysdeps/powerpc/powerpc64/power6/fpu/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64/power6/fpu/multiarch/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power6/fpu/multiarch
 powerpc/powerpc64/power5+/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power6/multiarch/Implies b/sysdeps/powerpc/powerpc64/power6/multiarch/Implies
index 2ebe304fa6..f86445c46b 100644
--- a/sysdeps/powerpc/powerpc64/power6/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64/power6/multiarch/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power6/multiarch
 powerpc/powerpc64/power5+/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power6x/Implies b/sysdeps/powerpc/powerpc64/power6x/Implies
index 9d68f39d22..7478a1184c 100644
--- a/sysdeps/powerpc/powerpc64/power6x/Implies
+++ b/sysdeps/powerpc/powerpc64/power6x/Implies
@@ -1,2 +1,3 @@ 
+powerpc/powerpc64-common/power6x
 powerpc/powerpc64/power6/fpu
 powerpc/powerpc64/power6
diff --git a/sysdeps/powerpc/powerpc64/power6x/fpu/Implies b/sysdeps/powerpc/powerpc64/power6x/fpu/Implies
index 30fa17646e..e858ceb445 100644
--- a/sysdeps/powerpc/powerpc64/power6x/fpu/Implies
+++ b/sysdeps/powerpc/powerpc64/power6x/fpu/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power6x/fpu
 powerpc/powerpc64/power6/fpu
diff --git a/sysdeps/powerpc/powerpc64/power6x/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power6x/fpu/multiarch/Implies
index 410d289a6d..2e6b13e13e 100644
--- a/sysdeps/powerpc/powerpc64/power6x/fpu/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64/power6x/fpu/multiarch/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power6x/fpu/multiarch
 powerpc/powerpc64/power6/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power6x/multiarch/Implies b/sysdeps/powerpc/powerpc64/power6x/multiarch/Implies
index bf5d6171a5..e73bde9f85 100644
--- a/sysdeps/powerpc/powerpc64/power6x/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64/power6x/multiarch/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power6x/multiarch
 powerpc/powerpc64/power6/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power7/Implies b/sysdeps/powerpc/powerpc64/power7/Implies
index 9d68f39d22..c5e7be31a9 100644
--- a/sysdeps/powerpc/powerpc64/power7/Implies
+++ b/sysdeps/powerpc/powerpc64/power7/Implies
@@ -1,2 +1,3 @@ 
+powerpc/powerpc64-common/power7
 powerpc/powerpc64/power6/fpu
 powerpc/powerpc64/power6
diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/Implies b/sysdeps/powerpc/powerpc64/power7/fpu/Implies
index 30fa17646e..28f0217bc0 100644
--- a/sysdeps/powerpc/powerpc64/power7/fpu/Implies
+++ b/sysdeps/powerpc/powerpc64/power7/fpu/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power7/fpu
 powerpc/powerpc64/power6/fpu
diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power7/fpu/multiarch/Implies
index 410d289a6d..b43c91707d 100644
--- a/sysdeps/powerpc/powerpc64/power7/fpu/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64/power7/fpu/multiarch/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power7/fpu/multiarch
 powerpc/powerpc64/power6/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power7/multiarch/Implies b/sysdeps/powerpc/powerpc64/power7/multiarch/Implies
index bf5d6171a5..851cf1d798 100644
--- a/sysdeps/powerpc/powerpc64/power7/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64/power7/multiarch/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power7/multiarch
 powerpc/powerpc64/power6/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power8/Implies b/sysdeps/powerpc/powerpc64/power8/Implies
index 9a5e3c7277..bf3947c1eb 100644
--- a/sysdeps/powerpc/powerpc64/power8/Implies
+++ b/sysdeps/powerpc/powerpc64/power8/Implies
@@ -1,2 +1,3 @@ 
+powerpc/powerpc64-common/power8
 powerpc/powerpc64/power7/fpu
 powerpc/powerpc64/power7
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/Implies b/sysdeps/powerpc/powerpc64/power8/fpu/Implies
index 1187cdfb0a..0f6aae77c3 100644
--- a/sysdeps/powerpc/powerpc64/power8/fpu/Implies
+++ b/sysdeps/powerpc/powerpc64/power8/fpu/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power8/fpu
 powerpc/powerpc64/power7/fpu/
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power8/fpu/multiarch/Implies
index 7fd86fdf87..1613aaa288 100644
--- a/sysdeps/powerpc/powerpc64/power8/fpu/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64/power8/fpu/multiarch/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power8/fpu/multiarch
 powerpc/powerpc64/power7/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power8/multiarch/Implies b/sysdeps/powerpc/powerpc64/power8/multiarch/Implies
index 1fc7b7cd39..4ab5c296fd 100644
--- a/sysdeps/powerpc/powerpc64/power8/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64/power8/multiarch/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power8/multiarch
 powerpc/powerpc64/power7/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power9/Implies b/sysdeps/powerpc/powerpc64/power9/Implies
index fad2505ab9..55ad928c3e 100644
--- a/sysdeps/powerpc/powerpc64/power9/Implies
+++ b/sysdeps/powerpc/powerpc64/power9/Implies
@@ -1,2 +1,3 @@ 
+powerpc/powerpc64-common/power9
 powerpc/powerpc64/power8/fpu
 powerpc/powerpc64/power8
diff --git a/sysdeps/powerpc/powerpc64/power9/fpu/Implies b/sysdeps/powerpc/powerpc64/power9/fpu/Implies
index ae0dbaf857..3b0263d979 100644
--- a/sysdeps/powerpc/powerpc64/power9/fpu/Implies
+++ b/sysdeps/powerpc/powerpc64/power9/fpu/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power9/fpu
 powerpc/powerpc64/power8/fpu
diff --git a/sysdeps/powerpc/powerpc64/power9/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power9/fpu/multiarch/Implies
index f11e1bdba2..20607fcd95 100644
--- a/sysdeps/powerpc/powerpc64/power9/fpu/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64/power9/fpu/multiarch/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power9/fpu/multiarch
 powerpc/powerpc64/power8/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64/power9/multiarch/Implies b/sysdeps/powerpc/powerpc64/power9/multiarch/Implies
index dd6bca4b36..5412683ac6 100644
--- a/sysdeps/powerpc/powerpc64/power9/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64/power9/multiarch/Implies
@@ -1 +1,2 @@ 
+powerpc/powerpc64-common/power9/multiarch
 powerpc/powerpc64/power8/multiarch
diff --git a/sysdeps/powerpc/powerpc64le/Implies b/sysdeps/powerpc/powerpc64le/Implies
index a105a325f7..f8d7ded895 100644
--- a/sysdeps/powerpc/powerpc64le/Implies
+++ b/sysdeps/powerpc/powerpc64le/Implies
@@ -1 +1,2 @@ 
-powerpc/powerpc64
+powerpc/powerpc64-common
+wordsize-64
diff --git a/sysdeps/powerpc/powerpc64le/fpu/Implies b/sysdeps/powerpc/powerpc64le/fpu/Implies
index c1f617b7da..26682593f0 100644
--- a/sysdeps/powerpc/powerpc64le/fpu/Implies
+++ b/sysdeps/powerpc/powerpc64le/fpu/Implies
@@ -1 +1 @@ 
-powerpc/powerpc64/fpu
+powerpc/powerpc64-common/fpu
diff --git a/sysdeps/powerpc/powerpc64le/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64le/fpu/multiarch/Implies
index 8d6531a174..be8c678700 100644
--- a/sysdeps/powerpc/powerpc64le/fpu/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64le/fpu/multiarch/Implies
@@ -1 +1 @@ 
-powerpc/powerpc64/fpu/multiarch
+powerpc/powerpc64-common/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64le/multiarch/Implies b/sysdeps/powerpc/powerpc64le/multiarch/Implies
index 30edcf7f9d..69d9709b4f 100644
--- a/sysdeps/powerpc/powerpc64le/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64le/multiarch/Implies
@@ -1 +1 @@ 
-powerpc/powerpc64/multiarch
+powerpc/powerpc64-common/multiarch
diff --git a/sysdeps/powerpc/powerpc64le/power7/Implies b/sysdeps/powerpc/powerpc64le/power7/Implies
index eedef823d5..8c2733d392 100644
--- a/sysdeps/powerpc/powerpc64le/power7/Implies
+++ b/sysdeps/powerpc/powerpc64le/power7/Implies
@@ -1 +1,12 @@ 
-powerpc/powerpc64/power7
+powerpc/powerpc64-common/power7
+powerpc/powerpc64-common/power6/fpu
+powerpc/powerpc64-common/power6
+powerpc/powerpc64-common/power5+/fpu
+powerpc/powerpc64-common/power5+
+powerpc/power5+/fpu/
+powerpc/power5+/
+powerpc/powerpc64-common/power5/fpu
+powerpc/powerpc64-common/power5
+powerpc/powerpc64-common/power4
+powerpc/power4/fpu
+powerpc/power4
diff --git a/sysdeps/powerpc/powerpc64le/power7/fpu/Implies b/sysdeps/powerpc/powerpc64le/power7/fpu/Implies
index 8447198fbc..4a6491856b 100644
--- a/sysdeps/powerpc/powerpc64le/power7/fpu/Implies
+++ b/sysdeps/powerpc/powerpc64le/power7/fpu/Implies
@@ -1 +1,5 @@ 
-powerpc/powerpc64/power7/fpu
+powerpc/powerpc64-common/power7/fpu
+powerpc/powerpc64-common/power6/fpu
+powerpc/powerpc64-common/power5+/fpu
+powerpc/powerpc64-common/power5/fpu
+powerpc/powerpc64le/fpu
diff --git a/sysdeps/powerpc/powerpc64le/power7/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64le/power7/fpu/multiarch/Implies
index 7fd86fdf87..799ff9d915 100644
--- a/sysdeps/powerpc/powerpc64le/power7/fpu/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64le/power7/fpu/multiarch/Implies
@@ -1 +1 @@ 
-powerpc/powerpc64/power7/fpu/multiarch
+powerpc/powerpc64le/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64le/power7/multiarch/Implies b/sysdeps/powerpc/powerpc64le/power7/multiarch/Implies
index 1fc7b7cd39..4c35fb13a8 100644
--- a/sysdeps/powerpc/powerpc64le/power7/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64le/power7/multiarch/Implies
@@ -1 +1 @@ 
-powerpc/powerpc64/power7/multiarch
+powerpc/powerpc64le/multiarch
diff --git a/sysdeps/powerpc/powerpc64le/power8/Implies b/sysdeps/powerpc/powerpc64le/power8/Implies
index 3c37351dcc..1a39fe41f4 100644
--- a/sysdeps/powerpc/powerpc64le/power8/Implies
+++ b/sysdeps/powerpc/powerpc64le/power8/Implies
@@ -1 +1,3 @@ 
-powerpc/powerpc64/power8
+powerpc/powerpc64-common/power8
+powerpc/powerpc64le/power7/fpu
+powerpc/powerpc64le/power7
diff --git a/sysdeps/powerpc/powerpc64le/power8/fpu/Implies b/sysdeps/powerpc/powerpc64le/power8/fpu/Implies
index ae0dbaf857..44d93aa989 100644
--- a/sysdeps/powerpc/powerpc64le/power8/fpu/Implies
+++ b/sysdeps/powerpc/powerpc64le/power8/fpu/Implies
@@ -1 +1,2 @@ 
-powerpc/powerpc64/power8/fpu
+powerpc/powerpc64-common/power8/fpu
+powerpc/powerpc64le/power7/fpu
diff --git a/sysdeps/powerpc/powerpc64le/power8/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64le/power8/fpu/multiarch/Implies
index f11e1bdba2..70fa49b793 100644
--- a/sysdeps/powerpc/powerpc64le/power8/fpu/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64le/power8/fpu/multiarch/Implies
@@ -1 +1 @@ 
-powerpc/powerpc64/power8/fpu/multiarch
+powerpc/powerpc64le/power7/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64le/power8/multiarch/Implies b/sysdeps/powerpc/powerpc64le/power8/multiarch/Implies
index dd6bca4b36..26b7d90379 100644
--- a/sysdeps/powerpc/powerpc64le/power8/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64le/power8/multiarch/Implies
@@ -1 +1 @@ 
-powerpc/powerpc64/power8/multiarch
+powerpc/powerpc64le/power7/multiarch
diff --git a/sysdeps/powerpc/powerpc64le/power9/Implies b/sysdeps/powerpc/powerpc64le/power9/Implies
index efe5d4193c..ea3759f4b5 100644
--- a/sysdeps/powerpc/powerpc64le/power9/Implies
+++ b/sysdeps/powerpc/powerpc64le/power9/Implies
@@ -1 +1,3 @@ 
-powerpc/powerpc64/power9
+powerpc/powerpc64-common/power9
+powerpc/powerpc64le/power8/fpu
+powerpc/powerpc64le/power8
diff --git a/sysdeps/powerpc/powerpc64le/power9/fpu/Implies b/sysdeps/powerpc/powerpc64le/power9/fpu/Implies
index 3633114b47..13ab5b064d 100644
--- a/sysdeps/powerpc/powerpc64le/power9/fpu/Implies
+++ b/sysdeps/powerpc/powerpc64le/power9/fpu/Implies
@@ -1 +1 @@ 
-powerpc/powerpc64/power9/fpu/
+powerpc/powerpc64le/power8/fpu
diff --git a/sysdeps/powerpc/powerpc64le/power9/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64le/power9/fpu/multiarch/Implies
index 105948092d..0058e700a1 100644
--- a/sysdeps/powerpc/powerpc64le/power9/fpu/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64le/power9/fpu/multiarch/Implies
@@ -1 +1 @@ 
-powerpc/powerpc64/power9/fpu/multiarch
+powerpc/powerpc64le/power8/fpu/multiarch
diff --git a/sysdeps/powerpc/powerpc64le/power9/multiarch/Implies b/sysdeps/powerpc/powerpc64le/power9/multiarch/Implies
index 02be30cfd0..65af1352f4 100644
--- a/sysdeps/powerpc/powerpc64le/power9/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc64le/power9/multiarch/Implies
@@ -1 +1 @@ 
-powerpc/powerpc64/power9/multiarch
+powerpc/powerpc64le/power8/multiarch
diff --git a/sysdeps/unix/powerpc/sysdep.h b/sysdeps/unix/powerpc/sysdep.h
index 284062e956..8fed95dd2d 100644
--- a/sysdeps/unix/powerpc/sysdep.h
+++ b/sysdeps/unix/powerpc/sysdep.h
@@ -18,7 +18,7 @@ 
 #include <sysdeps/unix/sysdep.h>
 #include <bits/wordsize.h>
 #if __WORDSIZE == 64
-#include <sysdeps/powerpc/powerpc64/sysdep.h>
+#include <sysdeps/powerpc/powerpc64-common/sysdep.h>
 #else
 #include <sysdeps/powerpc/powerpc32/sysdep.h>
 #endif