/hg/icedtea7: PR2684: AArch64 port not selected on architectures...

[andrew at icedtea.classpath.org]

changeset ac0e7ec6e958 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=ac0e7ec6e958
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Jan 06 05:23:06 2016 +0000

	PR2684: AArch64 port not selected on architectures where host_cpu != aarch64

	2016-01-06  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR2684: AArch64 port not selected on architectures
		where host_cpu != aarch64
		* acinclude.m4:
		(IT_HAS_NATIVE_HOTSPOT_PORT): Depend on
		IT_SET_ARCH_SETTINGS and use values of
		INSTALL_ARCH_DIR to determine port availability
		rather than host_cpu.


diffstat:

 ChangeLog    |  10 ++++++++++
 acinclude.m4 |  13 +++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r d44ea9fb2df8 -r ac0e7ec6e958 ChangeLog
--- a/ChangeLog	Tue Jan 05 21:16:49 2016 +0000
+++ b/ChangeLog	Wed Jan 06 05:23:06 2016 +0000
@@ -1,3 +1,13 @@
+2016-01-06  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR2684: AArch64 port not selected on architectures
+	where host_cpu != aarch64
+	* acinclude.m4:
+	(IT_HAS_NATIVE_HOTSPOT_PORT): Depend on
+	IT_SET_ARCH_SETTINGS and use values of
+	INSTALL_ARCH_DIR to determine port availability
+	rather than host_cpu.
+
 2015-10-15  Stefan Ring <stefan at complang.tuwien.ac.at>
 
 	PR2652: CACAO fails as a build VM for icedtea
diff -r d44ea9fb2df8 -r ac0e7ec6e958 acinclude.m4
--- a/acinclude.m4	Tue Jan 05 21:16:49 2016 +0000
+++ b/acinclude.m4	Wed Jan 06 05:23:06 2016 +0000
@@ -2832,16 +2832,17 @@
 
 AC_DEFUN_ONCE([IT_HAS_NATIVE_HOTSPOT_PORT],
 [
+  AC_REQUIRE([IT_SET_ARCH_SETTINGS])
   AC_MSG_CHECKING([if a native HotSpot port is available for this architecture])
   has_native_hotspot_port=yes;
-  case "${host_cpu}" in
+  case "${INSTALL_ARCH_DIR}" in
     aarch64) ;;
-    arm64) ;;
-    i?86) ;;
+    amd64) ;;
+    i386) ;;
+    ppc64) ;;
+    ppc64le) ;;
     sparc) ;;
-    x86_64) ;;
-    powerpc64) ;;
-    powerpc64le) ;;
+    sparcv9) ;;
     *) has_native_hotspot_port=no;
   esac
   AC_MSG_RESULT([$has_native_hotspot_port])