Tue, 25 Sep 2018 15:58:42 +0200
8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling
Reviewed-by: erikj, goetz, dholmes
1.1 --- a/common/autoconf/flags.m4 Thu Oct 04 10:07:48 2018 +0100 1.2 +++ b/common/autoconf/flags.m4 Tue Sep 25 15:58:42 2018 +0200 1.3 @@ -539,6 +539,9 @@ 1.4 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN" 1.5 fi 1.6 fi 1.7 + if test "x$OPENJDK_TARGET_CPU" = xppc64le; then 1.8 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DABI_ELFv2" 1.9 + fi 1.10 1.11 # Setup target OS define. Use OS target name but in upper case. 1.12 OPENJDK_TARGET_OS_UPPERCASE=`$ECHO $OPENJDK_TARGET_OS | $TR 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
2.1 --- a/common/autoconf/generated-configure.sh Thu Oct 04 10:07:48 2018 +0100 2.2 +++ b/common/autoconf/generated-configure.sh Tue Sep 25 15:58:42 2018 +0200 2.3 @@ -4337,7 +4337,7 @@ 2.4 #CUSTOM_AUTOCONF_INCLUDE 2.5 2.6 # Do not change or remove the following line, it is needed for consistency checks: 2.7 -DATE_WHEN_GENERATED=1537356874 2.8 +DATE_WHEN_GENERATED=1538732652 2.9 2.10 ############################################################################### 2.11 # 2.12 @@ -13612,7 +13612,7 @@ 2.13 VAR_CPU_ENDIAN=big 2.14 ;; 2.15 powerpc64le) 2.16 - VAR_CPU=ppc64 2.17 + VAR_CPU=ppc64le 2.18 VAR_CPU_ARCH=ppc 2.19 VAR_CPU_BITS=64 2.20 VAR_CPU_ENDIAN=little 2.21 @@ -13750,7 +13750,7 @@ 2.22 VAR_CPU_ENDIAN=big 2.23 ;; 2.24 powerpc64le) 2.25 - VAR_CPU=ppc64 2.26 + VAR_CPU=ppc64le 2.27 VAR_CPU_ARCH=ppc 2.28 VAR_CPU_BITS=64 2.29 VAR_CPU_ENDIAN=little 2.30 @@ -14570,7 +14570,7 @@ 2.31 if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then 2.32 INCLUDE_SA=false 2.33 fi 2.34 - if test "x$VAR_CPU" = xppc64 ; then 2.35 + if test "x$VAR_CPU" = xppc64 -o "x$VAR_CPU" = xppc64le ; then 2.36 INCLUDE_SA=false 2.37 fi 2.38 if test "x$OPENJDK_TARGET_CPU" = xaarch64; then 2.39 @@ -41737,6 +41737,9 @@ 2.40 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN" 2.41 fi 2.42 fi 2.43 + if test "x$OPENJDK_TARGET_CPU" = xppc64le; then 2.44 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DABI_ELFv2" 2.45 + fi 2.46 2.47 # Setup target OS define. Use OS target name but in upper case. 2.48 OPENJDK_TARGET_OS_UPPERCASE=`$ECHO $OPENJDK_TARGET_OS | $TR 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
3.1 --- a/common/autoconf/jdk-options.m4 Thu Oct 04 10:07:48 2018 +0100 3.2 +++ b/common/autoconf/jdk-options.m4 Tue Sep 25 15:58:42 2018 +0200 3.3 @@ -158,7 +158,7 @@ 3.4 if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then 3.5 INCLUDE_SA=false 3.6 fi 3.7 - if test "x$VAR_CPU" = xppc64 ; then 3.8 + if test "x$VAR_CPU" = xppc64 -o "x$VAR_CPU" = xppc64le ; then 3.9 INCLUDE_SA=false 3.10 fi 3.11 if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
4.1 --- a/common/autoconf/platform.m4 Thu Oct 04 10:07:48 2018 +0100 4.2 +++ b/common/autoconf/platform.m4 Tue Sep 25 15:58:42 2018 +0200 4.3 @@ -67,7 +67,7 @@ 4.4 VAR_CPU_ENDIAN=big 4.5 ;; 4.6 powerpc64le) 4.7 - VAR_CPU=ppc64 4.8 + VAR_CPU=ppc64le 4.9 VAR_CPU_ARCH=ppc 4.10 VAR_CPU_BITS=64 4.11 VAR_CPU_ENDIAN=little