Mercurial > hg > openjdk > jdk9
changeset 2295:f5994f5d5041
8166800: [s390] Top-level build changes required for Linux/s390x
Reviewed-by: erikj
author | simonis |
---|---|
date | Thu, 06 Oct 2016 13:41:43 +0200 |
parents | c623a5f16cf0 |
children | 9c672c28d79e |
files | common/autoconf/flags.m4 common/autoconf/generated-configure.sh |
diffstat | 2 files changed, 25 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/flags.m4 Fri Sep 30 02:52:36 2016 -0700 +++ b/common/autoconf/flags.m4 Thu Oct 06 13:41:43 2016 +0200 @@ -759,6 +759,10 @@ # on ppc we don't prevent gcc to omit frame pointer but do prevent strict aliasing $2CFLAGS_JDK="${$2CFLAGS_JDK} -fno-strict-aliasing" ;; + s390 ) + $2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK -fno-omit-frame-pointer -mbackchain -march=z10" + $2CFLAGS_JDK="${$2CFLAGS_JDK} -fno-strict-aliasing" + ;; * ) $2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK -fno-omit-frame-pointer" $2CFLAGS_JDK="${$2CFLAGS_JDK} -fno-strict-aliasing" @@ -940,6 +944,10 @@ # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI. $2JVM_CFLAGS="[$]$2JVM_CFLAGS -mcpu=power7 -mtune=power8" fi + elif test "x$OPENJDK_$1_CPU" = xs390x; then + if test "x$OPENJDK_$1_OS" = xlinux; then + $2JVM_CFLAGS="[$]$2JVM_CFLAGS -mbackchain -march=z10" + fi fi if test "x$OPENJDK_$1_CPU_ENDIAN" = xlittle; then
--- a/common/autoconf/generated-configure.sh Fri Sep 30 02:52:36 2016 -0700 +++ b/common/autoconf/generated-configure.sh Thu Oct 06 13:41:43 2016 +0200 @@ -5092,7 +5092,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1474894604 +DATE_WHEN_GENERATED=1475753998 ############################################################################### # @@ -49835,6 +49835,10 @@ # on ppc we don't prevent gcc to omit frame pointer but do prevent strict aliasing CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing" ;; + s390 ) + COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -fno-omit-frame-pointer -mbackchain -march=z10" + CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing" + ;; * ) COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -fno-omit-frame-pointer" CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing" @@ -50117,6 +50121,10 @@ # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI. JVM_CFLAGS="$JVM_CFLAGS -mcpu=power7 -mtune=power8" fi + elif test "x$OPENJDK_TARGET_CPU" = xs390x; then + if test "x$OPENJDK_TARGET_OS" = xlinux; then + JVM_CFLAGS="$JVM_CFLAGS -mbackchain -march=z10" + fi fi if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then @@ -50650,6 +50658,10 @@ # on ppc we don't prevent gcc to omit frame pointer but do prevent strict aliasing OPENJDK_BUILD_CFLAGS_JDK="${OPENJDK_BUILD_CFLAGS_JDK} -fno-strict-aliasing" ;; + s390 ) + OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK="$OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK -fno-omit-frame-pointer -mbackchain -march=z10" + OPENJDK_BUILD_CFLAGS_JDK="${OPENJDK_BUILD_CFLAGS_JDK} -fno-strict-aliasing" + ;; * ) OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK="$OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK -fno-omit-frame-pointer" OPENJDK_BUILD_CFLAGS_JDK="${OPENJDK_BUILD_CFLAGS_JDK} -fno-strict-aliasing" @@ -50932,6 +50944,10 @@ # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI. OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -mcpu=power7 -mtune=power8" fi + elif test "x$OPENJDK_BUILD_CPU" = xs390x; then + if test "x$OPENJDK_BUILD_OS" = xlinux; then + OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -mbackchain -march=z10" + fi fi if test "x$OPENJDK_BUILD_CPU_ENDIAN" = xlittle; then