diff --git a/050f5654fa19.tar.bz2 b/050f5654fa19.tar.bz2 deleted file mode 100644 index c741e93..0000000 --- a/050f5654fa19.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:adb3fbbf9608d982eedcd80cd8f6faa4b6e2018a4c942070543bd7483097df84 -size 2733540 diff --git a/10ad4b9d79f9.tar.bz2 b/10ad4b9d79f9.tar.bz2 new file mode 100644 index 0000000..54c6311 --- /dev/null +++ b/10ad4b9d79f9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a95c0a8a20a90f387096dc37d52e4d1e42e5ac9da3c48fbe264d2fd5d79e9ae0 +size 7797442 diff --git a/11098f828fb8.tar.bz2 b/11098f828fb8.tar.bz2 deleted file mode 100644 index 203bbcf..0000000 --- a/11098f828fb8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:56a548f40f303c1f13047c4bc88bc9ee1d3674c36c24ff7404f7cadb155c011c -size 8095454 diff --git a/3639e38bd73f.tar.bz2 b/3639e38bd73f.tar.bz2 deleted file mode 100644 index c9f2c1f..0000000 --- a/3639e38bd73f.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21f0cd6c91e93df6ca24de3c9518ea083721b6a9ca317d423e6c873e483dd1a3 -size 7757002 diff --git a/3b9b39af6c36.tar.bz2 b/3b9b39af6c36.tar.bz2 deleted file mode 100644 index 316c65c..0000000 --- a/3b9b39af6c36.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f3e85315160533090f3f5bb79aec95c19f4365ea36f0ad2ee3b4e6617a791bf7 -size 1021519 diff --git a/3ee37a71b2ab.tar.bz2 b/3ee37a71b2ab.tar.bz2 deleted file mode 100644 index d11ceba..0000000 --- a/3ee37a71b2ab.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65b8aed83613b6fd12c341eef0fd994e678c100910d6482d0b610b2a6394051e -size 397351 diff --git a/72a33aed7dcc.tar.bz2 b/72a33aed7dcc.tar.bz2 new file mode 100644 index 0000000..a9814d3 --- /dev/null +++ b/72a33aed7dcc.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36752f1ab4b1fb66fd8be412a8d2b1cfa9cf0258db743dc79e1e8c9607f50ef8 +size 2889789 diff --git a/8ec803e97a0d.tar.bz2 b/8ec803e97a0d.tar.bz2 new file mode 100644 index 0000000..805ca1b --- /dev/null +++ b/8ec803e97a0d.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29eedac3204481306b8c8d81f07bfca0d6913a2ce76cbf9cc20b62834612d8e0 +size 8094017 diff --git a/8f260851e051.tar.bz2 b/8f260851e051.tar.bz2 new file mode 100644 index 0000000..6df3799 --- /dev/null +++ b/8f260851e051.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b59d77bef91aa66665fea876ba07338db5a89fa2d3a32c83d0e959ff1f38915 +size 2733925 diff --git a/975eb04d1795.tar.bz2 b/975eb04d1795.tar.bz2 new file mode 100644 index 0000000..e8f6745 --- /dev/null +++ b/975eb04d1795.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eae19a40fdda776fc8bbe7f8f1ddbc8501d061026ffcd290b7cf8f9d7f8f0e20 +size 2532295 diff --git a/_constraints b/_constraints new file mode 100644 index 0000000..dd4c265 --- /dev/null +++ b/_constraints @@ -0,0 +1,23 @@ + + + + 2048 + + + 6 + + + + + + armv7l + armv6l + + + + 512 + + + + + diff --git a/aarch64-misc.patch b/aarch64-misc.patch index c4031ef..3efcf03 100644 --- a/aarch64-misc.patch +++ b/aarch64-misc.patch @@ -1,19 +1,25 @@ ---- 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 +--- jdk8/common/autoconf/build-aux/autoconf-config.sub 2015-07-10 06:29:38.191114297 +0200 ++++ jdk8/common/autoconf/build-aux/autoconf-config.sub 2015-07-10 07:44:34.468972246 +0200 +@@ -264,6 +264,7 @@ + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | aarch64 \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ +@@ -340,6 +341,7 @@ + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ +--- jdk8/common/autoconf/generated-configure.sh 2015-07-10 06:29:38.193114252 +0200 ++++ jdk8/common/autoconf/generated-configure.sh 2015-07-10 07:44:34.477972040 +0200 +@@ -6835,6 +6835,12 @@ + VAR_CPU_BITS=64 VAR_CPU_ENDIAN=little ;; + aarch64) @@ -25,9 +31,42 @@ 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 @@ +@@ -6972,6 +6978,12 @@ + VAR_CPU_BITS=64 + 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 +@@ -7942,11 +7954,6 @@ + JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'` + JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'` + +- if test "x$JVM_VARIANT_CLIENT" = xtrue; then +- if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then +- as_fn_error $? "You cannot build a client JVM for a 64-bit machine." "$LINENO" 5 +- fi +- fi + if test "x$JVM_VARIANT_KERNEL" = xtrue; then + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then + as_fn_error $? "You cannot build a kernel JVM for a 64-bit machine." "$LINENO" 5 +@@ -7989,6 +7996,9 @@ + if test "x$OPENJDK_TARGET_CPU" = xaarch64; then + INCLUDE_SA=false + fi ++ if test "x$OPENJDK_TARGET_CPU" = xaarch64; then ++ INCLUDE_SA=false ++ fi + + + if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then +@@ -29654,7 +29664,7 @@ # case $COMPILER_NAME in gcc ) @@ -36,7 +75,7 @@ -pipe \ -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" case $OPENJDK_TARGET_CPU_ARCH in -@@ -1158,6 +1158,9 @@ +@@ -29899,6 +29909,9 @@ s390) ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}31" ;; @@ -46,9 +85,57 @@ *) 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 @@ +--- jdk8/common/autoconf/jdk-options.m4 2015-07-10 06:29:38.193114252 +0200 ++++ jdk8/common/autoconf/jdk-options.m4 2015-07-10 07:44:34.479971994 +0200 +@@ -164,6 +164,9 @@ + if test "x$OPENJDK_TARGET_CPU" = xaarch64; 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 2015-07-10 06:29:38.194114229 +0200 ++++ jdk8/common/autoconf/platform.m4 2015-07-10 07:44:34.479971994 +0200 +@@ -54,6 +54,12 @@ + VAR_CPU_BITS=64 + 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 2015-07-10 06:29:38.194114229 +0200 ++++ jdk8/common/autoconf/toolchain.m4 2015-07-10 07:44:34.479971994 +0200 +@@ -957,7 +957,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 +@@ -1237,6 +1237,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 2015-07-02 06:53:30.000000000 +0200 ++++ jdk8/jdk/make/gensrc/GensrcMisc.gmk 2015-07-10 07:44:34.480971971 +0200 +@@ -76,7 +76,7 @@ INCLUDE_FILES := $(GENSRC_SOR_SRC_FILE), \ LANG := C, \ CC := $(BUILD_CC), \ @@ -57,8 +144,8 @@ 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 +--- jdk8/jdk/make/lib/SoundLibraries.gmk 2015-07-02 06:53:30.000000000 +0200 ++++ jdk8/jdk/make/lib/SoundLibraries.gmk 2015-07-10 07:44:34.480971971 +0200 @@ -139,6 +139,10 @@ ifeq ($(OPENJDK_TARGET_CPU), ppc64) LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC64 @@ -70,8 +157,8 @@ 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 +--- jdk8/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2015-07-02 06:53:30.000000000 +0200 ++++ jdk8/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2015-07-10 07:44:34.480971971 +0200 @@ -43,6 +43,7 @@ #define X_ZERO 6 #define X_ARM 7 @@ -81,7 +168,7 @@ // ********************************** // 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 ++++ jdk8/jdk/src/solaris/bin/aarch64/jvm.cfg 2015-07-10 07:44:34.480971971 +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. diff --git a/afbc08ea922b.tar.bz2 b/afbc08ea922b.tar.bz2 new file mode 100644 index 0000000..7e29727 --- /dev/null +++ b/afbc08ea922b.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:089850622aea0778ef73e8e43845952c4d21456075b61d2ed04fd3461c002925 +size 45873180 diff --git a/applet-hole.patch b/applet-hole.patch deleted file mode 100644 index 1fb4098..0000000 --- a/applet-hole.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff --git jdk8/jdk/src/share/classes/sun/applet/AppletPanel.java jdk8/jdk/src/share/classes/sun/applet/AppletPanel.java ---- jdk8/jdk/src/share/classes/sun/applet/AppletPanel.java -+++ jdk8/jdk/src/share/classes/sun/applet/AppletPanel.java -@@ -68,7 +68,7 @@ - /** - * The applet (if loaded). - */ -- Applet applet; -+ protected Applet applet; - - /** - * Applet will allow initialization. Should be -@@ -162,7 +162,8 @@ - * Creates a thread to run the applet. This method is called - * each time an applet is loaded and reloaded. - */ -- synchronized void createAppletThread() { -+ //Overridden by NetxPanel. -+ protected synchronized void createAppletThread() { - // Create a thread group for the applet, and start a new - // thread to load the applet. - String nm = "applet-" + getCode(); -@@ -306,7 +307,7 @@ - /** - * Get an event from the queue. - */ -- synchronized AppletEvent getNextEvent() throws InterruptedException { -+ protected synchronized AppletEvent getNextEvent() throws InterruptedException { - while (queue == null || queue.isEmpty()) { - wait(); - } -@@ -692,7 +693,8 @@ - * applet event processing so that it can be gracefully interrupted from - * things like HotJava. - */ -- private void runLoader() { -+ //Overridden by NetxPanel. -+ protected void runLoader() { - if (status != APPLET_DISPOSE) { - showAppletStatus("notdisposed"); - return; -diff --git jdk8/jdk/src/share/classes/sun/applet/AppletViewerPanel.java jdk8/jdk/src/share/classes/sun/applet/AppletViewerPanel.java ---- jdk8/jdk/src/share/classes/sun/applet/AppletViewerPanel.java -+++ jdk8/jdk/src/share/classes/sun/applet/AppletViewerPanel.java -@@ -42,25 +42,25 @@ - * - * @author Arthur van Hoff - */ --class AppletViewerPanel extends AppletPanel { -+public class AppletViewerPanel extends AppletPanel { - - /* Are we debugging? */ -- static boolean debug = false; -+ protected static boolean debug = false; - - /** - * The document url. - */ -- URL documentURL; -+ protected URL documentURL; - - /** - * The base url. - */ -- URL baseURL; -+ protected URL baseURL; - - /** - * The attributes of the applet. - */ -- Hashtable atts; -+ protected Hashtable atts; - - /* - * JDK 1.1 serialVersionUID -@@ -70,7 +70,7 @@ - /** - * Construct an applet viewer and start the applet. - */ -- AppletViewerPanel(URL documentURL, Hashtable atts) { -+ protected AppletViewerPanel(URL documentURL, Hashtable atts) { - this.documentURL = documentURL; - this.atts = atts; - -@@ -106,7 +106,7 @@ - * Get an applet parameter. - */ - public String getParameter(String name) { -- return (String)atts.get(name.toLowerCase()); -+ return atts.get(name.toLowerCase()); - } - - /** -@@ -202,12 +202,12 @@ - return (AppletContext)getParent(); - } - -- static void debug(String s) { -+ protected static void debug(String s) { - if(debug) - System.err.println("AppletViewerPanel:::" + s); - } - -- static void debug(String s, Throwable t) { -+ protected static void debug(String s, Throwable t) { - if(debug) { - t.printStackTrace(); - debug(s); diff --git a/be922f27d059.tar.bz2 b/be922f27d059.tar.bz2 new file mode 100644 index 0000000..bae83d6 --- /dev/null +++ b/be922f27d059.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:868083374cb6eb02ea5ab780f47702c224a50ea8dc7d9f67e10dcad9e731567d +size 1022358 diff --git a/cplusplus-interpreter.patch b/cplusplus-interpreter.patch deleted file mode 100644 index 4fba05f..0000000 --- a/cplusplus-interpreter.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- jdk8/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp Sat Dec 13 01:24:10 2014 +0300 -+++ jdk8/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp Mon Dec 15 09:36:46 2014 +0100 -@@ -394,7 +394,11 @@ - // during deoptimization so the interpreter needs to skip it when - // the frame is popped. - thread->set_do_not_unlock_if_synchronized(true); -+#ifdef CC_INTERP -+ return (address) -1; -+#else - return Interpreter::remove_activation_entry(); -+#endif - } - - // Need to do this check first since when _do_not_unlock_if_synchronized - diff --git a/d50c3672fd18.tar.bz2 b/d50c3672fd18.tar.bz2 new file mode 100644 index 0000000..dcf98fe --- /dev/null +++ b/d50c3672fd18.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:211d1a45b032066575e871ae4514f5db7f8313478a3ca9bad236c58e4892b48f +size 404702 diff --git a/e27a094cb423.tar.bz2 b/e27a094cb423.tar.bz2 deleted file mode 100644 index 7e18438..0000000 --- a/e27a094cb423.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b58c9a73828acc2b838548417e1dbbb5bd5f1f3b126d090002f81f32cc7fecff -size 2374834 diff --git a/e465c106bfe3.tar.bz2 b/e465c106bfe3.tar.bz2 deleted file mode 100644 index 399e6ad..0000000 --- a/e465c106bfe3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2d5d66811dc1f686948fd76b81dab3603042b644f3b2ec4ea59bfcca92ddb266 -size 2531264 diff --git a/e8e293d0db49.tar.bz2 b/e8e293d0db49.tar.bz2 new file mode 100644 index 0000000..7f9741f --- /dev/null +++ b/e8e293d0db49.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:632183f6a948decdbd9f784a2742d4902ac2ab5c87b24232b02afa5f6efe6050 +size 2380164 diff --git a/ee8642297369.tar.bz2 b/ee8642297369.tar.bz2 deleted file mode 100644 index 5dda769..0000000 --- a/ee8642297369.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af50c2ef686efd7bc9e6ea1ba8d6b0322716131a7778f9e952e0c93a88ff7890 -size 45439562 diff --git a/f01ca5e6b907.tar.bz2 b/f01ca5e6b907.tar.bz2 deleted file mode 100644 index b5955cf..0000000 --- a/f01ca5e6b907.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9b550ac2464ce2283d32e4fe7776dac9ee9253751d70580460e0e674af345c7 -size 2747615 diff --git a/hotspot-support-kernel-4.patch b/hotspot-support-kernel-4.patch deleted file mode 100644 index 0aacbc4..0000000 --- a/hotspot-support-kernel-4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- jdk8/hotspot/make/linux/Makefile 2015-05-05 15:23:20.129959059 +0200 -+++ jdk8/hotspot/make/linux/Makefile 2015-05-05 15:23:52.314222316 +0200 -@@ -229,7 +229,7 @@ - # Solaris 2.5.1, 2.6). - # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. - --SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% -+SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4% - OS_VERSION := $(shell uname -r) - EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) - diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes index 7078bfd..6bb6f28 100644 --- a/java-1_8_0-openjdk.changes +++ b/java-1_8_0-openjdk.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Wed Aug 19 08:12:09 UTC 2015 - fstrba@suse.com + +- Upgrade to upstream tag jdk8u60-b27 + * Release of JDK 8u60 +- Removed patches: + * hotspot-support-kernel-4.patch + * cplusplus-interpreter.patch + * signed-overflow.patch + - Integrated upstream + * system-giflib5.patch + - Fixed differently upstream + * applet-hole.patch + - Not needed any more with recent versions of icedtea-web +Modified patches + * aarch64-misc.patch + - Rediff to correspond to the new context + - Added bits from aarch64-port/jdk8/jdk + +------------------------------------------------------------------- +Tue Aug 18 13:04:22 UTC 2015 - fstrba@suse.com + +- Add constraints file + ------------------------------------------------------------------- Wed Jul 22 08:21:13 UTC 2015 - fstrba@suse.com diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec index 191a7cf..a8082ab 100644 --- a/java-1_8_0-openjdk.spec +++ b/java-1_8_0-openjdk.spec @@ -29,21 +29,21 @@ %global syslibdir %{_libdir} %global archname %{name} # Standard JPackage naming and versioning defines. -%global updatever 51 -%global buildver b16 +%global updatever 60 +%global buildver b27 %global root_project jdk8u %global root_repository jdk8u60 -%global root_revision 3ee37a71b2ab -%global corba_revision 3b9b39af6c36 -%global hotspot_revision 3639e38bd73f -%global jaxp_revision 050f5654fa19 -%global jaxws_revision e465c106bfe3 -%global jdk_revision ee8642297369 -%global langtools_revision e27a094cb423 -%global nashorn_revision f01ca5e6b907 +%global root_revision d50c3672fd18 +%global corba_revision be922f27d059 +%global hotspot_revision 10ad4b9d79f9 +%global jaxp_revision 8f260851e051 +%global jaxws_revision 975eb04d1795 +%global jdk_revision afbc08ea922b +%global langtools_revision e8e293d0db49 +%global nashorn_revision 72a33aed7dcc %global aarch64_project aarch64-port %global aarch64_repository jdk8 -%global aarch64_hotspot_revision 11098f828fb8 +%global aarch64_hotspot_revision 8ec803e97a0d %global icedtea_sound_version 1.0.1 # priority must be 6 digits in total %global priority 1805 @@ -211,40 +211,30 @@ Patch6: disable-doclint-by-default.patch Patch7: include-all-srcs.patch # Fix expression compares a char* pointer with a string literal Patch8: compare-pointer-with-literal.patch -# Add missing build bits for AArch64 from the AArch64 branch +# Backport stuff from aarch64-port Patch9: aarch64-misc.patch # From icedtea: Increase default memory limits Patch10: memory-limits.patch -# Fix hotspot for kernel 4.0 -Patch11: hotspot-support-kernel-4.patch # Fix use of unintialized memory in adlc parser Patch12: adlc-parser.patch # Fix: implicit-pointer-decl Patch13: implicit-pointer-decl.patch # Avoid triggering inactivity timeout while generating javadoc in zero VM Patch14: zero-javadoc-verbose.patch -# Fix to build the C++ interpreter that does not have Interpreter::remove_activation_entry -Patch15: cplusplus-interpreter.patch # Fix crash on zero virtual machine built with gcc5 Patch16: zero-dummy.patch -# July 2015 security fixes backported to aarch64 hotspot # # OpenJDK specific patches # -# Allow icedtea-web to build -Patch99: applet-hole.patch # JVM heap size changes for s390 (thanks to aph) Patch100: s390-java-opts.patch Patch101: s390-size_t.patch -# Fix OOM due to signed overflow -Patch102: signed-overflow.patch # Patch for PPC/PPC64 Patch103: ppc-zero-hotspot.patch # Patches for system libraries Patch201: system-libjpeg.patch Patch202: system-libpng.patch Patch203: system-lcms.patch -Patch204: system-giflib5.patch Patch205: link-with-as-needed.patch BuildRequires: alsa-lib-devel BuildRequires: autoconf @@ -504,7 +494,6 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2* %patch201 -p1 %patch202 -p1 %patch203 -p1 -%patch204 -p1 %patch205 -p1 %patch2 -p1 @@ -516,9 +505,6 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2* %patch8 -p1 %patch9 -p1 %patch10 -p1 -%ifnarch %aarch64 -%patch11 -p1 -%endif %patch12 -p1 %patch13 -p1 @@ -527,23 +513,11 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2* %patch16 -p1 %endif -%ifnarch %aarch64 -%patch15 -p1 -%endif - -%patch99 -p1 - -# s390 build fixes - %ifarch s390 %patch100 -p1 %patch101 -p1 %endif -%ifnarch %aarch64 -%patch102 -p1 -%endif - %ifarch ppc ppc64 ppc64le # PPC fixes %patch103 -p1 diff --git a/signed-overflow.patch b/signed-overflow.patch deleted file mode 100644 index 6203d91..0000000 --- a/signed-overflow.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- jdk8/hotspot/src/share/vm/opto/type.cpp Thu Apr 23 16:38:08 2015 +0200 -+++ jdk8/hotspot/src/share/vm/opto/type.cpp Wed Apr 29 12:23:48 2015 -0700 -@@ -1158,11 +1158,11 @@ - // Certain normalizations keep us sane when comparing types. - // The 'SMALLINT' covers constants and also CC and its relatives. - if (lo <= hi) { -- if ((juint)(hi - lo) <= SMALLINT) w = Type::WidenMin; -- if ((juint)(hi - lo) >= max_juint) w = Type::WidenMax; // TypeInt::INT -+ if (((juint)hi - lo) <= SMALLINT) w = Type::WidenMin; -+ if (((juint)hi - lo) >= max_juint) w = Type::WidenMax; // TypeInt::INT - } else { -- if ((juint)(lo - hi) <= SMALLINT) w = Type::WidenMin; -- if ((juint)(lo - hi) >= max_juint) w = Type::WidenMin; // dual TypeInt::INT -+ if (((juint)lo - hi) <= SMALLINT) w = Type::WidenMin; -+ if (((juint)lo - hi) >= max_juint) w = Type::WidenMin; // dual TypeInt::INT - } - return w; - } -@@ -1416,11 +1416,11 @@ - // Certain normalizations keep us sane when comparing types. - // The 'SMALLINT' covers constants. - if (lo <= hi) { -- if ((julong)(hi - lo) <= SMALLINT) w = Type::WidenMin; -- if ((julong)(hi - lo) >= max_julong) w = Type::WidenMax; // TypeLong::LONG -+ if (((julong)hi - lo) <= SMALLINT) w = Type::WidenMin; -+ if (((julong)hi - lo) >= max_julong) w = Type::WidenMax; // TypeLong::LONG - } else { -- if ((julong)(lo - hi) <= SMALLINT) w = Type::WidenMin; -- if ((julong)(lo - hi) >= max_julong) w = Type::WidenMin; // dual TypeLong::LONG -+ if (((julong)lo - hi) <= SMALLINT) w = Type::WidenMin; -+ if (((julong)lo - hi) >= max_julong) w = Type::WidenMin; // dual TypeLong::LONG - } - return w; - } - diff --git a/system-giflib5.patch b/system-giflib5.patch deleted file mode 100644 index 00d7d3b..0000000 --- a/system-giflib5.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2014-09-26 08:52:13.001303676 +0200 -+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2014-09-26 08:53:14.143887542 +0200 -@@ -310,7 +310,14 @@ - free(pBitmapBits); - free(pOldBitmapBits); - -+#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1 -+ int error = 0; -+ DGifCloseFile(gif, &error); -+ if (error) -+ return 0; -+#else - DGifCloseFile(gif); -+#endif - - return 1; - } -@@ -318,9 +325,18 @@ - int - SplashDecodeGifStream(Splash * splash, SplashStream * stream) - { -+#ifdef GIFLIB_MAJOR >= 5 -+ int error = 0; -+ GifFileType *gif = DGifOpen((void *) stream, SplashStreamGifInputFunc, &error); -+ -+ if (error) -+ return 0; -+#else - GifFileType *gif = DGifOpen((void *) stream, SplashStreamGifInputFunc); - - if (!gif) - return 0; -+#endif -+ - return SplashDecodeGif(splash, gif); - }