changeset 46931:6e1b59330482

8186433: Compiler flag -arch=sparc should not be passed on linux-sparc Reviewed-by: erikj
author glaubitz
date Mon, 21 Aug 2017 15:17:21 +0200
parents f7daf2e39cc8
children a4fa3280b8df
files common/autoconf/flags.m4 common/autoconf/generated-configure.sh
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/flags.m4	Mon Aug 21 12:08:03 2017 -0400
+++ b/common/autoconf/flags.m4	Mon Aug 21 15:17:21 2017 +0200
@@ -1046,7 +1046,7 @@
   # Set some additional per-CPU defines.
   if test "x$OPENJDK_$1_OS-$OPENJDK_$1_CPU" = xwindows-x86; then
     $2JVM_CFLAGS="[$]$2JVM_CFLAGS -arch:IA32"
-  elif test "x$OPENJDK_$1_CPU" = xsparcv9; then
+  elif test "x$OPENJDK_$1_OS-$OPENJDK_$1_CPU" = xsolaris-sparcv9; then
     $2JVM_CFLAGS="[$]$2JVM_CFLAGS -xarch=sparc"
   elif test "x$OPENJDK_$1_CPU" = xppc64; then
     if test "x$OPENJDK_$1_OS" = xlinux; then
--- a/common/autoconf/generated-configure.sh	Mon Aug 21 12:08:03 2017 -0400
+++ b/common/autoconf/generated-configure.sh	Mon Aug 21 15:17:21 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=1503331667
+DATE_WHEN_GENERATED=1503331668
 
 ###############################################################################
 #
@@ -51563,7 +51563,7 @@
   # Set some additional per-CPU defines.
   if test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = xwindows-x86; then
     JVM_CFLAGS="$JVM_CFLAGS -arch:IA32"
-  elif test "x$OPENJDK_TARGET_CPU" = xsparcv9; then
+  elif test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = xsolaris-sparcv9; then
     JVM_CFLAGS="$JVM_CFLAGS -xarch=sparc"
   elif test "x$OPENJDK_TARGET_CPU" = xppc64; then
     if test "x$OPENJDK_TARGET_OS" = xlinux; then
@@ -52442,7 +52442,7 @@
   # Set some additional per-CPU defines.
   if test "x$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" = xwindows-x86; then
     OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -arch:IA32"
-  elif test "x$OPENJDK_BUILD_CPU" = xsparcv9; then
+  elif test "x$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" = xsolaris-sparcv9; then
     OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -xarch=sparc"
   elif test "x$OPENJDK_BUILD_CPU" = xppc64; then
     if test "x$OPENJDK_BUILD_OS" = xlinux; then