stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8154087: Fix AIX and Linux/ppc64le after the integration of the new hotspot build

Browse Source 
Reviewed-by: erikj, goetz
This commit is contained in:
Volker Simonis 2016-04-13 11:13:14 +02:00
parent 925d56e6f9
commit bf3b2fe360
3 changed files with 52 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
common/autoconf/flags.m4
View File

@ -929,20 +929,21 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER],
elif test "x$OPENJDK_$1_CPU" = xppc64; then elif test "x$OPENJDK_$1_CPU" = xppc64; then
if test "x$OPENJDK_$1_OS" = xlinux; then if test "x$OPENJDK_$1_OS" = xlinux; then
$2JVM_CFLAGS="[$]$2JVM_CFLAGS -minsert-sched-nops=regroup_exact -mno-multiple -mno-string" $2JVM_CFLAGS="[$]$2JVM_CFLAGS -minsert-sched-nops=regroup_exact -mno-multiple -mno-string"
if test "x$OPENJDK_$1_CPU_ENDIAN" = xbig; then # fixes `relocation truncated to fit' error for gcc 4.1.
# fixes `relocation truncated to fit' error for gcc 4.1. $2JVM_CFLAGS="[$]$2JVM_CFLAGS -mminimal-toc"
$2JVM_CFLAGS="[$]$2JVM_CFLAGS -mminimal-toc" # Use ppc64 instructions, but schedule for power5
# Use ppc64 instructions, but schedule for power5 $2JVM_CFLAGS="[$]$2JVM_CFLAGS -mcpu=powerpc64 -mtune=power5"
$2JVM_CFLAGS="[$]$2JVM_CFLAGS -mcpu=powerpc64 -mtune=power5"
else
# Little endian machine uses ELFv2 ABI.
$2JVM_CFLAGS="[$]$2JVM_CFLAGS -DABI_ELFv2"
# 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_OS" = xaix; then elif test "x$OPENJDK_$1_OS" = xaix; then
$2JVM_CFLAGS="[$]$2JVM_CFLAGS -qarch=ppc64" $2JVM_CFLAGS="[$]$2JVM_CFLAGS -qarch=ppc64"
fi fi
elif test "x$OPENJDK_$1_CPU" = xppc64le; then
if test "x$OPENJDK_$1_OS" = xlinux; then
$2JVM_CFLAGS="[$]$2JVM_CFLAGS -minsert-sched-nops=regroup_exact -mno-multiple -mno-string"
# Little endian machine uses ELFv2 ABI.
$2JVM_CFLAGS="[$]$2JVM_CFLAGS -DABI_ELFv2"
# Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
$2JVM_CFLAGS="[$]$2JVM_CFLAGS -mcpu=power7 -mtune=power8"
fi
fi fi
if test "x$OPENJDK_$1_CPU_ENDIAN" = xlittle; then if test "x$OPENJDK_$1_CPU_ENDIAN" = xlittle; then

60
common/autoconf/generated-configure.sh
View File

@ -5056,7 +5056,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1460103573 DATE_WHEN_GENERATED=1460538705
############################################################################### ###############################################################################
# #
@ -15448,6 +15448,8 @@ $as_echo "$COMPILE_TYPE" >&6; }
HOTSPOT_TARGET_CPU=sparc HOTSPOT_TARGET_CPU=sparc
elif test "x$OPENJDK_TARGET_CPU" = xppc64; then elif test "x$OPENJDK_TARGET_CPU" = xppc64; then
HOTSPOT_TARGET_CPU=ppc_64 HOTSPOT_TARGET_CPU=ppc_64
elif test "x$OPENJDK_TARGET_CPU" = xppc64le; then
HOTSPOT_TARGET_CPU=ppc_64
fi fi
@ -15466,6 +15468,8 @@ $as_echo "$COMPILE_TYPE" >&6; }
HOTSPOT_TARGET_CPU_DEFINE=AARCH64 HOTSPOT_TARGET_CPU_DEFINE=AARCH64
elif test "x$OPENJDK_TARGET_CPU" = xppc64; then elif test "x$OPENJDK_TARGET_CPU" = xppc64; then
HOTSPOT_TARGET_CPU_DEFINE=PPC64 HOTSPOT_TARGET_CPU_DEFINE=PPC64
elif test "x$OPENJDK_TARGET_CPU" = xppc64le; then
HOTSPOT_TARGET_CPU_DEFINE=PPC64
# The cpu defines below are for zero, we don't support them directly. # The cpu defines below are for zero, we don't support them directly.
elif test "x$OPENJDK_TARGET_CPU" = xsparc; then elif test "x$OPENJDK_TARGET_CPU" = xsparc; then
@ -15600,6 +15604,8 @@ $as_echo "$COMPILE_TYPE" >&6; }
HOTSPOT_BUILD_CPU=sparc HOTSPOT_BUILD_CPU=sparc
elif test "x$OPENJDK_BUILD_CPU" = xppc64; then elif test "x$OPENJDK_BUILD_CPU" = xppc64; then
HOTSPOT_BUILD_CPU=ppc_64 HOTSPOT_BUILD_CPU=ppc_64
elif test "x$OPENJDK_BUILD_CPU" = xppc64le; then
HOTSPOT_BUILD_CPU=ppc_64
fi fi
@ -15618,6 +15624,8 @@ $as_echo "$COMPILE_TYPE" >&6; }
HOTSPOT_BUILD_CPU_DEFINE=AARCH64 HOTSPOT_BUILD_CPU_DEFINE=AARCH64
elif test "x$OPENJDK_BUILD_CPU" = xppc64; then elif test "x$OPENJDK_BUILD_CPU" = xppc64; then
HOTSPOT_BUILD_CPU_DEFINE=PPC64 HOTSPOT_BUILD_CPU_DEFINE=PPC64
elif test "x$OPENJDK_BUILD_CPU" = xppc64le; then
HOTSPOT_BUILD_CPU_DEFINE=PPC64
# The cpu defines below are for zero, we don't support them directly. # The cpu defines below are for zero, we don't support them directly.
elif test "x$OPENJDK_BUILD_CPU" = xsparc; then elif test "x$OPENJDK_BUILD_CPU" = xsparc; then
@ -49834,20 +49842,21 @@ $as_echo "$supports" >&6; }
elif test "x$OPENJDK_TARGET_CPU" = xppc64; then elif test "x$OPENJDK_TARGET_CPU" = xppc64; then
if test "x$OPENJDK_TARGET_OS" = xlinux; then if test "x$OPENJDK_TARGET_OS" = xlinux; then
JVM_CFLAGS="$JVM_CFLAGS -minsert-sched-nops=regroup_exact -mno-multiple -mno-string" JVM_CFLAGS="$JVM_CFLAGS -minsert-sched-nops=regroup_exact -mno-multiple -mno-string"
if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xbig; then # fixes `relocation truncated to fit' error for gcc 4.1.
# fixes `relocation truncated to fit' error for gcc 4.1. JVM_CFLAGS="$JVM_CFLAGS -mminimal-toc"
JVM_CFLAGS="$JVM_CFLAGS -mminimal-toc" # Use ppc64 instructions, but schedule for power5
# Use ppc64 instructions, but schedule for power5 JVM_CFLAGS="$JVM_CFLAGS -mcpu=powerpc64 -mtune=power5"
JVM_CFLAGS="$JVM_CFLAGS -mcpu=powerpc64 -mtune=power5"
else
# Little endian machine uses ELFv2 ABI.
JVM_CFLAGS="$JVM_CFLAGS -DABI_ELFv2"
# 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_OS" = xaix; then elif test "x$OPENJDK_TARGET_OS" = xaix; then
JVM_CFLAGS="$JVM_CFLAGS -qarch=ppc64" JVM_CFLAGS="$JVM_CFLAGS -qarch=ppc64"
fi fi
elif test "x$OPENJDK_TARGET_CPU" = xppc64le; then
if test "x$OPENJDK_TARGET_OS" = xlinux; then
JVM_CFLAGS="$JVM_CFLAGS -minsert-sched-nops=regroup_exact -mno-multiple -mno-string"
# Little endian machine uses ELFv2 ABI.
JVM_CFLAGS="$JVM_CFLAGS -DABI_ELFv2"
# Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
JVM_CFLAGS="$JVM_CFLAGS -mcpu=power7 -mtune=power8"
fi
fi fi
if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
@ -50610,20 +50619,21 @@ $as_echo "$supports" >&6; }
elif test "x$OPENJDK_BUILD_CPU" = xppc64; then elif test "x$OPENJDK_BUILD_CPU" = xppc64; then
if test "x$OPENJDK_BUILD_OS" = xlinux; then if test "x$OPENJDK_BUILD_OS" = xlinux; then
OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -minsert-sched-nops=regroup_exact -mno-multiple -mno-string" OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -minsert-sched-nops=regroup_exact -mno-multiple -mno-string"
if test "x$OPENJDK_BUILD_CPU_ENDIAN" = xbig; then # fixes `relocation truncated to fit' error for gcc 4.1.
# fixes `relocation truncated to fit' error for gcc 4.1. OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -mminimal-toc"
OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -mminimal-toc" # Use ppc64 instructions, but schedule for power5
# Use ppc64 instructions, but schedule for power5 OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -mcpu=powerpc64 -mtune=power5"
OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -mcpu=powerpc64 -mtune=power5"
else
# Little endian machine uses ELFv2 ABI.
OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -DABI_ELFv2"
# 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_OS" = xaix; then elif test "x$OPENJDK_BUILD_OS" = xaix; then
OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -qarch=ppc64" OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -qarch=ppc64"
fi fi
elif test "x$OPENJDK_BUILD_CPU" = xppc64le; then
if test "x$OPENJDK_BUILD_OS" = xlinux; then
OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -minsert-sched-nops=regroup_exact -mno-multiple -mno-string"
# Little endian machine uses ELFv2 ABI.
OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -DABI_ELFv2"
# 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
fi fi
if test "x$OPENJDK_BUILD_CPU_ENDIAN" = xlittle; then if test "x$OPENJDK_BUILD_CPU_ENDIAN" = xlittle; then

4
common/autoconf/platform.m4
View File

@ -405,6 +405,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
HOTSPOT_$1_CPU=sparc HOTSPOT_$1_CPU=sparc
elif test "x$OPENJDK_$1_CPU" = xppc64; then elif test "x$OPENJDK_$1_CPU" = xppc64; then
HOTSPOT_$1_CPU=ppc_64 HOTSPOT_$1_CPU=ppc_64
elif test "x$OPENJDK_$1_CPU" = xppc64le; then
HOTSPOT_$1_CPU=ppc_64
fi fi
AC_SUBST(HOTSPOT_$1_CPU) AC_SUBST(HOTSPOT_$1_CPU)
@ -423,6 +425,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
HOTSPOT_$1_CPU_DEFINE=AARCH64 HOTSPOT_$1_CPU_DEFINE=AARCH64
elif test "x$OPENJDK_$1_CPU" = xppc64; then elif test "x$OPENJDK_$1_CPU" = xppc64; then
HOTSPOT_$1_CPU_DEFINE=PPC64 HOTSPOT_$1_CPU_DEFINE=PPC64
elif test "x$OPENJDK_$1_CPU" = xppc64le; then
HOTSPOT_$1_CPU_DEFINE=PPC64
# The cpu defines below are for zero, we don't support them directly. # The cpu defines below are for zero, we don't support them directly.
elif test "x$OPENJDK_$1_CPU" = xsparc; then elif test "x$OPENJDK_$1_CPU" = xsparc; then