Mercurial > hg > openjdk > jdk8u
changeset 2214:a5b23c21a665
8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling
Reviewed-by: erikj, goetz, dholmes
| author | sgehwolf |
|---|---|
| date | Tue, 25 Sep 2018 15:58:42 +0200 |
| parents | 91867683f73d |
| children | dc92f24722a6 |
| files | common/autoconf/flags.m4 common/autoconf/generated-configure.sh common/autoconf/jdk-options.m4 common/autoconf/platform.m4 |
| diffstat | 4 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/flags.m4 Thu Oct 04 10:07:48 2018 +0100 +++ b/common/autoconf/flags.m4 Tue Sep 25 15:58:42 2018 +0200 @@ -539,6 +539,9 @@ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN" fi fi + if test "x$OPENJDK_TARGET_CPU" = xppc64le; then + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DABI_ELFv2" + fi # Setup target OS define. Use OS target name but in upper case. OPENJDK_TARGET_OS_UPPERCASE=`$ECHO $OPENJDK_TARGET_OS | $TR 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
--- a/common/autoconf/generated-configure.sh Thu Oct 04 10:07:48 2018 +0100 +++ b/common/autoconf/generated-configure.sh Tue Sep 25 15:58:42 2018 +0200 @@ -4337,7 +4337,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1537356874 +DATE_WHEN_GENERATED=1538732652 ############################################################################### # @@ -13612,7 +13612,7 @@ VAR_CPU_ENDIAN=big ;; powerpc64le) - VAR_CPU=ppc64 + VAR_CPU=ppc64le VAR_CPU_ARCH=ppc VAR_CPU_BITS=64 VAR_CPU_ENDIAN=little @@ -13750,7 +13750,7 @@ VAR_CPU_ENDIAN=big ;; powerpc64le) - VAR_CPU=ppc64 + VAR_CPU=ppc64le VAR_CPU_ARCH=ppc VAR_CPU_BITS=64 VAR_CPU_ENDIAN=little @@ -14570,7 +14570,7 @@ if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then INCLUDE_SA=false fi - if test "x$VAR_CPU" = xppc64 ; then + if test "x$VAR_CPU" = xppc64 -o "x$VAR_CPU" = xppc64le ; then INCLUDE_SA=false fi if test "x$OPENJDK_TARGET_CPU" = xaarch64; then @@ -41737,6 +41737,9 @@ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN" fi fi + if test "x$OPENJDK_TARGET_CPU" = xppc64le; then + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DABI_ELFv2" + fi # Setup target OS define. Use OS target name but in upper case. OPENJDK_TARGET_OS_UPPERCASE=`$ECHO $OPENJDK_TARGET_OS | $TR 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
--- a/common/autoconf/jdk-options.m4 Thu Oct 04 10:07:48 2018 +0100 +++ b/common/autoconf/jdk-options.m4 Tue Sep 25 15:58:42 2018 +0200 @@ -158,7 +158,7 @@ if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then INCLUDE_SA=false fi - if test "x$VAR_CPU" = xppc64 ; then + if test "x$VAR_CPU" = xppc64 -o "x$VAR_CPU" = xppc64le ; then INCLUDE_SA=false fi if test "x$OPENJDK_TARGET_CPU" = xaarch64; then