changeset 2789:17bad9cf419f

PR2394: ppc64le does not support -Xshare:dump 2015-06-03 Andrew John Hughes <gnu.andrew@member.fsf.org> PR2394: ppc64le does not support -Xshare:dump * Makefile.am: (add-archive): Exclude ppc64le as well as ppc64. (add-archive-debug): Likewise. (add-archive-boot): Likewise. * NEWS: Updated.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Wed, 03 Jun 2015 04:08:44 +0100
parents 033e62e28bfb
children 31436744587b
files ChangeLog Makefile.am NEWS
diffstat 3 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Apr 24 20:39:36 2015 +0100
+++ b/ChangeLog	Wed Jun 03 04:08:44 2015 +0100
@@ -1,3 +1,12 @@
+2015-06-03  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR2394: ppc64le does not support -Xshare:dump
+	* Makefile.am:
+	(add-archive): Exclude ppc64le as well as ppc64.
+	(add-archive-debug): Likewise.
+	(add-archive-boot): Likewise.
+	* NEWS: Updated.
+
 2015-04-24  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	Update build following PR2233 & PR2236.
--- a/Makefile.am	Fri Apr 24 20:39:36 2015 +0100
+++ b/Makefile.am	Wed Jun 03 04:08:44 2015 +0100
@@ -1796,7 +1796,7 @@
 if !ENABLE_CACAO
 if !ZERO_BUILD
 	if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
-	  if test "x$(INSTALL_ARCH_DIR)" != "xppc64"; then \
+	  if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \
 	    $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
 	  fi ; \
 	fi
@@ -1903,7 +1903,7 @@
 if !ENABLE_CACAO
 if !ZERO_BUILD
 	if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
-	  if test "x$(INSTALL_ARCH_DIR)" != "xppc64"; then \
+	  if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \
 	    $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
 	  fi ; \
 	fi
@@ -2017,7 +2017,7 @@
 if !ENABLE_CACAO
 if !ZERO_BUILD
 	if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
-	  if test "x$(INSTALL_ARCH_DIR)" != "xppc64"; then \
+	  if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \
 	    $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
 	  fi ; \
 	fi
--- a/NEWS	Fri Apr 24 20:39:36 2015 +0100
+++ b/NEWS	Wed Jun 03 04:08:44 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
+  - PR2394: ppc64le does not support -Xshare:dump
 
 New in release 2.5.5 (2015-04-14):