changeset 2801:30a5133acb6b

8186786: Name collisions with autoconf definitions on alpha and sh Reviewed-by: ihse, dholmes
author glaubitz
date Thu, 31 Aug 2017 15:47:12 +0200
parents e747df9efa1e
children 8625e8491887
files common/autoconf/generated-configure.sh common/autoconf/platform.m4
diffstat 2 files changed, 19 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Tue Aug 29 17:17:57 2017 +0200
+++ b/common/autoconf/generated-configure.sh	Thu Aug 31 15:47:12 2017 +0200
@@ -5151,7 +5151,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1504019871
+DATE_WHEN_GENERATED=1504187184
 
 ###############################################################################
 #
@@ -16141,6 +16141,12 @@
   elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
     # On all platforms except MacOSX replace x86_64 with amd64.
     OPENJDK_TARGET_CPU_LEGACY="amd64"
+  elif test "x$OPENJDK_TARGET_CPU" = xalpha; then
+    # Avoid name collisions with variables named alpha
+    OPENJDK_TARGET_CPU_LEGACY="_alpha_"
+  elif test "x$OPENJDK_TARGET_CPU" = xsh; then
+    # Avoid name collisions with variables named sh
+    OPENJDK_TARGET_CPU_LEGACY="_sh_"
   fi
 
 
@@ -16293,6 +16299,12 @@
   elif test "x$OPENJDK_BUILD_OS" != xmacosx && test "x$OPENJDK_BUILD_CPU" = xx86_64; then
     # On all platforms except MacOSX replace x86_64 with amd64.
     OPENJDK_BUILD_CPU_LEGACY="amd64"
+  elif test "x$OPENJDK_BUILD_CPU" = xalpha; then
+    # Avoid name collisions with variables named alpha
+    OPENJDK_BUILD_CPU_LEGACY="_alpha_"
+  elif test "x$OPENJDK_BUILD_CPU" = xsh; then
+    # Avoid name collisions with variables named sh
+    OPENJDK_BUILD_CPU_LEGACY="_sh_"
   fi
 
 
--- a/common/autoconf/platform.m4	Tue Aug 29 17:17:57 2017 +0200
+++ b/common/autoconf/platform.m4	Thu Aug 31 15:47:12 2017 +0200
@@ -337,6 +337,12 @@
   elif test "x$OPENJDK_$1_OS" != xmacosx && test "x$OPENJDK_$1_CPU" = xx86_64; then
     # On all platforms except MacOSX replace x86_64 with amd64.
     OPENJDK_$1_CPU_LEGACY="amd64"
+  elif test "x$OPENJDK_$1_CPU" = xalpha; then
+    # Avoid name collisions with variables named alpha
+    OPENJDK_$1_CPU_LEGACY="_alpha_"
+  elif test "x$OPENJDK_$1_CPU" = xsh; then
+    # Avoid name collisions with variables named sh
+    OPENJDK_$1_CPU_LEGACY="_sh_"
   fi
   AC_SUBST(OPENJDK_$1_CPU_LEGACY)