about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>2016-09-16 17:31:58 -0300
committerTulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>2016-09-19 12:13:10 -0300
commit79312adef2645f9051b251c56b0e45f6c4d38058 (patch)
treee2b669a6f9341dab64d84fb1e28fdedfebd45e09
parent2eda04ec6f55d2a622481aeb51e4c42cf1607995 (diff)
downloadglibc-79312adef2645f9051b251c56b0e45f6c4d38058.tar.gz
glibc-79312adef2645f9051b251c56b0e45f6c4d38058.tar.xz
glibc-79312adef2645f9051b251c56b0e45f6c4d38058.zip
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)
-rw-r--r--ChangeLog8
-rw-r--r--sysdeps/powerpc/powerpc32/power9/multiarch/Implies2
-rw-r--r--sysdeps/powerpc/powerpc64/power9/fpu/Implies1
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a685e2a182..2aa6e3c567 100644
--- 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-08-17  Florian Weimer  <fweimer@redhat.com>
 
 	Reduce time to expected nptl/tst-once5 failure.
diff --git a/sysdeps/powerpc/powerpc32/power9/multiarch/Implies b/sysdeps/powerpc/powerpc32/power9/multiarch/Implies
index 4393b56872..1a46ef0035 100644
--- 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 fad2505ab9..ae0dbaf857 100644
--- a/sysdeps/powerpc/powerpc64/power9/fpu/Implies
+++ b/sysdeps/powerpc/powerpc64/power9/fpu/Implies
@@ -1,2 +1 @@
 powerpc/powerpc64/power8/fpu
-powerpc/powerpc64/power8