changeset 2378:655c0aad16db

8167584: aarch32: use "arm" for os.arch system property Reviewed-by: enevill Contributed-by: akashche@redhat.com
author enevill
date Wed, 12 Oct 2016 19:56:35 +0100
parents ff89301f2430
children c2524804b4a7
files common/autoconf/generated-configure.sh common/autoconf/platform.m4
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Sun Sep 04 20:31:16 2016 +0100
+++ b/common/autoconf/generated-configure.sh	Wed Oct 12 19:56:35 2016 +0100
@@ -3880,7 +3880,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1449096260
+DATE_WHEN_GENERATED=1476265373
 
 ###############################################################################
 #
@@ -7181,6 +7181,8 @@
   elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
     # On all platforms except macosx, we replace x86_64 with amd64.
     OPENJDK_TARGET_CPU_OSARCH="amd64"
+  elif test "x$OPENJDK_TARGET_CPU" = xaarch32; then
+    OPENJDK_TARGET_CPU_OSARCH="arm"
   fi
 
 
--- a/common/autoconf/platform.m4	Sun Sep 04 20:31:16 2016 +0100
+++ b/common/autoconf/platform.m4	Wed Oct 12 19:56:35 2016 +0100
@@ -320,6 +320,8 @@
   elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
     # On all platforms except macosx, we replace x86_64 with amd64.
     OPENJDK_TARGET_CPU_OSARCH="amd64"
+  elif test "x$OPENJDK_TARGET_CPU" = xaarch32; then
+    OPENJDK_TARGET_CPU_OSARCH="arm"
   fi
   AC_SUBST(OPENJDK_TARGET_CPU_OSARCH)