powerpc: Fix POWER9 implies

Fix multiarch build for POWER9 by correcting the order of the
directories listed at sysnames configure variable.

(cherry picked from commit 1850ce5a2ea3b908b26165e7e951cd4334129f07)

diff --git a/ChangeLog b/ChangeLog
index 7521d86e7cc5584daa4aad054c6ec5338ca8247e..0b440d9d33291f6080390866f1556147d41c2b94 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2016-09-19  Tulio Magno Quites Machado Filho  <tuliom@linux.vnet.ibm.com>
+
+       [BZ #20615]
+       * sysdeps/powerpc/powerpc32/power9/multiarch/Implies: Replace
+       fpu directory by non-fpu.
+       * sysdeps/powerpc/powerpc64/power9/fpu/Implies: Remove dependency
+       on non-fpu directory from a fpu directory.
+
 2016-09-02  Roland McGrath  <roland@hack.frob.com>
 
        * sysdeps/arm/nacl/libc.abilist: Add GLIBC_2.24 A.

diff --git a/sysdeps/powerpc/powerpc32/power9/multiarch/Implies b/sysdeps/powerpc/powerpc32/power9/multiarch/Implies
index 4393b5687264d644066c53decfbe2f20c1c96611..1a46ef003586eddea6f0acaa87a507dd902c4973 100644 (file)
--- a/sysdeps/powerpc/powerpc32/power9/multiarch/Implies
+++ b/sysdeps/powerpc/powerpc32/power9/multiarch/Implies
@@ -1 +1 @@
-powerpc/powerpc32/power8/fpu/multiarch
+powerpc/powerpc32/power8/multiarch

diff --git a/sysdeps/powerpc/powerpc64/power9/fpu/Implies b/sysdeps/powerpc/powerpc64/power9/fpu/Implies
index fad2505ab9489da02ea9dba5d944718d02aeed22..ae0dbaf857bb6d983a728a0df320c429428c978b 100644 (file)
--- a/sysdeps/powerpc/powerpc64/power9/fpu/Implies
+++ b/sysdeps/powerpc/powerpc64/power9/fpu/Implies
@@ -1,2 +1 @@
 powerpc/powerpc64/power8/fpu
-powerpc/powerpc64/power8