changeset 2790:31436744587b

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.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Wed, 03 Jun 2015 04:22:39 +0100
parents 17bad9cf419f
children d20e49a7dbc8
files ChangeLog Makefile.am NEWS
diffstat 3 files changed, 16 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jun 03 04:08:44 2015 +0100
+++ b/ChangeLog	Wed Jun 03 04:22:39 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-06-03  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR2394: ppc64le does not support -Xshare:dump
--- a/Makefile.am	Wed Jun 03 04:08:44 2015 +0100
+++ b/Makefile.am	Wed Jun 03 04:22:39 2015 +0100
@@ -1624,10 +1624,13 @@
 	else \
 	  ln -sfv $(STAGE1_BOOT_RUNTIME) $(STAGE1_BOOT_DIR)/lib/tools.jar ; \
 	fi
-# Workaround some older ppc64le builds installing to 'ppc64' rather than 'ppc64le'
+# Workaround some older ppc64le builds installing to 'ppc64' or 'ppc64el' rather than 'ppc64le'
 	if test -d $(SYSTEM_JDK_DIR)/jre/lib/ppc64 ; then \
 	  ln -sfv $(SYSTEM_JDK_DIR)/jre/lib/ppc64 \
 	    $(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/ ; \
--- a/NEWS	Wed Jun 03 04:08:44 2015 +0100
+++ b/NEWS	Wed Jun 03 04:22:39 2015 +0100
@@ -276,6 +276,7 @@
   - PR2144: make dist fails due to lack of HotSpot-specific patches
   - PR2233, RH1190835: Discover gsettings symbols separately so early versions of GLib can be used (e.g. on RHEL 6)
   - PR2236: ppc64le should report its os.arch as ppc64le so tools can detect it
+  - PR2328: GCJ uses ppc64el named libarch directory on ppc64le
   - PR2394: ppc64le does not support -Xshare:dump
 
 New in release 2.5.5 (2015-04-14):