|
|
3c3d8d |
diff -r e1bfd77b6e1a make/common/Defs-linux.gmk
|
|
|
3c3d8d |
--- openjdk/jdk/make/common/Defs-linux.gmk Tue Jan 27 02:53:44 2015 +0000
|
|
|
3c3d8d |
+++ openjdk/jdk/make/common/Defs-linux.gmk Fri Feb 13 12:42:28 2015 +0000
|
|
|
3c3d8d |
@@ -199,16 +199,9 @@
|
|
|
3c3d8d |
CFLAGS_REQUIRED_mips +=
|
|
|
3c3d8d |
CFLAGS_REQUIRED_mipsel += -D_LITTLE_ENDIAN
|
|
|
3c3d8d |
CFLAGS_REQUIRED_ppc += -m32 -fsigned-char -D_BIG_ENDIAN
|
|
|
3c3d8d |
-ifeq ($(ARCH),ppc64)
|
|
|
3c3d8d |
- ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),big)
|
|
|
3c3d8d |
- CFLAGS_REQUIRED_ppc64 += -m64 -D_BIG_ENDIAN
|
|
|
3c3d8d |
- LDFLAGS_COMMON_ppc64 += -m64 -L/lib64 -Wl,-melf64ppc
|
|
|
3c3d8d |
- else ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),little)
|
|
|
3c3d8d |
- CFLAGS_REQUIRED_ppc64 += -D_LITTLE_ENDIAN -DABI_ELFv2
|
|
|
3c3d8d |
- else
|
|
|
3c3d8d |
- $(error Expected big/little for ARCH=ppc64, got OPENJDK_TARGET_CPU_ENDIAN=$(OPENJDK_TARGET_CPU_ENDIAN))
|
|
|
3c3d8d |
- endif
|
|
|
3c3d8d |
-endif
|
|
|
3c3d8d |
+CFLAGS_REQUIRED_ppc64 += -m64 -D_BIG_ENDIAN
|
|
|
3c3d8d |
+LDFLAGS_COMMON_ppc64 += -m64 -L/lib64 -Wl,-melf64ppc
|
|
|
3c3d8d |
+CFLAGS_REQUIRED_ppc64le += -D_LITTLE_ENDIAN -DABI_ELFv2
|
|
|
3c3d8d |
CFLAGS_REQUIRED_s390 +=
|
|
|
3c3d8d |
CFLAGS_REQUIRED_s390x += -m64
|
|
|
3c3d8d |
CFLAGS_REQUIRED_sh += -mieee
|
|
|
3c3d8d |
diff -r e1bfd77b6e1a make/common/shared/Platform.gmk
|
|
|
3c3d8d |
--- openjdk/jdk/make/common/shared/Platform.gmk Tue Jan 27 02:53:44 2015 +0000
|
|
|
3c3d8d |
+++ openjdk/jdk/make/common/shared/Platform.gmk Fri Feb 13 12:42:28 2015 +0000
|
|
|
3c3d8d |
@@ -217,7 +217,6 @@
|
|
|
3c3d8d |
else ifeq ($(ARCH), ppc64le)
|
|
|
3c3d8d |
ARCH_DATA_MODEL=64
|
|
|
3c3d8d |
OPENJDK_TARGET_CPU_ENDIAN=little
|
|
|
3c3d8d |
- ARCH := ppc64
|
|
|
3c3d8d |
else
|
|
|
3c3d8d |
# Most archs are 32-bit
|
|
|
3c3d8d |
ifndef ARCH_DATA_MODEL
|
|
|
3c3d8d |
diff -r e1bfd77b6e1a make/javax/sound/SoundDefs.gmk
|
|
|
3c3d8d |
--- openjdk/jdk/make/javax/sound/SoundDefs.gmk Tue Jan 27 02:53:44 2015 +0000
|
|
|
3c3d8d |
+++ openjdk/jdk/make/javax/sound/SoundDefs.gmk Fri Feb 13 12:42:28 2015 +0000
|
|
|
3c3d8d |
@@ -110,6 +110,10 @@
|
|
|
3c3d8d |
CPPFLAGS += -DX_ARCH=X_PPC64
|
|
|
3c3d8d |
endif # ARCH ppc64
|
|
|
3c3d8d |
|
|
|
3c3d8d |
+ ifeq ($(ARCH), ppc64le)
|
|
|
3c3d8d |
+ CPPFLAGS += -DX_ARCH=X_PPC64LE
|
|
|
3c3d8d |
+ endif # ARCH ppc64le
|
|
|
3c3d8d |
+
|
|
|
3c3d8d |
ifeq ($(ARCH), s390)
|
|
|
3c3d8d |
CPPFLAGS += -DX_ARCH=X_S390
|
|
|
3c3d8d |
endif # ARCH s390
|
|
|
3c3d8d |
diff -r e1bfd77b6e1a src/share/native/com/sun/media/sound/SoundDefs.h
|
|
|
3c3d8d |
--- openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Tue Jan 27 02:53:44 2015 +0000
|
|
|
3c3d8d |
+++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Fri Feb 13 12:42:28 2015 +0000
|
|
|
3c3d8d |
@@ -52,6 +52,7 @@
|
|
|
3c3d8d |
#define X_S390X 15
|
|
|
3c3d8d |
#define X_SH 16
|
|
|
3c3d8d |
#define X_AARCH64 17
|
|
|
3c3d8d |
+#define X_PPC64LE 18
|
|
|
3c3d8d |
|
|
|
3c3d8d |
// **********************************
|
|
|
3c3d8d |
// Make sure you set X_PLATFORM and X_ARCH defines correctly.
|
|
|
3c3d8d |
diff -r e1bfd77b6e1a src/solaris/bin/ppc64le/jvm.cfg
|
|
|
3c3d8d |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
3c3d8d |
+++ openjdk/jdk/src/solaris/bin/ppc64le/jvm.cfg Fri Feb 13 12:42:28 2015 +0000
|
|
|
3c3d8d |
@@ -0,0 +1,33 @@
|
|
|
3c3d8d |
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
|
|
|
3c3d8d |
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
|
3c3d8d |
+#
|
|
|
3c3d8d |
+# This code is free software; you can redistribute it and/or modify it
|
|
|
3c3d8d |
+# under the terms of the GNU General Public License version 2 only, as
|
|
|
3c3d8d |
+# published by the Free Software Foundation. Oracle designates this
|
|
|
3c3d8d |
+# particular file as subject to the "Classpath" exception as provided
|
|
|
3c3d8d |
+# by Oracle in the LICENSE file that accompanied this code.
|
|
|
3c3d8d |
+#
|
|
|
3c3d8d |
+# This code is distributed in the hope that it will be useful, but WITHOUT
|
|
|
3c3d8d |
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
|
3c3d8d |
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
|
3c3d8d |
+# version 2 for more details (a copy is included in the LICENSE file that
|
|
|
3c3d8d |
+# accompanied this code).
|
|
|
3c3d8d |
+#
|
|
|
3c3d8d |
+# You should have received a copy of the GNU General Public License version
|
|
|
3c3d8d |
+# 2 along with this work; if not, write to the Free Software Foundation,
|
|
|
3c3d8d |
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
3c3d8d |
+#
|
|
|
3c3d8d |
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
|
3c3d8d |
+# or visit www.oracle.com if you need additional information or have any
|
|
|
3c3d8d |
+# questions.
|
|
|
3c3d8d |
+#
|
|
|
3c3d8d |
+# List of JVMs that can be used as an option to java, javac, etc.
|
|
|
3c3d8d |
+# Order is important -- first in this list is the default JVM.
|
|
|
3c3d8d |
+# NOTE that this both this file and its format are UNSUPPORTED and
|
|
|
3c3d8d |
+# WILL GO AWAY in a future release.
|
|
|
3c3d8d |
+#
|
|
|
3c3d8d |
+# You may also select a JVM in an arbitrary location with the
|
|
|
3c3d8d |
+# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
|
|
|
3c3d8d |
+# and may not be available in a future release.
|
|
|
3c3d8d |
+#
|
|
|
3c3d8d |
+-server KNOWN
|