aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoromajid <none@none>2013-09-11 12:08:34 -0400
committeromajid <none@none>2013-09-11 12:08:34 -0400
commit4e73b17d90a5ed5ce601ae3c13745b27353aa74c (patch)
tree4133a7051b1720f0c0fd883cbf0b6f6e95bd4a18
parent16651589f506b99ddb2ff66f4adbf15a45ec1647 (diff)
8024320: Add s390(x) detection to platform.m4jdk8-b107
Reviewed-by: erikj, ihse, dsamersoff
-rw-r--r--common/autoconf/generated-configure.sh26
-rw-r--r--common/autoconf/platform.m412
2 files changed, 37 insertions, 1 deletions
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 63e9354..7679cc5 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -3818,7 +3818,7 @@ fi
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1377850299
+DATE_WHEN_GENERATED=1378914658
###############################################################################
#
@@ -6775,6 +6775,18 @@ test -n "$target_alias" &&
VAR_CPU_BITS=64
VAR_CPU_ENDIAN=big
;;
+ s390)
+ VAR_CPU=s390
+ VAR_CPU_ARCH=s390
+ VAR_CPU_BITS=32
+ VAR_CPU_ENDIAN=big
+ ;;
+ s390x)
+ VAR_CPU=s390x
+ VAR_CPU_ARCH=s390
+ VAR_CPU_BITS=64
+ VAR_CPU_ENDIAN=big
+ ;;
sparc)
VAR_CPU=sparc
VAR_CPU_ARCH=sparc
@@ -6883,6 +6895,18 @@ $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&6; }
VAR_CPU_BITS=64
VAR_CPU_ENDIAN=big
;;
+ s390)
+ VAR_CPU=s390
+ VAR_CPU_ARCH=s390
+ VAR_CPU_BITS=32
+ VAR_CPU_ENDIAN=big
+ ;;
+ s390x)
+ VAR_CPU=s390x
+ VAR_CPU_ARCH=s390
+ VAR_CPU_BITS=64
+ VAR_CPU_ENDIAN=big
+ ;;
sparc)
VAR_CPU=sparc
VAR_CPU_ARCH=sparc
diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4
index ed2581c..71ae2ce 100644
--- a/common/autoconf/platform.m4
+++ b/common/autoconf/platform.m4
@@ -60,6 +60,18 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU],
VAR_CPU_BITS=64
VAR_CPU_ENDIAN=big
;;
+ s390)
+ VAR_CPU=s390
+ VAR_CPU_ARCH=s390
+ VAR_CPU_BITS=32
+ VAR_CPU_ENDIAN=big
+ ;;
+ s390x)
+ VAR_CPU=s390x
+ VAR_CPU_ARCH=s390
+ VAR_CPU_BITS=64
+ VAR_CPU_ENDIAN=big
+ ;;
sparc)
VAR_CPU=sparc
VAR_CPU_ARCH=sparc