# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1436222643 -3600
# Node ID 30fbdb330c853feb216eb0868c88de6cff7b7d2d
# Parent  4e4ff14ad549e37fd3f53cb7874eee84a3736ac6
PR2328: GCJ uses ppc64el named libarch directory on ppc64le

2015-06-03  Andrew John Hughes  <gnu.andrew@member.fsf.org>

	* NEWS: Updated.

2015-05-01  Tiago Sturmer Daitx  <tdaitx@linux.vnet.ibm.com>

	PR2328: GCJ uses ppc64el named libarch directory on ppc64le
	* Makefile.am:
	(bootstrap-directory-stage1): Handle boot JDK having
	a ppc64el directory by symlinking to ppc64le.

diff -r 4e4ff14ad549 -r 30fbdb330c85 ChangeLog
--- a/ChangeLog	Mon Jul 06 11:57:53 2015 +0100
+++ b/ChangeLog	Mon Jul 06 23:44:03 2015 +0100
@@ -1,3 +1,14 @@
+2015-06-03  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* NEWS: Updated.
+
+2015-05-01  Tiago Sturmer Daitx  <tdaitx@linux.vnet.ibm.com>
+
+	PR2328: GCJ uses ppc64el named libarch directory on ppc64le
+	* Makefile.am:
+	(bootstrap-directory-stage1): Handle boot JDK having
+	a ppc64el directory by symlinking to ppc64le.
+
 2015-07-03  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	* Makefile.am:
diff -r 4e4ff14ad549 -r 30fbdb330c85 Makefile.am
--- a/Makefile.am	Mon Jul 06 11:57:53 2015 +0100
+++ b/Makefile.am	Mon Jul 06 23:44:03 2015 +0100
@@ -1623,10 +1623,13 @@
 	else \
 	  ln -sfv $(STAGE1_BOOT_RUNTIME) $(STAGE1_BOOT_DIR)/lib/tools.jar ; \
 	fi
-# Workaround some older ppc64le builds installing to 'ppc64le' rather than 'ppc64'
+# Workaround some older ppc64le builds installing to 'ppc64le' or 'ppc64el' rather than 'ppc64'
 	if test -d $(SYSTEM_JDK_DIR)/jre/lib/ppc64le ; then \
 	  ln -sfv $(SYSTEM_JDK_DIR)/jre/lib/ppc64le \
 	    $(STAGE1_BOOT_DIR)/jre/lib/$(JRE_ARCH_DIR) ; \
+	elif test -d $(SYSTEM_JDK_DIR)/jre/lib/ppc64el ; then \
+	  ln -sfv $(SYSTEM_JDK_DIR)/jre/lib/ppc64el \
+	    $(STAGE1_BOOT_DIR)/jre/lib/$(JRE_ARCH_DIR) ; \
 	else \
 	  ln -sfv $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \
 	    $(STAGE1_BOOT_DIR)/jre/lib/ ; \
diff -r 4e4ff14ad549 -r 30fbdb330c85 NEWS
--- a/NEWS	Mon Jul 06 11:57:53 2015 +0100
+++ b/NEWS	Mon Jul 06 23:44:03 2015 +0100
@@ -25,6 +25,8 @@
   - S8072385, PR2387: Only the first DNSName entry is checked for endpoint identification
   - S8078654, PR2333: CloseTTFontFileFunc callback should be removed
   - S8078666, PR2326: JVM fastdebug build compiled with GCC 5 asserts with "widen increases"
+* Bug fixes
+  - PR2328: GCJ uses ppc64el named libarch directory on ppc64le
 * PPC & AIX port
   - S8069590: AIX port of "8050807: Better performing performance data handling"
   - S8078482, PR2307: ppc: pass thread to throw_AbstractMethodError