Accepting request 365892 from Java:Factory
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/365892 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-1_8_0-openjdk?expand=0&rev=36
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
4bf134198f
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 26 12:29:06 UTC 2016 - fstrba@suse.com
|
||||
|
||||
- Added patch:
|
||||
* ppc64le-8036767.patch
|
||||
+ Change archinstall for ppc64le from ppc64 to ppc64le
|
||||
directory.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 25 07:54:33 UTC 2016 - fstrba@suse.com
|
||||
|
||||
|
||||
@ -79,9 +79,12 @@
|
||||
%ifarch ppc
|
||||
%global archinstall ppc
|
||||
%endif
|
||||
%ifarch ppc64 ppc64le
|
||||
%ifarch ppc64
|
||||
%global archinstall ppc64
|
||||
%endif
|
||||
%ifarch ppc64le
|
||||
%global archinstall ppc64le
|
||||
%endif
|
||||
%ifarch %ix86
|
||||
%global archinstall i386
|
||||
%endif
|
||||
@ -231,6 +234,7 @@ Patch100: s390-java-opts.patch
|
||||
Patch101: s390-size_t.patch
|
||||
# Patch for PPC/PPC64
|
||||
Patch103: ppc-zero-hotspot.patch
|
||||
Patch104: ppc64le-8036767.patch
|
||||
# Patches for system libraries
|
||||
Patch201: system-libjpeg.patch
|
||||
Patch202: system-libpng.patch
|
||||
@ -521,6 +525,7 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
|
||||
%ifarch ppc ppc64 ppc64le
|
||||
# PPC fixes
|
||||
%patch103 -p1
|
||||
%patch104 -p1
|
||||
%endif
|
||||
|
||||
# Extract systemtap tapsets
|
||||
|
||||
125
ppc64le-8036767.patch
Normal file
125
ppc64le-8036767.patch
Normal file
@ -0,0 +1,125 @@
|
||||
--- jdk8/common/autoconf/hotspot-spec.gmk.in 2016-02-26 13:23:57.379257902 +0100
|
||||
+++ jdk8/common/autoconf/hotspot-spec.gmk.in 2016-02-26 13:25:10.961590289 +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@
|
||||
--- jdk8/common/autoconf/jdk-options.m4 2016-02-26 13:23:57.379257902 +0100
|
||||
+++ jdk8/common/autoconf/jdk-options.m4 2016-02-26 13:25:10.961590289 +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
|
||||
if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
|
||||
--- jdk8/common/autoconf/platform.m4 2016-02-26 13:23:57.379257902 +0100
|
||||
+++ jdk8/common/autoconf/platform.m4 2016-02-26 13:25:10.961590289 +0100
|
||||
@@ -73,7 +73,7 @@
|
||||
VAR_CPU_ENDIAN=big
|
||||
;;
|
||||
powerpc64le)
|
||||
- VAR_CPU=ppc64
|
||||
+ VAR_CPU=ppc64le
|
||||
VAR_CPU_ARCH=ppc
|
||||
VAR_CPU_BITS=64
|
||||
VAR_CPU_ENDIAN=little
|
||||
--- jdk8/common/autoconf/toolchain.m4 2016-02-26 13:23:57.379257902 +0100
|
||||
+++ jdk8/common/autoconf/toolchain.m4 2016-02-26 13:25:10.961590289 +0100
|
||||
@@ -1056,6 +1056,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
|
||||
--- jdk8/hotspot/make/defs.make 2016-02-26 13:23:55.307304861 +0100
|
||||
+++ jdk8/hotspot/make/defs.make 2016-02-26 13:25:10.961590289 +0100
|
||||
@@ -325,6 +325,13 @@
|
||||
LIBARCH/ppc64 = ppc64
|
||||
LIBARCH/zero = $(ZERO_LIBARCH)
|
||||
|
||||
+ # Override LIBARCH for ppc64le
|
||||
+ ifeq ($(ARCH), ppc64)
|
||||
+ ifeq ($(OPENJDK_TARGET_CPU_ENDIAN), little)
|
||||
+ LIBARCH = ppc64le
|
||||
+ endif
|
||||
+ endif
|
||||
+
|
||||
LP64_ARCH += sparcv9 amd64 ia64 ppc64 zero
|
||||
endif
|
||||
|
||||
--- jdk8/jdk/make/lib/SoundLibraries.gmk 2016-02-26 13:23:55.795293801 +0100
|
||||
+++ jdk8/jdk/make/lib/SoundLibraries.gmk 2016-02-26 13:25:10.961590289 +0100
|
||||
@@ -143,6 +143,10 @@
|
||||
ifeq ($(OPENJDK_TARGET_CPU), aarch64)
|
||||
LIBJSOUND_CFLAGS += -DX_ARCH=X_AARCH64
|
||||
endif
|
||||
+
|
||||
+ ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
|
||||
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC64LE
|
||||
+ endif
|
||||
endif
|
||||
|
||||
LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"'
|
||||
--- jdk8/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2016-02-26 13:23:56.283282740 +0100
|
||||
+++ jdk8/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2016-02-26 13:25:10.961590289 +0100
|
||||
@@ -43,7 +43,9 @@
|
||||
#define X_ZERO 6
|
||||
#define X_ARM 7
|
||||
#define X_PPC 8
|
||||
-#define X_AARCH64 9
|
||||
+#define X_PPC64 9
|
||||
+#define X_PPC64LE 10
|
||||
+#define X_AARCH64 11
|
||||
|
||||
// **********************************
|
||||
// Make sure you set X_PLATFORM and X_ARCH defines correctly.
|
||||
--- jdk8/jdk/src/solaris/bin/ppc64le/jvm.cfg 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ jdk8/jdk/src/solaris/bin/ppc64le/jvm.cfg 2016-02-26 13:25:10.961590289 +0100
|
||||
@@ -0,0 +1,33 @@
|
||||
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
|
||||
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
+#
|
||||
+# This code is free software; you can redistribute it and/or modify it
|
||||
+# under the terms of the GNU General Public License version 2 only, as
|
||||
+# published by the Free Software Foundation. Oracle designates this
|
||||
+# particular file as subject to the "Classpath" exception as provided
|
||||
+# by Oracle in the LICENSE file that accompanied this code.
|
||||
+#
|
||||
+# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
+# version 2 for more details (a copy is included in the LICENSE file that
|
||||
+# accompanied this code).
|
||||
+#
|
||||
+# You should have received a copy of the GNU General Public License version
|
||||
+# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
+#
|
||||
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
+# or visit www.oracle.com if you need additional information or have any
|
||||
+# questions.
|
||||
+#
|
||||
+# List of JVMs that can be used as an option to java, javac, etc.
|
||||
+# Order is important -- first in this list is the default JVM.
|
||||
+# NOTE that this both this file and its format are UNSUPPORTED and
|
||||
+# WILL GO AWAY in a future release.
|
||||
+#
|
||||
+# You may also select a JVM in an arbitrary location with the
|
||||
+# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
|
||||
+# and may not be available in a future release.
|
||||
+#
|
||||
+-server KNOWN
|
||||
Loading…
x
Reference in New Issue
Block a user