8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling
Summary: Set VAR_CPU value to ppc64le on the little-endian PowerPC64.
Reviewed-by: dholmes, ihse
Contributed-by: Andrew Hughes <gnu.andrew@redhat.com>, Alexander Smundak <asmundak@google.com>
--- a/common/autoconf/generated-configure.sh Tue Dec 08 03:16:58 2015 +0100
+++ b/common/autoconf/generated-configure.sh Fri Dec 11 10:45:46 2015 -0800
@@ -4052,6 +4052,15 @@
#
+################################################################################
+#
+# Static build support. When enabled will generate static
+# libraries instead of shared libraries for all JDK libs.
+#
+
+
+
+
#
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -4091,15 +4100,6 @@
-################################################################################
-#
-# Static build support. When enabled will generate static
-# libraries instead of shared libraries for all JDK libs.
-#
-
-
-
-
#
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -4709,7 +4709,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1449049746
+DATE_WHEN_GENERATED=1449859210
###############################################################################
#
@@ -14688,7 +14688,7 @@
VAR_CPU_ENDIAN=big
;;
powerpc64le)
- VAR_CPU=ppc64
+ VAR_CPU=ppc64le
VAR_CPU_ARCH=ppc
VAR_CPU_BITS=64
VAR_CPU_ENDIAN=little
@@ -14827,7 +14827,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/platform.m4 Tue Dec 08 03:16:58 2015 +0100
+++ b/common/autoconf/platform.m4 Fri Dec 11 10:45:46 2015 -0800
@@ -67,7 +67,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/bin/unshuffle_list.txt Tue Dec 08 03:16:58 2015 +0100
+++ b/common/bin/unshuffle_list.txt Fri Dec 11 10:45:46 2015 -0800
@@ -378,6 +378,7 @@
jdk/src/java.base/unix/conf/i586/jvm.cfg : jdk/src/solaris/bin/i586/jvm.cfg
jdk/src/java.base/unix/conf/ia64/jvm.cfg : jdk/src/solaris/bin/ia64/jvm.cfg
jdk/src/java.base/unix/conf/ppc64/jvm.cfg : jdk/src/solaris/bin/ppc64/jvm.cfg
+jdk/src/java.base/unix/conf/ppc64le/jvm.cfg : jdk/src/solaris/bin/ppc64le/jvm.cfg
jdk/src/java.base/unix/conf/ppc/jvm.cfg : jdk/src/solaris/bin/ppc/jvm.cfg
jdk/src/java.base/unix/conf/sdp/sdp.conf.template : jdk/src/solaris/lib/sdp/sdp.conf.template
jdk/src/java.base/unix/conf/sparc/jvm.cfg : jdk/src/solaris/bin/sparc/jvm.cfg