Mercurial > hg > icedtea8-forest
changeset 1272:0503e9c58a13 icedtea-3.0.0pre04
PR2237: ppc64le should report its os.arch as ppc64le so tools can detect it
Summary: Use ppc64le as the arch directory on that platform and report it in os.arch
author | andrew |
---|---|
date | Thu, 04 Jun 2015 20:15:14 +0100 |
parents | 047362814742 |
children | 4dee0148235f |
files | common/autoconf/generated-configure.sh common/autoconf/hotspot-spec.gmk.in common/autoconf/jdk-options.m4 common/autoconf/platform.m4 common/autoconf/toolchain.m4 |
diffstat | 5 files changed, 16 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Thu Jun 04 17:59:54 2015 +0100 +++ b/common/autoconf/generated-configure.sh Thu Jun 04 20:15:14 2015 +0100 @@ -3905,7 +3905,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1433386265 +DATE_WHEN_GENERATED=1433445271 ############################################################################### # @@ -6868,7 +6868,7 @@ VAR_CPU_ENDIAN=big ;; powerpc64le) - VAR_CPU=ppc64 + VAR_CPU=ppc64le VAR_CPU_ARCH=ppc VAR_CPU_BITS=64 VAR_CPU_ENDIAN=little @@ -6999,7 +6999,7 @@ VAR_CPU_ENDIAN=big ;; powerpc64le) - VAR_CPU=ppc64 + VAR_CPU=ppc64le VAR_CPU_ARCH=ppc VAR_CPU_BITS=64 VAR_CPU_ENDIAN=little @@ -7987,7 +7987,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 @@ -29984,6 +29984,9 @@ else CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN" fi + if test "x$OPENJDK_TARGET_CPU" = xppc64le; then + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DABI_ELFv2" + fi if test "x$OPENJDK_TARGET_OS" = xlinux; then CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DLINUX" fi
--- a/common/autoconf/hotspot-spec.gmk.in Thu Jun 04 17:59:54 2015 +0100 +++ b/common/autoconf/hotspot-spec.gmk.in Thu Jun 04 20:15:14 2015 +0100 @@ -71,6 +71,10 @@ LIBARCH=$(OPENJDK_TARGET_CPU_LEGACY_LIB) # Old name for OPENJDK_TARGET_CPU, uses i586 and amd64, instead of x86 and x86_64. ARCH=$(OPENJDK_TARGET_CPU_LEGACY) +# ppc64le uses the HotSpot ppc64 build +ifeq ($(OPENJDK_TARGET_CPU), ppc64le) + ARCH=ppc64 +endif # Legacy setting for building for a 64 bit machine. # If yes then this expands to _LP64:=1 @LP64@
--- a/common/autoconf/jdk-options.m4 Thu Jun 04 17:59:54 2015 +0100 +++ b/common/autoconf/jdk-options.m4 Thu Jun 04 20:15:14 2015 +0100 @@ -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 AC_SUBST(INCLUDE_SA)
--- a/common/autoconf/platform.m4 Thu Jun 04 17:59:54 2015 +0100 +++ b/common/autoconf/platform.m4 Thu Jun 04 20:15:14 2015 +0100 @@ -61,7 +61,7 @@ VAR_CPU_ENDIAN=big ;; powerpc64le) - VAR_CPU=ppc64 + VAR_CPU=ppc64le VAR_CPU_ARCH=ppc VAR_CPU_BITS=64 VAR_CPU_ENDIAN=little
--- a/common/autoconf/toolchain.m4 Thu Jun 04 17:59:54 2015 +0100 +++ b/common/autoconf/toolchain.m4 Thu Jun 04 20:15:14 2015 +0100 @@ -990,6 +990,9 @@ else CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN" fi + if test "x$OPENJDK_TARGET_CPU" = xppc64le; then + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DABI_ELFv2" + fi if test "x$OPENJDK_TARGET_OS" = xlinux; then CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DLINUX" fi