ed935dd5ec
OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=28
125 lines
4.7 KiB
Diff
125 lines
4.7 KiB
Diff
--- jdk8/common/autoconf/jdk-options.m4 2014-06-18 21:34:07.000000000 +0200
|
|
+++ jdk8/common/autoconf/jdk-options.m4 2014-07-09 16:03:01.156813855 +0200
|
|
@@ -161,6 +161,9 @@
|
|
if test "x$VAR_CPU" = xppc64 ; then
|
|
INCLUDE_SA=false
|
|
fi
|
|
+ if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
|
|
+ INCLUDE_SA=false
|
|
+ fi
|
|
AC_SUBST(INCLUDE_SA)
|
|
|
|
if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
|
|
--- jdk8/common/autoconf/platform.m4 2014-06-18 21:34:07.000000000 +0200
|
|
+++ jdk8/common/autoconf/platform.m4 2014-07-09 16:02:13.345878082 +0200
|
|
@@ -48,6 +48,12 @@
|
|
VAR_CPU_BITS=32
|
|
VAR_CPU_ENDIAN=little
|
|
;;
|
|
+ aarch64)
|
|
+ VAR_CPU=aarch64
|
|
+ VAR_CPU_ARCH=aarch64
|
|
+ VAR_CPU_BITS=64
|
|
+ VAR_CPU_ENDIAN=little
|
|
+ ;;
|
|
powerpc)
|
|
VAR_CPU=ppc
|
|
VAR_CPU_ARCH=ppc
|
|
--- jdk8/common/autoconf/toolchain.m4 2014-06-18 21:34:07.000000000 +0200
|
|
+++ jdk8/common/autoconf/toolchain.m4 2014-07-09 16:02:13.345878082 +0200
|
|
@@ -878,7 +878,7 @@
|
|
#
|
|
case $COMPILER_NAME in
|
|
gcc )
|
|
- CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
|
|
+ CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses \
|
|
-pipe \
|
|
-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
|
|
case $OPENJDK_TARGET_CPU_ARCH in
|
|
@@ -1158,6 +1158,9 @@
|
|
s390)
|
|
ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}31"
|
|
;;
|
|
+ aarch64)
|
|
+ ZERO_ARCHFLAG=""
|
|
+ ;;
|
|
*)
|
|
ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
|
|
esac
|
|
--- jdk8/jdk/make/gensrc/GensrcMisc.gmk 2014-06-23 01:01:34.000000000 +0200
|
|
+++ jdk8/jdk/make/gensrc/GensrcMisc.gmk 2014-07-09 16:02:13.346878060 +0200
|
|
@@ -95,7 +95,7 @@
|
|
INCLUDE_FILES := $(GENSRC_SOR_SRC_FILE), \
|
|
LANG := C, \
|
|
CC := $(BUILD_CC), \
|
|
- LDEXE := $(BUILD_LD), \
|
|
+ LDEXE := $(BUILD_CC), \
|
|
OBJECT_DIR := $(GENSRC_SOR_BIN), \
|
|
OUTPUT_DIR := $(GENSRC_SOR_BIN), \
|
|
PROGRAM := genSocketOptionRegistry))
|
|
--- jdk8/jdk/make/lib/SoundLibraries.gmk 2014-06-23 01:01:34.000000000 +0200
|
|
+++ jdk8/jdk/make/lib/SoundLibraries.gmk 2014-07-09 16:02:13.346878060 +0200
|
|
@@ -139,6 +139,10 @@
|
|
ifeq ($(OPENJDK_TARGET_CPU), ppc64)
|
|
LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC64
|
|
endif
|
|
+
|
|
+ ifeq ($(OPENJDK_TARGET_CPU), aarch64)
|
|
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_AARCH64
|
|
+ endif
|
|
endif
|
|
|
|
LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"'
|
|
--- jdk8/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2014-06-23 01:01:34.000000000 +0200
|
|
+++ jdk8/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2014-07-09 16:02:13.346878060 +0200
|
|
@@ -43,6 +43,7 @@
|
|
#define X_ZERO 6
|
|
#define X_ARM 7
|
|
#define X_PPC 8
|
|
+#define X_AARCH64 9
|
|
|
|
// **********************************
|
|
// Make sure you set X_PLATFORM and X_ARCH defines correctly.
|
|
--- jdk8/jdk/src/solaris/bin/aarch64/jvm.cfg 1970-01-01 01:00:00.000000000 +0100
|
|
+++ jdk8/jdk/src/solaris/bin/aarch64/jvm.cfg 2014-07-09 16:02:13.346878060 +0200
|
|
@@ -0,0 +1,39 @@
|
|
+# 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.
|
|
+#
|
|
+# n.b. server must be first so it is used as the default
|
|
+-server KNOWN
|
|
+-minimal ERROR
|
|
+-cacao ERROR
|
|
+-zero KNOWN
|
|
+-shark ERROR
|
|
+-jamvm ERROR
|