Accepting request 391903 from Java:Factory:Sandbox

I want this one OBS-URL: https://build.opensuse.org/request/show/391903 OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=142
2016-04-28 08:08:13 +00:00 · 2016-04-28 08:08:13 +00:00 · fdd0c4a797
commit fdd0c4a797
parent 18de956ab4
49 changed files with 211 additions and 5000 deletions
--- a/1015432.patch
+++ b/1015432.patch
@ -1,5 +1,5 @@
--- jdk8/hotspot/src/os/linux/vm/os_linux.cpp	Wed Oct 23 15:44:12 2013 -0700
-+++ jdk8/hotspot/src/os/linux/vm/os_linux.cpp	Thu Dec 19 16:03:33 2013 +0000
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp	Wed Oct 23 15:44:12 2013 -0700
+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	Thu Dec 19 16:03:33 2013 +0000
@@ -4797,9 +4797,19 @@ 
   // size.  Add a page for compiler2 recursion in main thread.
   // Add in 2*BytesPerWord times page size to account for VM stack during
--- a/574417338118.tar.bz2
+++ b/574417338118.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0404081548aedea9c5058832f097cc3a7caefadc9d829ae2743295f64677559c
-size 408222
--- a/6296644a2c9c.tar.bz2
+++ b/6296644a2c9c.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:671c033bff7280bd36462ae3245d9ca8ee8d124f220e3546961328740b504605
-size 2845026
--- a/8921667c26ba.tar.bz2
+++ b/8921667c26ba.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:32e05569053a1536454cc24751da615a3bda2840fbbcc47b4000c3185e3e2935
-size 2378749
--- a/8e05c47f805f.tar.bz2
+++ b/8e05c47f805f.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:082f9de220bf98396031c833536f5ba060f1785ce5b8efb49760f75ad52d1dee
-size 8134367
--- a/PStack-808293.patch
+++ b/PStack-808293.patch
@ -1,40 +0,0 @@
--- jdk8/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java	2012-04-06 02:26:33.322164601 +0200
-+++ jdk8/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java	2012-04-06 02:26:57.958514071 +0200
-@@ -1,5 +1,6 @@
- /*
-  * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2012, Red Hat Inc.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -84,7 +85,8 @@
-                out.print("----------------- ");
-                out.print(th);
-                out.println(" -----------------");
-               while (f != null) {
-+               int maxStack = 256;
-+               while (f != null && maxStack-- > 0) {
-                   ClosestSymbol sym = f.closestSymbolToPC();
-                   Address pc = f.pc();
-                   out.print(pc + "\t");
-@@ -158,10 +160,19 @@
-                          }
-                       }
-                   }
-+                  Address oldPC = f.pc();
-+                  Address oldFP = f.localVariableBase();
-                   f = f.sender(th);
-+                  if (f != null
-+                      && oldPC.equals(f.pc())
-+                      && oldFP.equals(f.localVariableBase())) {
-+                      // We didn't make any progress
-+                      f = null;
-+                  }
-                }
-             } catch (Exception exp) {
-               exp.printStackTrace();
-+               // exp.printStackTrace();
-+               out.println("bad stack: " + exp);
-                // continue, may be we can do a better job for other threads
-             }
-             if (concurrentLocks) {
--- a/TestCryptoLevel.java
+++ b/TestCryptoLevel.java
@ -1,72 +0,0 @@
-/* TestCryptoLevel -- Ensure unlimited crypto policy is in use.
-   Copyright (C) 2012 Red Hat, Inc.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program 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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-
-import java.security.Permission;
-import java.security.PermissionCollection;
-
-public class TestCryptoLevel
-{
-  public static void main(String[] args)
-    throws NoSuchFieldException, ClassNotFoundException,
-           IllegalAccessException, InvocationTargetException
-  {
-    Class<?> cls = null;
-    Method def = null, exempt = null;
-
-    try
-      {
-        cls = Class.forName("javax.crypto.JceSecurity");
-      }
-    catch (ClassNotFoundException ex)
-      {
-        System.err.println("Running a non-Sun JDK.");
-        System.exit(0);
-      }
-    try
-      {
-        def = cls.getDeclaredMethod("getDefaultPolicy");
-        exempt = cls.getDeclaredMethod("getExemptPolicy");
-      }
-    catch (NoSuchMethodException ex)
-      {
-        System.err.println("Running IcedTea with the original crypto patch.");
-        System.exit(0);
-      }
-    def.setAccessible(true);
-    exempt.setAccessible(true);
-    PermissionCollection defPerms = (PermissionCollection) def.invoke(null);
-    PermissionCollection exemptPerms = (PermissionCollection) exempt.invoke(null);
-    Class<?> apCls = Class.forName("javax.crypto.CryptoAllPermission");
-    Field apField = apCls.getDeclaredField("INSTANCE");
-    apField.setAccessible(true);
-    Permission allPerms = (Permission) apField.get(null);
-    if (defPerms.implies(allPerms) && (exemptPerms == null || exemptPerms.implies(allPerms)))
-      {
-        System.err.println("Running with the unlimited policy.");
-        System.exit(0);
-      }
-    else
-      {
-        System.err.println("WARNING: Running with a restricted crypto policy.");
-        System.exit(-1);
-      }
-  }
-}
--- a/aarch64-misc.patch
+++ b/aarch64-misc.patch
@ -1,211 +0,0 @@
--- 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)
-+      VAR_CPU=aarch64
-+      VAR_CPU_ARCH=aarch64
-+      VAR_CPU_BITS=64
-+      VAR_CPU_ENDIAN=little
-+      ;;
-     powerpc)
-       VAR_CPU=ppc
-       VAR_CPU_ARCH=ppc
-@@ -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 )
-      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
-@@ -29899,6 +29909,9 @@
-     s390)
-       ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}31"
-       ;;
-+    aarch64)
-+      ZERO_ARCHFLAG=""
-+      ;;
-     *)
-       ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-   esac
--- 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), \
-    LDEXE := $(BUILD_LD), \
-+    LDEXE := $(BUILD_CC), \
-     OBJECT_DIR := $(GENSRC_SOR_BIN), \
-     OUTPUT_DIR := $(GENSRC_SOR_BIN), \
-     PROGRAM := genSocketOptionRegistry))
--- 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
-   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	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
- #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	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.
-+#
-+# 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
--- a/adlc-parser.patch
+++ b/adlc-parser.patch
@ -1,5 +1,5 @@
--- jdk8/hotspot/src/share/vm/adlc/formsopt.cpp	2014-07-03 21:56:12.000000000 +0200
-+++ jdk8/hotspot/src/share/vm/adlc/formsopt.cpp	2014-07-14 11:43:21.900408570 +0200
+--- openjdk/hotspot/src/share/vm/adlc/formsopt.cpp	2014-07-03 21:56:12.000000000 +0200
+++ openjdk/hotspot/src/share/vm/adlc/formsopt.cpp	2014-07-14 11:43:21.900408570 +0200
@@ -347,6 +347,7 @@
   _return_value = NULL;
   _c_return_value = NULL;
--- a/compare-pointer-with-literal.patch
+++ b/compare-pointer-with-literal.patch
@ -1,5 +1,5 @@
--- jdk8/jdk/src/solaris/native/sun/awt/awt_Font.c	2014-06-23 01:01:34.000000000 +0200
-+++ jdk8/jdk/src/solaris/native/sun/awt/awt_Font.c	2014-07-08 23:22:33.235559628 +0200
+--- openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c	2014-06-23 01:01:34.000000000 +0200
+++ openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c	2014-07-08 23:22:33.235559628 +0200
@@ -502,7 +502,7 @@
             jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10,
                          nativename, size * 10);
--- a/config.guess
+++ b/config.guess
--- a/config.sub
+++ b/config.sub
--- a/corba.tar.xz
+++ b/corba.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42351003e03f8893435e424e652558ac7e6e7af86a0cf01338c84184b8ab6e50
+size 937360
--- a/disable-doclint-by-default.patch
+++ b/disable-doclint-by-default.patch
@ -1,58 +0,0 @@
-Disable doclint by default
-
-OpenJDK 8 adds and enables doclint by default. This catches issues in
-javadoc comments. It is too strict, breaks javadoc compilation and, in
-general, breaks the build for old code known to build with previous
-versions of OpenJDK.
-
-See: http://blog.joda.org/2014/02/turning-off-doclint-in-jdk-8-javadoc.html
-See: https://lists.fedoraproject.org/pipermail/java-devel/2014-February/005150.html
-
-Author: Andrew John Hughes <ahughes@redhat.com>
-Author: Emmanuel Bourg <ebourg@apache.org>
--- jdk8/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
-+++ jdk8/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
-@@ -811,10 +811,9 @@
-             doclintOpts.add(opt == null ? DocLint.XMSGS_OPTION : DocLint.XMSGS_CUSTOM_PREFIX + opt);
-         }
- 
-        if (doclintOpts.isEmpty()) {
-            doclintOpts.add(DocLint.XMSGS_OPTION);
-        } else if (doclintOpts.size() == 1
-                && doclintOpts.get(0).equals(DocLint.XMSGS_CUSTOM_PREFIX + "none")) {
-+        if (doclintOpts.isEmpty() ||
-+	    (doclintOpts.size() == 1
-+	     && doclintOpts.get(0).equals(DocLint.XMSGS_CUSTOM_PREFIX + "none"))) {
-             return;
-         }
- 
--- jdk8/langtools/test/tools/javadoc/doclint/DocLintTest.java
-+++ jdk8/langtools/test/tools/javadoc/doclint/DocLintTest.java
-@@ -130,12 +130,12 @@
-         };
- 
-         test(Collections.<String>emptyList(),
-                Main.Result.ERROR,
-                EnumSet.of(Message.DL_ERR9A, Message.DL_WRN12A));
-+                Main.Result.OK,
-+                EnumSet.of(Message.JD_WRN10, Message.JD_WRN13));
- 
-         test(Arrays.asList(rawDiags),
-                Main.Result.ERROR,
-                EnumSet.of(Message.DL_ERR9, Message.DL_WRN12));
-+                Main.Result.OK,
-+                EnumSet.of(Message.JD_WRN10, Message.JD_WRN13));
- 
-         test(Arrays.asList("-Xdoclint:none"),
-                 Main.Result.OK,
-@@ -158,8 +158,8 @@
-                 EnumSet.of(Message.DL_WRN12));
- 
-         test(Arrays.asList(rawDiags, "-private"),
-                Main.Result.ERROR,
-                EnumSet.of(Message.DL_ERR6, Message.DL_ERR9, Message.DL_WRN12));
-+                Main.Result.OK,
-+                EnumSet.of(Message.JD_WRN10, Message.JD_WRN13));
- 
-         test(Arrays.asList(rawDiags, "-Xdoclint:syntax", "-private"),
-                 Main.Result.ERROR,
--- a/e71f424e2c96.tar.bz2
+++ b/e71f424e2c96.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb9c157d2e9457d9cb88bf06931382fd47a12d3026e5047601b8409d0faa5dc3
-size 2535138
--- a/f6bda5729ff8.tar.bz2
+++ b/f6bda5729ff8.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a70df35fd5112630d2190c3d5d48d931194c69de2442d74864c33a7b2d67aab8
-size 2734861
--- a/f8725698a870.tar.bz2
+++ b/f8725698a870.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:119fb0834275f0184b35554934a03d0286b412153d8f6f8e1bdaed0f74d5402b
-size 45976419
--- a/f8d0cfaa9900.tar.bz2
+++ b/f8d0cfaa9900.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:24ed9a0f35bbf8d06943664c117d2bcadc23bc2b5e2eb8363d8abcbc14cedb41
-size 1024798
--- a/fa8991ccf6e5.tar.bz2
+++ b/fa8991ccf6e5.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0bff4c723dbf691d3c71eba1108c7b18ed1bb16c0a740875e85ffaf8d6132d9c
-size 7803301
--- a/hotspot.tar.xz
+++ b/hotspot.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c15794ae90ee52222b73a5c8eb0a397062226fe8215aeed72fdf28f9c26780de
+size 6767200
--- a/icedtea-3.0.1-sunec.patch
+++ b/icedtea-3.0.1-sunec.patch
@ -0,0 +1,22 @@
+--- icedtea-3.0.1/acinclude.m4	2016-04-24 08:37:02.061302798 +0200
+++ icedtea-3.0.1/acinclude.m4	2016-04-25 13:04:21.040872931 +0200
+@@ -1959,7 +1959,7 @@
+     PKG_CHECK_MODULES(NSS_JAVA, nss-java, [NSS_JAVA_FOUND=yes], [NSS_JAVA_FOUND=no])
+     if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
+       SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS;
+-      SUNEC_LIBS="-lfreebl $NSS_LIBS";
+      SUNEC_LIBS=$NSS_SOFTOKN_LIBS;
+    elif test "x${NSS_JAVA_FOUND}" = "xyes"; then
+       SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS";
+       SUNEC_LIBS=$NSS_JAVA_LIBS;
+--- icedtea-3.0.1/configure	2016-04-24 08:37:14.373081753 +0200
+++ icedtea-3.0.1/configure	2016-04-25 13:05:26.851392635 +0200
+@@ -7925,7 +7925,7 @@
+ fi
+     if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
+       SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS;
+-      SUNEC_LIBS="-lfreebl $NSS_LIBS";
+      SUNEC_LIBS=$NSS_SOFTOKN_LIBS;
+    elif test "x${NSS_JAVA_FOUND}" = "xyes"; then
+       SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS";
+       SUNEC_LIBS=$NSS_JAVA_LIBS;
--- a/icedtea-3.0.1.tar.xz
+++ b/icedtea-3.0.1.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:346ce30de1de6c493729b79b246f250438fc5b8df7eae47229a97f9000a73af2
+size 1403400
--- a/implicit-pointer-decl.patch
+++ b/implicit-pointer-decl.patch
@ -1,5 +1,5 @@
--- jdk8/jdk/src/share/instrument/JarFacade.c	2014-07-03 00:01:31.000000000 +0200
-+++ jdk8/jdk/src/share/instrument/JarFacade.c	2014-07-15 08:45:35.144295472 +0200
+--- openjdk/jdk/src/share/instrument/JarFacade.c	2014-07-03 00:01:31.000000000 +0200
+++ openjdk/jdk/src/share/instrument/JarFacade.c	2014-07-15 08:45:35.144295472 +0200
@@ -23,14 +23,7 @@
  * questions.
  */
--- a/include-all-srcs.patch
+++ b/include-all-srcs.patch
@ -1,54 +0,0 @@
--- jdk8/jdk/make/CreateJars.gmk
-+++ jdk8/jdk/make/CreateJars.gmk
-@@ -569,38 +569,12 @@
- ##########################################################################################
- 
- SRC_ZIP_INCLUDES = \
-    com/sun/corba \
-    com/sun/image/codec/jpeg \
-    com/sun/imageio \
-    com/sun/java_cup \
-    com/sun/javadoc \
-    com/sun/java/swing \
-    com/sun/jmx \
-    com/sun/naming \
-    com/sun/org/apache \
-    com/sun/security/auth \
-    com/sun/security/jgss \
-    com/sun/source \
-+    com \
-     java \
-    javax/accessibility \
-    javax/annotation \
-    javax/imageio \
-    javax/lang \
-    javax/management \
-    javax/naming \
-    javax/print \
-    javax/rmi \
-    javax/script \
-    javax/security \
-    javax/sound \
-    javax/sql \
-    javax/swing \
-    javax/tools \
-    javax/xml \
-    org/ietf \
-    org/omg \
-    org/w3c/dom \
-    org/xml/sax \
-+    javax \
-+    jdk \
-+    org \
-+    sun \
-     #
- 
- SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes
-@@ -632,7 +606,6 @@
- $(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
-     SRC := $(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src, \
-     INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \
-    EXCLUDES := javax/swing/beaninfo, \
-     SUFFIXES := .java .c .h, \
-     ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
-     EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))
--- a/java-1_8_0-openjdk-suse-desktop-files.patch
+++ b/java-1_8_0-openjdk-suse-desktop-files.patch
@ -0,0 +1,30 @@
+--- icedtea-3.0.1/jconsole.desktop.in	2016-04-24 08:37:01.989304092 +0200
+++ icedtea-3.0.1/jconsole.desktop.in	2016-04-27 09:46:17.592085490 +0200
+@@ -1,10 +1,11 @@
+ [Desktop Entry]
+ Name=OpenJDK @JAVA_VER@ Monitoring & Management Console
+GenericName=OpenJDK @JAVA_VER@ Policy Tool
+ Comment=Monitor and manage OpenJDK applications
+ Exec=_BINDIR_/jconsole
+ Icon=java
+ Terminal=false
+ Type=Application
+ StartupWMClass=sun-tools-jconsole-JConsole
+-Categories=Development;Monitor;Java;
+Categories=Development;Profiling;
+ Version=1.0
+--- icedtea-3.0.1/policytool.desktop.in	2016-04-24 08:37:02.001303877 +0200
+++ icedtea-3.0.1/policytool.desktop.in	2016-04-27 09:45:32.061111551 +0200
+@@ -1,10 +1,11 @@
+ [Desktop Entry]
+ Name=OpenJDK @JAVA_VER@ Policy Tool
+GenericName=OpenJDK @JAVA_VER@ Policy Tool
+ Comment=Manage OpenJDK policy files
+ Exec=_BINDIR_/policytool
+ Icon=java
+ Terminal=false
+ Type=Application
+ StartupWMClass=sun-security-tools-PolicyTool
+-Categories=Development;Java;
+Categories=System;DesktopSettings;Security;
+ Version=1.0
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@ -18,9 +18,9 @@

 %{!?aarch64:%global aarch64 aarch64 arm64 armv8}
 %global jit_arches %ix86 x86_64 ppc64 ppc64le %aarch64
-%global debug 0
-%global bootcycle 1
-%global buildoutputdir build
+%global icedtea_version 3.0.1
+%global icedtea_sound_version 1.0.1
+%global buildoutputdir openjdk.build/
 # Convert an absolute path to a relative path.  Each symbolic link is
 # specified relative to the directory in which it is installed so that
 # it will resolve properly within chrooted installations.
@ -29,25 +29,10 @@
 %global syslibdir       %{_libdir}
 %global archname        %{name}
 # Standard JPackage naming and versioning defines.
-%global updatever       91
-%global buildver        b14
-%global root_project    jdk8u
-%global root_repository jdk8u
-%global root_revision   574417338118
-%global corba_revision  f8d0cfaa9900
-%global hotspot_revision fa8991ccf6e5
-%global jaxp_revision   f6bda5729ff8
-%global jaxws_revision  e71f424e2c96
-%global jdk_revision    f8725698a870
-%global langtools_revision 8921667c26ba
-%global nashorn_revision 6296644a2c9c
-%global aarch64_project aarch64-port
-%global aarch64_repository jdk8u
-%global aarch64_hotspot_revision 8e05c47f805f
-%global icedtea_sound_version 1.0.1
 # priority must be 6 digits in total
 %global priority        1805
 %global javaver         1.8.0
+%global updatever       91
 # Standard JPackage directories and symbolic links.
 %global sdklnk          java-%{javaver}-openjdk
 %global archname        %{sdklnk}
@ -73,6 +58,11 @@
 %else
 %global with_pulseaudio 0
 %endif
+%if 0%{?suse_version} >= 1220
+%global with_system_lcms 1
+%else
+%global with_system_lcms 0
+%endif
 %ifarch x86_64
 %global archinstall amd64
 %endif
@ -114,18 +104,6 @@
 %ifnarch %{jit_arches}
 %global archinstall %{_arch}
 %endif
-%if %{debug}
-%global debugbuild slowdebug
-%else
-%global debugbuild release
-%endif
-%if %{bootcycle}
-%global imagesdir bootcycle-build/images
-%global imagestarget bootcycle-images
-%else
-%global imagesdir images
-%global imagestarget images
-%endif
 %ifnarch %{jit_arches}
 %global _with_zero 1
 %endif
@ -140,6 +118,11 @@
 %if 0%{?__isa_bits}
 %global bits %{__isa_bits}
 %endif
+%if 0%{?suse_version} >= 1330
+%global with_sunec 1
+%else
+%global with_sunec 0
+%endif
 %bcond_with zero
 # Turn on/off some features depending on openSUSE version
 %if 0%{?suse_version} >= 1130
@ -152,10 +135,6 @@
 %global with_systemtap 0
 %endif
 %if %{with_systemtap}
-%global tapsetroot      %{_datadir}/systemtap
-%global tapsetdir %{tapsetroot}/tapset/%{_build_cpu}
-%endif
-%if %{with_systemtap}
 # Where to install systemtap tapset (links)
 # We would like these to be in a package specific subdir,
 # but currently systemtap doesn't support that, so we have to
@ -174,72 +153,36 @@ Summary:        OpenJDK 8 Runtime Environment
 License:        Apache-1.1 and Apache-2.0 and GPL-1.0+ and GPL-2.0 and GPL-2.0-with-classpath-exception and LGPL-2.0 and MPL-1.0 and MPL-1.1 and SUSE-Public-Domain and W3C
 Group:          Development/Languages/Java
 Url:            http://openjdk.java.net/
-# Sources from upstream OpenJDK8 project.
-Source0:        http://hg.openjdk.java.net/%{root_project}/%{root_repository}/archive/%{root_revision}.tar.bz2
-Source1:        http://hg.openjdk.java.net/%{root_project}/%{root_repository}/corba/archive/%{corba_revision}.tar.bz2
-Source2:        http://hg.openjdk.java.net/%{root_project}/%{root_repository}/hotspot/archive/%{hotspot_revision}.tar.bz2
-Source3:        http://hg.openjdk.java.net/%{root_project}/%{root_repository}/jaxp/archive/%{jaxp_revision}.tar.bz2
-Source4:        http://hg.openjdk.java.net/%{root_project}/%{root_repository}/jaxws/archive/%{jaxws_revision}.tar.bz2
-Source5:        http://hg.openjdk.java.net/%{root_project}/%{root_repository}/jdk/archive/%{jdk_revision}.tar.bz2
-Source6:        http://hg.openjdk.java.net/%{root_project}/%{root_repository}/langtools/archive/%{langtools_revision}.tar.bz2
-Source7:        http://hg.openjdk.java.net/%{root_project}/%{root_repository}/nashorn/archive/%{nashorn_revision}.tar.bz2
-# Hotspot version from aarch64-port repository (using the _tip_ of the http://hg.openjdk.java.net/%{aarch64_project}/%{aarch64_repository}/hotspot)
-Source8:        http://hg.openjdk.java.net/%{aarch64_project}/%{aarch64_repository}/hotspot/archive/%{aarch64_hotspot_revision}.tar.bz2
-# Pulseaudio plugin
-Source9:        http://icedtea.classpath.org/download/source/icedtea-sound-%{icedtea_sound_version}.tar.xz
-# Systemtap tapsets. Zipped up to keep it small.
-Source10:       systemtap-tapset.tar.gz
-# Desktop files. Adapated from IcedTea.
-Source11:       jconsole.desktop.in
-Source12:       policytool.desktop.in
-# nss configuration file
-Source13:       nss.cfg
-# Ensure we aren't using the limited crypto policy
-Source14:       TestCryptoLevel.java
-# New versions of config files with aarch64 support. This is not upstream yet.
-Source100:      config.guess
-Source101:      config.sub
+Source0:        http://icedtea.classpath.org/download/source/icedtea-%{icedtea_version}.tar.xz
+Source1:        http://icedtea.classpath.org/download/source/icedtea-sound-%{icedtea_sound_version}.tar.xz
+Source2:        http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/openjdk.tar.xz
+Source3:        http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/corba.tar.xz
+Source4:        http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/jaxp.tar.xz
+Source5:        http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/jaxws.tar.xz
+Source6:        http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/jdk.tar.xz
+Source7:        http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/langtools.tar.xz
+Source8:        http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/hotspot.tar.xz
+Source9:        http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/nashorn.tar.xz
 # RPM/distribution specific patches
 # RHBZ 1015432
 Patch2:         1015432.patch
 # Restrict access to java-atk-wrapper classes
 Patch3:         java-atk-wrapper-security.patch
-# RHBZ 808293
-Patch4:         PStack-808293.patch
-# Allow multiple initialization of PKCS11 libraries
-Patch5:         multiple-pkcs11-library-init.patch
-# Disable doclint for compatibility
-Patch6:         disable-doclint-by-default.patch
-# Include all sources in src.zip
-Patch7:         include-all-srcs.patch
 # Fix expression compares a char* pointer with a string literal
 Patch8:         compare-pointer-with-literal.patch
-# Backport stuff from aarch64-port
-Patch9:         aarch64-misc.patch
-# From icedtea: Increase default memory limits
-Patch10:        memory-limits.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 crash on zero virtual machine built with gcc5
-Patch16:        zero-dummy.patch
 #
 # OpenJDK specific patches
 #
-# JVM heap size changes for s390 (thanks to aph)
-Patch100:       s390-java-opts.patch
-Patch101:       s390-size_t.patch
-# Patch for PPC/PPC64
+# Patch for PPC
 Patch103:       ppc-zero-hotspot.patch
-Patch104:       ppc64le-8036767.patch
-# Patches for system libraries
-Patch201:       system-libjpeg.patch
-Patch202:       system-libpng.patch
-Patch203:       system-lcms.patch
-Patch205:       link-with-as-needed.patch
+Patch1000:      icedtea-3.0.1-sunec.patch
+Patch1001:      java-1_8_0-openjdk-suse-desktop-files.patch
 BuildRequires:  alsa-lib-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@ -252,13 +195,17 @@ BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
 BuildRequires:  giflib-devel
 BuildRequires:  gtk2-devel
+BuildRequires:  java-bootstrap-devel >= 1.6.0
+BuildRequires:  libXcomposite-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  liblcms2-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libxslt
+BuildRequires:  mozilla-nss-devel
 BuildRequires:  pkgconfig
 BuildRequires:  unzip
 BuildRequires:  update-desktop-files
+BuildRequires:  wget
 BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  zip
 # Requires rest of java
@ -308,11 +255,6 @@ BuildRequires:  libXinerama-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXtst-devel
 %endif
-%if %{bootcycle}
-BuildRequires:  java-bootstrap-devel >= 1.6.0
-%else
-BuildRequires:  java-devel >= %{javaver}
-%endif
 # runtime certificates generation available in 11.3+ - bnc#596177
 %if 0%{?suse_version} >= 1130
 BuildRequires:  java-ca-certificates
@ -444,96 +386,16 @@ There are known issues with accessibility on, so please do not install
 this package unless you really need to.

 %prep
-%setup -q -n %{root_repository}-%{root_revision}
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 1
-%ifarch %aarch64
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 8
-%else
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 2
-%endif
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 3
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 4
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 5
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 6
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 7
+%setup -q -n icedtea-%{icedtea_version}
+%setup -q -D -n icedtea-%{icedtea_version} -T -a 1

-%if %{with_pulseaudio}
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 9
-%endif
-
-# Set up the build tree using the subrepository tarballs
-pwd
-mv corba-%{corba_revision} corba
-
-%ifarch %aarch64
-mv hotspot-%{aarch64_hotspot_revision} hotspot
-%else
-mv hotspot-%{hotspot_revision} hotspot
-%endif
-mv jaxp-%{jaxp_revision} jaxp
-mv jaxws-%{jaxws_revision} jaxws
-mv jdk-%{jdk_revision} jdk
-mv langtools-%{langtools_revision} langtools
-mv nashorn-%{nashorn_revision} nashorn
-
-%if %{with_pulseaudio}
-mv icedtea-sound-%{icedtea_sound_version} icedtea-sound
-%endif
-
-# replace outdated configure guess script
-#
-# the configure macro will do this too, but it also passes a few flags not
-# supported by openjdk configure script
-cp %{SOURCE100} common/autoconf/build-aux/
-cp %{SOURCE101} common/autoconf/build-aux/
-
-# Remove libraries that are linked
-rm -rvf jdk/src/share/native/java/util/zip/zlib-*
-find jdk/src/share/native/sun/awt/image/jpeg ! -name imageioJPEG.c ! -name jpegdecoder.c -type f -delete
-rm -rvf jdk/src/share/native/sun/awt/libpng
-rm -rvf jdk/src/share/native/sun/awt/giflib
-rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/cms*
-rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
-
-%patch201 -p1
-%patch202 -p1
-%patch203 -p1
-%patch205 -p1
-
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch12 -p1
-%patch13 -p1
-
-%if %{with zero}
-%patch14 -p1
-%patch16 -p1
-%endif
-
-%ifarch s390
-%patch100 -p1
-%patch101 -p1
-%endif
-
-%ifarch ppc ppc64 ppc64le
-# PPC fixes
-%patch103 -p1
-%patch104 -p1
-%endif
+%patch1000 -p1
+%patch1001 -p1

 # Extract systemtap tapsets

 %if %{with_systemtap}

-tar xzf %{SOURCE10}
-
 for file in tapset/*.in; do

    OUTPUT_FILE=`echo $file | sed -e s:\.in$::g`
@ -552,14 +414,10 @@ done

 %endif

-# Prepare desktop files
-for file in %{SOURCE11} %{SOURCE12} ; do
-    OUTPUT_FILE=`basename $file | sed -e s:\.in$::g`
-    sed -e s:@JAVA_HOME@:%{_jvmdir}/%{sdkdir}:g $file > $OUTPUT_FILE
-    sed -i -e s:@VERSION@:%{javaver}.%{_arch}:g $OUTPUT_FILE
-done
-
 %build
+export LANG=C
+unset JAVA_HOME
+
 # How many cpu's do we have?
 export NUM_PROC=`%{_bindir}/getconf _NPROCESSORS_ONLN 2> /dev/null || :`
 export NUM_PROC=${NUM_PROC:-1}
@ -570,75 +428,86 @@ export ZLIB_CFLAGS=" "
 export ZLIB_LIBS="-L/%{_lib} -lz"
 %endif

-# Build IcedTea and OpenJDK.
+export CFLAGS=$(rpm -E '%{optflags}' | sed 's/-Wall\>//')
+export CXXFLAGS=${CFLAGS}

-%ifarch s390x sparc64 alpha ppc64 ppc64le %aarch64
-export ARCH_DATA_MODEL=64
+%if %{with_sunec}
+export NSS_SOFTOKN_CFLAGS="`pkg-config --cflags nss` -I`pwd`"
+export NSS_SOFTOKN_LIBS="-L%{_libdir} -lnssdbm3 -lsoftokn3 -lssl3 -lsmime3 -lnss3 -lnssutil3 -lfreebl -L%{_libdir}/nspr -lplds4 -lplc4 -lnspr4"
+export NSS_CFLAGS="$NSS_SOFTOKN_CFLAGS"
+export NSS_LIBS="$NSS_SOFTOKN_LIBS"
 %endif

-%ifarch alpha
-export CFLAGS="$CFLAGS -mieee"
+sh autogen.sh
+%configure \
+%if %{with_sunec}
+        --enable-sunec \
+%endif
+%ifarch s390
+        --disable-bootstrap \
+%else
+        --enable-bootstrap \
+%endif
+        --disable-infinality \
+        --disable-downloading \
+        --with-abs-install-dir=%{_jvmdir}/%{sdkdir} \
+%ifnarch %arm %aarch64
+        --with-parallel-jobs="${NUM_PROC}" \
+%endif
+        --with-pkgversion="suse-%{release}-%{_arch}" \
+        --with-jdk-home="%{_sysconfdir}/alternatives/java_sdk" \
+%if %{with_systemtap}
+        --enable-systemtap \
+%endif
+%if %{with zero}
+        --enable-zero \
+%endif
+%if 0%{?suse_version} <= 1110
+        --disable-system-gio \
+        --disable-system-gconf \
+%endif
+%if %{with_system_lcms}
+        --enable-system-lcms \
+%else
+        --disable-system-lcms \
+%endif
+        --with-openjdk-src-zip=%{SOURCE2} \
+        --with-corba-src-zip=%{SOURCE3} \
+        --with-jaxp-src-zip=%{SOURCE4} \
+        --with-jaxws-src-zip=%{SOURCE5} \
+        --with-jdk-src-zip=%{SOURCE6} \
+        --with-langtools-src-zip=%{SOURCE7} \
+        --with-hotspot-src-zip=%{SOURCE8} \
+        --with-nashorn-src-zip=%{SOURCE9}
+
+make patch %{?_smp_mflags}
+
+patch -p0 -i %{PATCH2}
+patch -p0 -i %{PATCH3}
+patch -p0 -i %{PATCH8}
+patch -p0 -i %{PATCH12}
+patch -p0 -i %{PATCH13}
+
+%if %{with zero}
+patch -p0 -i %{PATCH14}
 %endif

-(cd common/autoconf
+%ifarch ppc ppc64 ppc64le
+# PPC fixes
+patch -p0 -i %{PATCH103}
+%endif
+
+(cd openjdk/common/autoconf
 bash ./autogen.sh
 )

-mkdir -p %{buildoutputdir}
+make %{?_smp_mflags}

-pushd %{buildoutputdir}
-
-bash ../configure \
-%if %{with zero}
-    --with-jvm-variants=zero \
-%endif
-    --disable-zip-debug-info \
-    --with-milestone="fcs" \
-    --with-update-version=%{updatever} \
-    --with-build-number=%{buildver} \
-    --with-debug-level=%{debugbuild} \
-    --enable-unlimited-crypto \
-    --with-zlib=system \
-    --with-libjpeg=system \
-    --with-giflib=system \
-    --with-libpng=system \
-    --with-lcms=system \
-    --with-stdc++lib=dynamic \
-%ifnarch %arm
-    --with-num-cores="$NUM_PROC" \
-%endif
-%if 0%{?suse_version} >= 1120
-    --with-extra-cflags="-fno-devirtualize" \
-    --with-extra-cxxflags="-fno-devirtualize" \
-%endif
-    --with-boot-jdk=%{_sysconfdir}/alternatives/java_sdk
-
-# The combination of FULL_DEBUG_SYMBOLS=0 and ALT_OBJCOPY=/does_not_exist
-# disables FDS for all build configs and reverts to pre-FDS make logic.
-# STRIP_POLICY=none says don't do any stripping. DEBUG_BINARIES=true says
-# ignore all the other logic about which debug options and just do '-g'.
-
-make \
-    DEBUG_BINARIES=true \
-    FULL_DEBUG_SYMBOLS=0 \
-    ZIP_DEBUGINFO_FILES=0 \
-    STRIP_POLICY=none \
-    POST_STRIP_CMD=true \
-    ALT_OBJCOPY=/does_not_exist \
-    LOG=debug \
-    %{imagestarget} docs
-
-# remove redundant *diz and *debuginfo files
-find %{imagesdir}/j2sdk-image -iname '*.diz' -exec rm {} \;
-find %{imagesdir}/j2sdk-image -iname '*.debuginfo' -exec rm {} \;
-
-popd >& /dev/null
-
-export JAVA_HOME=$(pwd)/%{buildoutputdir}/%{imagesdir}/j2sdk-image
+export JAVA_HOME=$(pwd)/%{buildoutputdir}images/j2sdk-image

 # cacerts are generated in runtime in openSUSE
-if [ -f %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/lib/security/cacerts ]; then
-        rm %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/lib/security/cacerts
+if [ -f %{buildoutputdir}images/j2sdk-image/jre/lib/security/cacerts ]; then
+        rm %{buildoutputdir}images/j2sdk-image/jre/lib/security/cacerts
 fi

 %if 0%{?suse_version} < 1130
@ -648,14 +517,14 @@ for PEM in %{_sysconfdir}/ssl/certs/*.pem; do
    ALIAS=$(basename ${PEM} .pem)
    awk '/-----BEGIN CERTIFICATE-----/,/-----END CERTIFICATE-----/{ print $0; }' ${PEM} > ${ALIAS}.pem

-    yes | $JAVA_HOME/jre/bin/keytool -import -alias ${ALIAS} -keystore %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/lib/security/cacerts -storepass 'changeit' -file ${ALIAS}.pem || :
+    yes | $JAVA_HOME/jre/bin/keytool -import -alias ${ALIAS} -keystore %{buildoutputdir}images/j2sdk-image/jre/lib/security/cacerts -storepass 'changeit' -file ${ALIAS}.pem || :
    rm ${ALIAS}.pem
 done
 %endif

 %if %{with_pulseaudio}
 # Build the pulseaudio plugin
-pushd icedtea-sound
+pushd icedtea-sound-%{icedtea_sound_version}
 %configure \
    --with-jdk-home=$JAVA_HOME \
    --disable-docs
@ -672,10 +541,6 @@ echo "" >> $JAVA_HOME/jre/lib/pulseaudio.properties
 popd
 %endif

-# Check unlimited policy has been used
-$JAVA_HOME/bin/javac -d . %{SOURCE14}
-$JAVA_HOME/bin/java TestCryptoLevel
-
 # Check debug symbols are present and can identify code
 SERVER_JVM="$JAVA_HOME/jre/lib/%{archinstall}/server/libjvm.so"
 if [ -f "$SERVER_JVM" ] ; then
@ -700,7 +565,9 @@ export NO_BRP_CHECK_BYTECODE_VERSION=true
 %if %{with_systemtap}
  # Install systemtap support files.
  install -dm 755 %{buildroot}%{_jvmdir}/%{sdkdir}/tapset
-  cp -a tapset/*.stp %{buildroot}%{_jvmdir}/%{sdkdir}/tapset/
+  for i in tapset/*.stp; do
+    cp -a $i %{buildroot}%{_jvmdir}/%{sdkdir}/tapset/$(basename $i .stp)-1.8.0.stp
+  done
  install -d -m 755 %{buildroot}%{tapsetdir}
  pushd %{buildroot}%{tapsetdir}
    RELATIVE=$(%{abs2rel} %{_jvmdir}/%{sdkdir}/tapset %{tapsetdir})
@ -708,7 +575,7 @@ export NO_BRP_CHECK_BYTECODE_VERSION=true
  popd
 %endif

-pushd %{buildoutputdir}/%{imagesdir}/j2sdk-image
+pushd %{buildoutputdir}images/j2sdk-image

  # Install main files.
  install -d -m 755 %{buildroot}%{_jvmdir}/%{sdkdir}
@ -777,9 +644,6 @@ pushd %{buildoutputdir}/%{imagesdir}/j2sdk-image

 popd

-# Install nss.cfg
-install -m 644 %{SOURCE13} %{buildroot}%{_jvmdir}/%{jredir}/lib/security/
-
 # Install Javadoc documentation.
 install -d -m 755 %{buildroot}%{_javadocdir}
 cp -a %{buildoutputdir}/docs %{buildroot}%{_javadocdir}/%{sdklnk}
@ -787,7 +651,7 @@ cp -a %{buildoutputdir}/docs %{buildroot}%{_javadocdir}/%{sdklnk}
 # Install icons and menu entries.
 for s in 16 24 32 48 ; do
  install -D -p -m 644 \
-    jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
+    openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
    %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/java-%{javaver}.png
 done

@ -1137,9 +1001,9 @@ fi
 %dir %{_libdir}/jvm-exports
 %dir %{_libdir}/jvm-private

-%doc %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION
-%doc %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/LICENSE
-%doc %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/THIRD_PARTY_README
+%doc %{buildoutputdir}images/j2sdk-image/jre/ASSEMBLY_EXCEPTION
+%doc %{buildoutputdir}images/j2sdk-image/jre/LICENSE
+%doc %{buildoutputdir}images/j2sdk-image/jre/THIRD_PARTY_README

 %dir %{_jvmdir}/%{sdkdir}
 %{_jvmdir}/%{jrelnk}
--- a/java-atk-wrapper-security.patch
+++ b/java-atk-wrapper-security.patch
@ -1,5 +1,5 @@
--- jdk8/jdk/src/share/lib/security/java.security-linux	2014-07-15 23:08:27.000000000 +0200
-+++ jdk8/jdk/src/share/lib/security/java.security-linux	2014-07-18 09:04:45.127566697 +0200
+--- openjdk/jdk/src/share/lib/security/java.security-linux	2014-07-15 23:08:27.000000000 +0200
+++ openjdk/jdk/src/share/lib/security/java.security-linux	2014-07-18 09:04:45.127566697 +0200
@@ -211,7 +211,9 @@
                jdk.internal.,\
                jdk.nashorn.internal.,\
--- a/jaxp.tar.xz
+++ b/jaxp.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0a9d523d451b895066dd747ee595eebba29f5626e9a69d9467cccd9b2df37c4
+size 2296808
--- a/jaxws.tar.xz
+++ b/jaxws.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e378c1f46b067c9527d174c3683f4022eca3fe17bcf0e79177fa1713197d3338
+size 2266852
--- a/jconsole.desktop.in
+++ b/jconsole.desktop.in
@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=OpenJDK 8 Monitoring & Management Console
-GenericName=OpenJDK Monitoring & Management Console
-Comment=Monitor and manage OpenJDK applications for @VERSION@
-Exec=@JAVA_HOME@/bin/jconsole
-Icon=java
-Terminal=false
-Type=Application
-StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Profiling;
-Version=1.0
--- a/jdk.tar.xz
+++ b/jdk.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:550556487de7fd769a9398082f26b358a2e5c07c2c1eb09724f0862667589cdd
+size 38264484
--- a/langtools.tar.xz
+++ b/langtools.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2602601152576021736028604e56cf32f8e3f5997fe220e90297132274a251ca
+size 2056412
--- a/link-with-as-needed.patch
+++ b/link-with-as-needed.patch
@ -1,38 +0,0 @@
--- jdk8/jdk/make/CompileLaunchers.gmk	2014-09-26 08:53:47.340118668 +0200
-+++ jdk8/jdk/make/CompileLaunchers.gmk	2014-09-26 08:54:18.702392301 +0200
-@@ -427,7 +427,7 @@
- # binary (at least on linux) which causes the size to differ between old and new build.
- ifeq ($(USE_EXTERNAL_LIBZ), true)
-   UNPACKEXE_CFLAGS := -DSYSTEM_ZLIB
-  UNPACKEXE_ZIPOBJS := -lz
-+  UNPACKEXE_LIBS := -lz
- else
-   UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8
-   UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \
-@@ -488,9 +488,9 @@
-     LDFLAGS_posix := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
-         $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \
-         $(call SET_SHARED_LIBRARY_ORIGIN), \
-    LDFLAGS_linux := -lc, \
-+    LDFLAGS_linux := , \
-     LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \
-    LDFLAGS_SUFFIX := $(LIBCXX), \
-+    LDFLAGS_SUFFIX := $(UNPACKEXE_LIBS) $(LIBCXX), \
-     OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
-     OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
-     PROGRAM := unpack200, \
--- jdk8/jdk/make/lib/Awt2dLibraries.gmk	2014-09-26 08:53:47.341118645 +0200
-+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk	2014-09-26 08:54:22.383307050 +0200
-@@ -760,10 +760,10 @@
-         $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \
-         $(BUILD_LIBJAVAJPEG_HEADERS), \
-     MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
-    LDFLAGS := $(LDFLAGS_JDKLIB) $(LIBJPEG_LIBS) \
-+    LDFLAGS := $(LDFLAGS_JDKLIB) \
-         $(call SET_SHARED_LIBRARY_ORIGIN), \
-     LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \
-    LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
-+    LDFLAGS_SUFFIX := $(LIBJPEG_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \
-     VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
-     RC_FLAGS := $(RC_FLAGS) \
-         -D "JDK_FNAME=javajpeg.dll" \
--- a/memory-limits.patch
+++ b/memory-limits.patch
@ -1,11 +0,0 @@
--- jdk8/hotspot/src/share/vm/runtime/globals.hpp	2014-04-23 22:06:29.000000000 +0100
-+++ jdk8/hotspot/src/share/vm/runtime/globals.hpp	2014-05-12 20:42:01.633428300 +0100
-@@ -3113,7 +3113,7 @@
-   product(uintx, InitialHeapSize, 0,                                        \
-           "Initial heap size (in bytes); zero means use ergonomics")        \
-                                                                             \
-  product(uintx, MaxHeapSize, ScaleForWordSize(96*M),                       \
-+  product(uintx, MaxHeapSize, ScaleForWordSize(512*M),                      \
-           "Maximum heap size (in bytes)")                                   \
-                                                                             \
-   product(uintx, OldSize, ScaleForWordSize(4*M),                            \
--- a/multiple-pkcs11-library-init.patch
+++ b/multiple-pkcs11-library-init.patch
@ -1,74 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1352129932 0
-# Node ID e9c857dcb964dbfa5eef3a3590244cb4d999cf7a
-# Parent  1406789608b76d0906881979335d685855f44190
-Allow multiple PKCS11 library initialisation to be a non-critical error.
-
-diff -r 1406789608b7 -r e9c857dcb964 src/share/classes/sun/security/pkcs11/Config.java
--- jdk8/jdk/src/share/classes/sun/security/pkcs11/Config.java Tue Oct 30 13:05:14 2012 +0000
-+++ jdk8/jdk/src/share/classes/sun/security/pkcs11/Config.java Mon Nov 05 15:38:52 2012 +0000
-@@ -52,6 +52,7 @@
-     static final int ERR_HALT       = 1;
-     static final int ERR_IGNORE_ALL = 2;
-     static final int ERR_IGNORE_LIB = 3;
-+    static final int ERR_IGNORE_MULTI_INIT = 4;
- 
-     // same as allowSingleThreadedModules but controlled via a system property
-     // and applied to all providers. if set to false, no SunPKCS11 instances
-@@ -980,6 +981,8 @@
-             handleStartupErrors = ERR_IGNORE_LIB;
-         } else if (val.equals("halt")) {
-             handleStartupErrors = ERR_HALT;
-+        } else if (val.equals("ignoreMultipleInitialisation")) {
-+            handleStartupErrors = ERR_IGNORE_MULTI_INIT;
-         } else {
-             throw excToken("Invalid value for handleStartupErrors:");
-         }
-diff -r 1406789608b7 -r e9c857dcb964 src/share/classes/sun/security/pkcs11/SunPKCS11.java
--- jdk8/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java  Tue Oct 30 13:05:14 2012 +0000
-+++ jdk8/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java  Mon Nov 05 15:38:52 2012 +0000
-@@ -168,26 +168,37 @@
-                 String nssLibraryDirectory = config.getNssLibraryDirectory();
-                 String nssSecmodDirectory = config.getNssSecmodDirectory();
-                 boolean nssOptimizeSpace = config.getNssOptimizeSpace();
-+                int errorHandling = config.getHandleStartupErrors();
- 
-                 if (secmod.isInitialized()) {
-                     if (nssSecmodDirectory != null) {
-                         String s = secmod.getConfigDir();
-                         if ((s != null) &&
-                                 (s.equals(nssSecmodDirectory) == false)) {
-                            throw new ProviderException("Secmod directory "
-                                + nssSecmodDirectory
-                                + " invalid, NSS already initialized with "
-                                + s);
-+                            String msg = "Secmod directory " + nssSecmodDirectory
-+                                + " invalid, NSS already initialized with " + s;
-+                            if (errorHandling == Config.ERR_IGNORE_MULTI_INIT ||
-+                                errorHandling == Config.ERR_IGNORE_ALL) {
-+                                throw new UnsupportedOperationException(msg);
-+                            } else {
-+                                throw new ProviderException(msg);
-+                            }
-                         }
-                     }
-                     if (nssLibraryDirectory != null) {
-                         String s = secmod.getLibDir();
-                         if ((s != null) &&
-                                 (s.equals(nssLibraryDirectory) == false)) {
-                            throw new ProviderException("NSS library directory "
-+                            String msg = "NSS library directory "
-                                 + nssLibraryDirectory
-                                 + " invalid, NSS already initialized with "
-                                + s);
-+                                + s;
-+                            if (errorHandling == Config.ERR_IGNORE_MULTI_INIT ||
-+                                errorHandling == Config.ERR_IGNORE_ALL) {
-+                                throw new UnsupportedOperationException(msg);
-+                            } else {
-+                                throw new ProviderException(msg);
-+                            }
-                         }
-                     }
-                 } else {
--- a/nashorn.tar.xz
+++ b/nashorn.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e7040d55a499c002cd6edcedc44890072a2f88cb19a341950e5865c544b51edc
+size 2220176
--- a/nss.cfg
+++ b/nss.cfg
@ -1,4 +0,0 @@
-name = NSS
-nssLibraryDirectory = 
-nssDbMode = noDb
-attributes = compatibility
--- a/openjdk.tar.xz
+++ b/openjdk.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8b766fffa39d67e62802a8cddd23e02b0ac2fd6aff48658b4b08fd6dbee38184
+size 330720
--- a/policytool.desktop.in
+++ b/policytool.desktop.in
@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=OpenJDK 8 Policy Tool
-GenericName=OpenJDK Policy Tool
-Comment=Manage OpenJDK policy files (@VERSION@)
-Exec=@JAVA_HOME@/bin/policytool
-Icon=java
-Terminal=false
-Type=Application
-StartupWMClass=sun-security-tools-PolicyTool
-Categories=Settings;DesktopSettings;Security;
-Version=1.0
--- a/ppc-zero-hotspot.patch
+++ b/ppc-zero-hotspot.patch
@ -1,6 +1,6 @@
-diff -up jdk8/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.ppc64 jdk8/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
--- jdk8/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.ppc64	2013-02-22 19:02:06.000000000 +0100
-+++ jdk8/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp	2013-04-18 16:21:24.897403406 +0200
+diff -up openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.ppc64 openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
+--- openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.ppc64	2013-02-22 19:02:06.000000000 +0100
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp	2013-04-18 16:21:24.897403406 +0200
@@ -32,11 +32,15 @@
 //
 
--- a/ppc64le-8036767.patch
+++ b/ppc64le-8036767.patch
@ -1,125 +0,0 @@
--- 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
--- a/s390-java-opts.patch
+++ b/s390-java-opts.patch
@ -1,26 +0,0 @@
--- jdk8/common/autoconf/boot-jdk.m4	2015-12-22 20:16:46.000000000 +0100
-+++ jdk8/common/autoconf/boot-jdk.m4	2016-01-23 13:16:40.069301419 +0100
-@@ -329,21 +329,12 @@
-   AC_MSG_CHECKING([flags for boot jdk java command for big workloads])
- 
-   # Starting amount of heap memory.
-  ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])
-+  ADD_JVM_ARG_IF_OK([-Xms256M],boot_jdk_jvmargs_big,[$JAVA])
- 
-   # Maximum amount of heap memory.
-   # Maximum stack size.
-  if test "x$BOOT_JDK_BITS" = x32; then
-    JVM_MAX_HEAP=1100M
-+  JVM_MAX_HEAP=768M
-     STACK_SIZE=768
-  else
-    # Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit
-    # pointers are used. Apparently, we need to increase the heap and stack
-    # space for the jvm. More specifically, when running javac to build huge
-    # jdk batch
-    JVM_MAX_HEAP=1600M
-    STACK_SIZE=1536
-  fi
-   ADD_JVM_ARG_IF_OK([-Xmx$JVM_MAX_HEAP],boot_jdk_jvmargs_big,[$JAVA])
-   ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs_big,[$JAVA])
-   ADD_JVM_ARG_IF_OK([-XX:PermSize=32m],boot_jdk_jvmargs_big,[$JAVA])
--- a/s390-size_t.patch
+++ b/s390-size_t.patch
@ -1,277 +0,0 @@
--- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	2015-10-21 17:15:39.485338783 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	2015-10-21 17:17:24.211977506 +0200
-@@ -2659,7 +2659,7 @@
-   if (ResizeOldPLAB && CMSOldPLABResizeQuicker) {
-     size_t multiple = _num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks);
-     n_blks +=  CMSOldPLABReactivityFactor*multiple*n_blks;
-    n_blks = MIN2(n_blks, CMSOldPLABMax);
-+    n_blks = MIN2(n_blks, (size_t)CMSOldPLABMax);
-   }
-   assert(n_blks > 0, "Error");
-   _cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl);
--- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	2015-10-21 17:15:39.486338760 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	2015-10-21 17:17:24.213977461 +0200
-@@ -957,7 +957,7 @@
-   if (free_percentage < desired_free_percentage) {
-     size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage));
-     assert(desired_capacity >= capacity(), "invalid expansion size");
-    size_t expand_bytes = MAX2(desired_capacity - capacity(), MinHeapDeltaBytes);
-+    size_t expand_bytes = MAX2(desired_capacity - capacity(), (size_t)MinHeapDeltaBytes);
-     if (PrintGCDetails && Verbose) {
-       size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage));
-       gclog_or_tty->print_cr("\nFrom compute_new_size: ");
-@@ -6577,7 +6577,7 @@
-     HeapWord* curAddr = _markBitMap.startWord();
-     while (curAddr < _markBitMap.endWord()) {
-       size_t remaining  = pointer_delta(_markBitMap.endWord(), curAddr);
-      MemRegion chunk(curAddr, MIN2(CMSBitMapYieldQuantum, remaining));
-+      MemRegion chunk(curAddr, MIN2((size_t)CMSBitMapYieldQuantum, remaining));
-       _markBitMap.clear_large_range(chunk);
-       if (ConcurrentMarkSweepThread::should_yield() &&
-           !foregroundGCIsActive() &&
-@@ -6875,7 +6875,7 @@
-     return;
-   }
-   // Double capacity if possible
-  size_t new_capacity = MIN2(_capacity*2, MarkStackSizeMax);
-+  size_t new_capacity = MIN2(_capacity*2, (size_t)MarkStackSizeMax);
-   // Do not give up existing stack until we have managed to
-   // get the double capacity that we desired.
-   ReservedSpace rs(ReservedSpace::allocation_align_size_up(
--- jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp	2015-10-21 17:15:39.487338738 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp	2015-10-21 17:17:24.214977439 +0200
-@@ -3903,7 +3903,7 @@
-   // of things to do) or totally (at the very end).
-   size_t target_size;
-   if (partially) {
-    target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize);
-+    target_size = MIN2((size_t)(_task_queue->max_elems()/3), (size_t)GCDrainStackTargetSize);
-   } else {
-     target_size = 0;
-   }
--- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2015-10-21 17:15:39.487338738 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2015-10-21 17:17:24.215977416 +0200
-@@ -1726,7 +1726,7 @@
- 
-   verify_region_sets_optional();
- 
-  size_t expand_bytes = MAX2(word_size * HeapWordSize, MinHeapDeltaBytes);
-+  size_t expand_bytes = MAX2(word_size * HeapWordSize, (size_t)MinHeapDeltaBytes);
-   ergo_verbose1(ErgoHeapSizing,
-                 "attempt heap expansion",
-                 ergo_format_reason("allocation request failed")
--- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp	2015-10-21 17:15:39.488338715 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp	2015-10-21 17:17:24.217977371 +0200
-@@ -89,7 +89,7 @@
-   void pretouch_internal(size_t start_page, size_t end_page);
- 
-   // Returns the index of the page which contains the given address.
-  uintptr_t  addr_to_page_index(char* addr) const;
-+  size_t  addr_to_page_index(char* addr) const;
-   // Returns the address of the given page index.
-   char*  page_start(size_t index) const;
- 
--- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp	2015-10-21 17:15:39.489338692 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp	2015-10-21 17:17:24.216977394 +0200
-@@ -38,7 +38,7 @@
-   _cancel(false),
-   _empty(true),
-   _dropped(0) {
-  _nqueues = MAX2(ParallelGCThreads, (size_t)1);
-+  _nqueues = MAX2((size_t)ParallelGCThreads, (size_t)1);
-   _queues = NEW_C_HEAP_ARRAY(G1StringDedupWorkerQueue, _nqueues, mtGC);
-   for (size_t i = 0; i < _nqueues; i++) {
-     new (_queues + i) G1StringDedupWorkerQueue(G1StringDedupWorkerQueue::default_segment_size(), _max_cache_size, _max_size);
--- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp	2015-10-21 17:15:39.489338692 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp	2015-10-21 17:17:24.216977394 +0200
-@@ -110,7 +110,7 @@
- };
- 
- G1StringDedupEntryCache::G1StringDedupEntryCache() {
-  _nlists = MAX2(ParallelGCThreads, (size_t)1);
-+  _nlists = MAX2((size_t)ParallelGCThreads, (size_t)1);
-   _lists = PaddedArray<G1StringDedupEntryFreeList, mtGC>::create_unfreeable((uint)_nlists);
- }
- 
--- jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp	2015-10-21 17:15:39.489338692 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp	2015-10-21 17:17:24.216977394 +0200
-@@ -109,7 +109,7 @@
-   if (FLAG_IS_DEFAULT(G1HeapRegionSize)) {
-     size_t average_heap_size = (initial_heap_size + max_heap_size) / 2;
-     region_size = MAX2(average_heap_size / HeapRegionBounds::target_number(),
-                       (uintx) HeapRegionBounds::min_size());
-+                       (size_t) HeapRegionBounds::min_size());
-   }
- 
-   int region_size_log = log2_long((jlong) region_size);
--- jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	2015-10-21 17:15:39.492338625 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	2015-10-21 17:17:24.217977371 +0200
-@@ -910,8 +910,8 @@
- void PSParallelCompact::initialize_dead_wood_limiter()
- {
-   const size_t max = 100;
-  _dwl_mean = double(MIN2(ParallelOldDeadWoodLimiterMean, max)) / 100.0;
-  _dwl_std_dev = double(MIN2(ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
-+  _dwl_mean = double(MIN2((size_t)ParallelOldDeadWoodLimiterMean, max)) / 100.0;
-+  _dwl_std_dev = double(MIN2((size_t)ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
-   _dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev);
-   DEBUG_ONLY(_dwl_initialized = true;)
-   _dwl_adjustment = normal_distribution(1.0);
--- jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp	2015-10-21 17:15:39.490338670 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp	2015-10-21 17:17:24.218977349 +0200
-@@ -194,7 +194,7 @@
-   const size_t num_overflow_elems = of_stack->size();
-   const size_t space_available = queue->max_elems() - queue->size();
-   const size_t num_take_elems = MIN3(space_available / 4,
-                                     ParGCDesiredObjsFromOverflowList,
-+                                     (size_t)ParGCDesiredObjsFromOverflowList,
-                                      num_overflow_elems);
-   // Transfer the most recent num_take_elems from the overflow
-   // stack to our work queue.
--- jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp	2015-10-21 17:15:39.497338512 +0200
-+++ jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp	2015-10-21 17:17:24.218977349 +0200
-@@ -385,7 +385,7 @@
-       uintx calculated_size = NewSize + OldSize;
-       double shrink_factor = (double) MaxHeapSize / calculated_size;
-       uintx smaller_new_size = align_size_down((uintx)(NewSize * shrink_factor), _gen_alignment);
-      FLAG_SET_ERGO(uintx, NewSize, MAX2(young_gen_size_lower_bound(), smaller_new_size));
-+      FLAG_SET_ERGO(uintx, NewSize, MAX2(young_gen_size_lower_bound(), (size_t)smaller_new_size));
-       _initial_gen0_size = NewSize;
- 
-       // OldSize is already aligned because above we aligned MaxHeapSize to
-@@ -433,7 +433,7 @@
-     // yield a size that is too small) and bound it by MaxNewSize above.
-     // Ergonomics plays here by previously calculating the desired
-     // NewSize and MaxNewSize.
-    max_new_size = MIN2(MAX2(max_new_size, NewSize), MaxNewSize);
-+    max_new_size = MIN2(MAX2(max_new_size, (size_t)NewSize), (size_t)MaxNewSize);
-   }
-   assert(max_new_size > 0, "All paths should set max_new_size");
- 
-@@ -455,23 +455,23 @@
-       // lower limit.
-       _min_gen0_size = NewSize;
-       desired_new_size = NewSize;
-      max_new_size = MAX2(max_new_size, NewSize);
-+      max_new_size = MAX2(max_new_size, (size_t)NewSize);
-     } else if (FLAG_IS_ERGO(NewSize)) {
-       // If NewSize is set ergonomically, we should use it as a lower
-       // limit, but use NewRatio to calculate the initial size.
-       _min_gen0_size = NewSize;
-       desired_new_size =
-        MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize);
-      max_new_size = MAX2(max_new_size, NewSize);
-+        MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), (size_t)NewSize);
-+      max_new_size = MAX2(max_new_size, (size_t)NewSize);
-     } else {
-       // For the case where NewSize is the default, use NewRatio
-       // to size the minimum and initial generation sizes.
-       // Use the default NewSize as the floor for these values.  If
-       // NewRatio is overly large, the resulting sizes can be too
-       // small.
-      _min_gen0_size = MAX2(scale_by_NewRatio_aligned(_min_heap_byte_size), NewSize);
-+      _min_gen0_size = MAX2(scale_by_NewRatio_aligned(_min_heap_byte_size), (size_t)NewSize);
-       desired_new_size =
-        MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize);
-+        MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), (size_t)NewSize);
-     }
- 
-     assert(_min_gen0_size > 0, "Sanity check");
-@@ -573,7 +573,7 @@
-   } else {
-     // It's been explicitly set on the command line.  Use the
-     // OldSize and then determine the consequences.
-    _min_gen1_size = MIN2(OldSize, _min_heap_byte_size - _min_gen0_size);
-+    _min_gen1_size = MIN2((size_t)OldSize, _min_heap_byte_size - _min_gen0_size);
-     _initial_gen1_size = OldSize;
- 
-     // If the user has explicitly set an OldSize that is inconsistent
--- jdk8/hotspot/src/share/vm/memory/metaspace.cpp	2015-10-21 17:15:39.498338490 +0200
-+++ jdk8/hotspot/src/share/vm/memory/metaspace.cpp	2015-10-21 17:17:24.219977326 +0200
-@@ -1455,7 +1455,7 @@
- 
- void MetaspaceGC::post_initialize() {
-   // Reset the high-water mark once the VM initialization is done.
-  _capacity_until_GC = MAX2(MetaspaceAux::committed_bytes(), MetaspaceSize);
-+  _capacity_until_GC = MAX2(MetaspaceAux::committed_bytes(), (size_t)MetaspaceSize);
- }
- 
- bool MetaspaceGC::can_expand(size_t word_size, bool is_class) {
-@@ -1515,7 +1515,7 @@
-     (size_t)MIN2(min_tmp, double(max_uintx));
-   // Don't shrink less than the initial generation size
-   minimum_desired_capacity = MAX2(minimum_desired_capacity,
-                                  MetaspaceSize);
-+                                  (size_t)MetaspaceSize);
- 
-   if (PrintGCDetails && Verbose) {
-     gclog_or_tty->print_cr("\nMetaspaceGC::compute_new_size: ");
-@@ -1573,7 +1573,7 @@
-     const double max_tmp = used_after_gc / minimum_used_percentage;
-     size_t maximum_desired_capacity = (size_t)MIN2(max_tmp, double(max_uintx));
-     maximum_desired_capacity = MAX2(maximum_desired_capacity,
-                                    MetaspaceSize);
-+                                    (size_t)MetaspaceSize);
-     if (PrintGCDetails && Verbose) {
-       gclog_or_tty->print_cr("  "
-                              "  maximum_free_percentage: %6.2f"
-@@ -3245,7 +3245,7 @@
-     // on the medium chunk list.   The next chunk will be small and progress
-     // from there.  This size calculated by -version.
-     _first_class_chunk_word_size = MIN2((size_t)MediumChunk*6,
-                                       (CompressedClassSpaceSize/BytesPerWord)*2);
-+                                       (size_t)(CompressedClassSpaceSize/BytesPerWord)*2);
-     _first_class_chunk_word_size = align_word_size_up(_first_class_chunk_word_size);
-     // Arbitrarily set the initial virtual space to a multiple
-     // of the boot class loader size.
--- jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp	2015-10-21 17:15:39.501338422 +0200
-+++ jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp	2015-10-21 17:17:24.219977326 +0200
-@@ -48,7 +48,7 @@
-   const size_t beg_index = size_t(index);
-   assert(beg_index < len || len == 0, "index too large");
- 
-  const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
-+  const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
-   const size_t end_index = beg_index + stride;
-   T* const base = (T*)a->base();
-   T* const beg = base + beg_index;
-@@ -82,7 +82,7 @@
-   const size_t beg_index = size_t(index);
-   assert(beg_index < len || len == 0, "index too large");
- 
-  const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
-+  const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
-   const size_t end_index = beg_index + stride;
-   T* const base = (T*)a->base();
-   T* const beg = base + beg_index;
--- jdk8/hotspot/src/share/vm/runtime/arguments.cpp	2015-10-21 17:15:39.512338174 +0200
-+++ jdk8/hotspot/src/share/vm/runtime/arguments.cpp	2015-10-21 17:17:24.220977303 +0200
-@@ -1277,7 +1277,7 @@
-     // NewSize was set on the command line and it is larger than
-     // preferred_max_new_size.
-     if (!FLAG_IS_DEFAULT(NewSize)) {   // NewSize explicitly set at command-line
-      FLAG_SET_ERGO(uintx, MaxNewSize, MAX2(NewSize, preferred_max_new_size));
-+      FLAG_SET_ERGO(uintx, MaxNewSize, MAX2((size_t)NewSize, preferred_max_new_size));
-     } else {
-       FLAG_SET_ERGO(uintx, MaxNewSize, preferred_max_new_size);
-     }
-@@ -1302,8 +1302,8 @@
-       // Unless explicitly requested otherwise, make young gen
-       // at least min_new, and at most preferred_max_new_size.
-       if (FLAG_IS_DEFAULT(NewSize)) {
-        FLAG_SET_ERGO(uintx, NewSize, MAX2(NewSize, min_new));
-        FLAG_SET_ERGO(uintx, NewSize, MIN2(preferred_max_new_size, NewSize));
-+        FLAG_SET_ERGO(uintx, NewSize, MAX2((size_t)NewSize, min_new));
-+        FLAG_SET_ERGO(uintx, NewSize, MIN2(preferred_max_new_size, (size_t)NewSize));
-         if (PrintGCDetails && Verbose) {
-           // Too early to use gclog_or_tty
-           tty->print_cr("CMS ergo set NewSize: " SIZE_FORMAT, NewSize);
-@@ -1313,7 +1313,7 @@
-       // so it's NewRatio x of NewSize.
-       if (FLAG_IS_DEFAULT(OldSize)) {
-         if (max_heap > NewSize) {
-          FLAG_SET_ERGO(uintx, OldSize, MIN2(NewRatio*NewSize, max_heap - NewSize));
-+          FLAG_SET_ERGO(uintx, OldSize, MIN2((unsigned long)(NewRatio*NewSize), max_heap - NewSize));
-           if (PrintGCDetails && Verbose) {
-             // Too early to use gclog_or_tty
-             tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize);
--- a/system-lcms.patch
+++ b/system-lcms.patch
@ -1,99 +0,0 @@
--- jdk8/common/autoconf/libraries.m4	2014-09-26 08:49:01.572737814 +0200
-+++ jdk8/common/autoconf/libraries.m4	2014-09-26 08:50:22.896853996 +0200
-@@ -679,6 +679,46 @@
- 
-   ###############################################################################
-   #
-+  # Check for the lcms2 library
-+  #
-+
-+  AC_ARG_WITH(lcms, [AS_HELP_STRING([--with-lcms],
-+  	[use lcms2 from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
-+
-+  AC_CHECK_LIB(lcms2, cmsOpenProfileFromFile,
-+               [ LCMS_FOUND=yes ],
-+               [ LCMS_FOUND=no ])
-+
-+  AC_MSG_CHECKING([for which lcms to use])
-+
-+  DEFAULT_LCMS=bundled
-+
-+  #
-+  # If user didn't specify, use DEFAULT_LCMS
-+  #
-+  if test "x${with_lcms}" = "x"; then
-+      with_lcms=${DEFAULT_LCMS}
-+  fi
-+
-+  if test "x${with_lcms}" = "xbundled"; then
-+      USE_EXTERNAL_LCMS=false
-+      AC_MSG_RESULT([bundled])
-+  elif test "x${with_lcms}" = "xsystem"; then
-+      if test "x${LCMS_FOUND}" = "xyes"; then
-+          USE_EXTERNAL_LCMS=true
-+          AC_MSG_RESULT([system])
-+      else
-+          AC_MSG_RESULT([system not found])
-+          AC_MSG_ERROR([--with-lcms=system specified, but no lcms found!])
-+      fi
-+  else
-+      AC_MSG_ERROR([Invalid value for --with-lcms: ${with_lcms}, use 'system' or 'bundled'])
-+  fi
-+
-+  AC_SUBST(USE_EXTERNAL_LCMS)
-+
-+  ###############################################################################
-+  #
-   # Check for the png library
-   #
- 
--- jdk8/jdk/make/lib/Awt2dLibraries.gmk	2014-09-26 08:49:00.981751504 +0200
-+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk	2014-09-26 08:50:22.897853978 +0200
-@@ -669,8 +669,8 @@
- ##########################################################################################
- 
- # TODO: Update awt lib path when awt is converted
-$(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
-    LIBRARY := lcms, \
-+$(eval $(call SetupNativeCompilation,BUILD_LIBJAVALCMS, \
-+    LIBRARY := javalcms, \
-     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-     SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
-     LANG := C, \
-@@ -688,19 +688,19 @@
-     LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
-     LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \
-     LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \
-    LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \
-+    LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm -llcms2, \
-     LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm,\
-     VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
-     RC_FLAGS := $(RC_FLAGS) \
-        -D "JDK_FNAME=lcms.dll" \
-        -D "JDK_INTERNAL_NAME=lcms" \
-+        -D "JDK_FNAME=javalcms.dll" \
-+        -D "JDK_INTERNAL_NAME=javalcms" \
-         -D "JDK_FTYPE=0x2L", \
-    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/liblcms, \
-+    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavalcms, \
-     DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
- 
-BUILD_LIBRARIES += $(BUILD_LIBLCMS)
-+BUILD_LIBRARIES += $(BUILD_LIBJAVALCMS)
- 
-$(BUILD_LIBLCMS): $(BUILD_LIBAWT)
-+$(BUILD_LIBJAVALCMS): $(BUILD_LIBAWT)
- 
- ##########################################################################################
- 
--- jdk8/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java	2014-09-26 08:49:00.646759264 +0200
-+++ jdk8/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java	2014-09-26 08:50:22.897853978 +0200
-@@ -207,7 +207,7 @@
-                          * disposer frameworks
-                          */
-                         System.loadLibrary("awt");
-                        System.loadLibrary("lcms");
-+                        System.loadLibrary("javalcms");
-                         return null;
-                     }
-                 });
--- a/system-libjpeg.patch
+++ b/system-libjpeg.patch
@ -1,240 +0,0 @@
--- jdk8/common/autoconf/libraries.m4	2015-02-17 13:27:11.468829365 +0100
-+++ jdk8/common/autoconf/libraries.m4	2015-02-17 13:27:49.143980484 +0100
-@@ -608,11 +608,36 @@
-   # Check for the jpeg library
-   #
- 
-+  AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg],
-+      [use libjpeg from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
-+
-+  AC_MSG_CHECKING([for which libjpeg to use])
-+
-+  # default is bundled
-+  DEFAULT_LIBJPEG=bundled
-+
-+  #
-+  # if user didn't specify, use DEFAULT_LIBJPEG
-+  #
-+  if test "x${with_libjpeg}" = "x"; then
-+    with_libjpeg=${DEFAULT_LIBJPEG}
-+  fi
-+
-+  AC_MSG_RESULT(${with_libjpeg})
-+
-+  if test "x${with_libjpeg}" = "xbundled"; then
-+    USE_EXTERNAL_LIBJPEG=false
-+  elif test "x${with_libjpeg}" = "xsystem"; then
-+    AC_CHECK_HEADER(jpeglib.h, [],
-+        [ AC_MSG_ERROR([--with-libjpeg=system specified, but jpeglib.h not found!])])
-+    AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [],
-+        [ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])])
-+
-   USE_EXTERNAL_LIBJPEG=true
-  AC_CHECK_LIB(jpeg, main, [],
-      [ USE_EXTERNAL_LIBJPEG=false
-      AC_MSG_NOTICE([Will use jpeg decoder bundled with the OpenJDK source])
-  ])
-+  else
-+    AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled'])
-+  fi
-+
-   AC_SUBST(USE_EXTERNAL_LIBJPEG)
- 
-   ###############################################################################
--- jdk8/jdk/make/lib/Awt2dLibraries.gmk	2015-02-17 13:25:22.125292473 +0100
-+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk	2015-02-17 13:28:30.812041352 +0100
-@@ -704,18 +704,20 @@
- 
- ##########################################################################################
- 
-+BUILD_LIBJAVAJPEG_DIR := $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
-+
- ifdef OPENJDK
-  BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers
-+  BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers
- else
-  BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed
-  BUILD_LIBJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg
-  BUILD_LIBJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJPEG_CLOSED_SRC)
-+  BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed
-+  BUILD_LIBJAVAJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg
-+  BUILD_LIBJAVAJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJAVAJPEG_CLOSED_SRC)
- endif
- 
-BUILD_LIBJPEG_REORDER :=
-+BUILD_LIBJAVAJPEG_REORDER :=
- ifeq ($(OPENJDK_TARGET_OS), solaris)
-   ifneq ($(OPENJDK_TARGET_CPU), x86_64)
-    BUILD_LIBJPEG_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
-+    BUILD_LIBJAVAJPEG_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
-   endif
- endif
- 
-@@ -730,37 +733,50 @@
- #      $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \
- #          \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) )
- #  ifeq ($(CC_43_OR_NEWER), 1)
-#    BUILD_LIBJPEG_CFLAGS_linux += -Wno-clobbered
-+#    BUILD_LIBJAVAJPEG_CFLAGS_linux += -Wno-clobbered
- #  endif
- #endif
- 
-$(eval $(call SetupNativeCompilation,BUILD_LIBJPEG, \
-    LIBRARY := jpeg, \
-+ifeq ($(USE_EXTERNAL_LIBJPEG), true)
-+  LIBJPEG_LIBS := -ljpeg
-+  BUILD_LIBJAVAJPEG_INCLUDE_FILES := \
-+      imageioJPEG.c \
-+      jpegdecoder.c
-+  BUILD_LIBJAVAJPEG_HEADERS :=
-+else
-+  LIBJPEG_LIBS :=
-+  BUILD_LIBJAVAJPEG_INCLUDE_FILES :=
-+  BUILD_LIBJAVAJPEG_HEADERS := -I$(BUILD_LIBJAVAJPEG_DIR)
-+endif
-+
-+$(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \
-+    LIBRARY := javajpeg, \
-     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-    SRC := $(BUILD_LIBJPEG_CLOSED_SRC) \
-        $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
-+    SRC := $(BUILD_LIBJAVAJPEG_CLOSED_SRC) \
-+        $(BUILD_LIBJAVAJPEG_DIR), \
-+    INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
-     LANG := C, \
-     OPTIMIZATION := HIGHEST, \
-     CFLAGS := $(CFLAGS_JDKLIB) \
-        $(BUILD_LIBJPEG_CLOSED_INCLUDES) \
-        -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
-    MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \
-    LDFLAGS := $(LDFLAGS_JDKLIB) \
-+        $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \
-+        $(BUILD_LIBJAVAJPEG_HEADERS), \
-+    MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
-+    LDFLAGS := $(LDFLAGS_JDKLIB) $(LIBJPEG_LIBS) \
-         $(call SET_SHARED_LIBRARY_ORIGIN), \
-     LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \
-     LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
-     VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
-     RC_FLAGS := $(RC_FLAGS) \
-        -D "JDK_FNAME=jpeg.dll" \
-        -D "JDK_INTERNAL_NAME=jpeg" \
-+        -D "JDK_FNAME=javajpeg.dll" \
-+        -D "JDK_INTERNAL_NAME=javajpeg" \
-         -D "JDK_FTYPE=0x2L", \
-    REORDER := $(BUILD_LIBJPEG_REORDER), \
-+    REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
-     OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \
-     DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
- 
-$(BUILD_LIBJPEG): $(BUILD_LIBJAVA)
-+$(BUILD_LIBJAVAJPEG): $(BUILD_LIBJAVA)
- 
-BUILD_LIBRARIES += $(BUILD_LIBJPEG)
-+BUILD_LIBRARIES += $(BUILD_LIBJAVAJPEG)
- 
- ##########################################################################################
- 
-@@ -1206,6 +1222,13 @@
-     GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
-   endif
- 
-+  ifeq ($(USE_EXTERNAL_LIBJPEG), true)
-+    LIBJPEG_LDFLAGS := -ljpeg
-+  else
-+    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
-+    LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
-+  endif
-+
-   ifneq ($(OPENJDK_TARGET_OS), macosx)
-     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
-   else
-@@ -1268,11 +1291,13 @@
-       EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
-       LANG := C, \
-       OPTIMIZATION := LOW, \
-      CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) $(GIFLIB_CFLAGS), \
-+      CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
-+                $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS), \
-       MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
-       LDFLAGS := $(LDFLAGS_JDKLIB) \
-           $(call SET_SHARED_LIBRARY_ORIGIN), \
-      LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS), \
-+      LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \
-+                        $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS), \
-       LDFLAGS_SUFFIX_solaris := -lc, \
-       VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
-       RC_FLAGS := $(RC_FLAGS) \
--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java	2015-02-17 13:25:22.295288644 +0100
-+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java	2015-02-17 13:27:49.145980439 +0100
-@@ -89,7 +89,7 @@
-         java.security.AccessController.doPrivileged(
-             new java.security.PrivilegedAction<Void>() {
-                 public Void run() {
-                    System.loadLibrary("jpeg");
-+                    System.loadLibrary("javajpeg");
-                     return null;
-                 }
-             });
--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java	2015-02-17 13:25:22.295288644 +0100
-+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java	2015-02-17 13:27:49.145980439 +0100
-@@ -179,7 +179,7 @@
-         java.security.AccessController.doPrivileged(
-             new java.security.PrivilegedAction<Void>() {
-                 public Void run() {
-                    System.loadLibrary("jpeg");
-+                    System.loadLibrary("javajpeg");
-                     return null;
-                 }
-             });
--- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java	2015-02-17 13:25:22.170291459 +0100
-+++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java	2015-02-17 13:27:49.146980416 +0100
-@@ -56,7 +56,7 @@
-         java.security.AccessController.doPrivileged(
-             new java.security.PrivilegedAction<Void>() {
-                 public Void run() {
-                    System.loadLibrary("jpeg");
-+                    System.loadLibrary("javajpeg");
-                     return null;
-                 }
-             });
--- jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2015-02-17 13:25:22.531283329 +0100
-+++ jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2015-02-17 13:27:49.146980416 +0100
-@@ -51,7 +51,7 @@
- 
- /* headers from the JPEG library */
- #include <jpeglib.h>
-#include "jerror.h"
-+#include <jerror.h>
- 
- #undef MAX
- #define MAX(a,b)        ((a) > (b) ? (a) : (b))
--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2015-02-17 13:25:22.539283148 +0100
-+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2015-02-17 13:27:49.147980394 +0100
-@@ -25,9 +25,9 @@
- 
- #include "splashscreen_impl.h"
- 
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jerror.h"
-+#include <jpeglib.h>
-+#include <jerror.h>
-+#include <jmorecfg.h>
- 
- #include <setjmp.h>
- 
-@@ -113,11 +113,11 @@
-     if (cinfo->src == NULL) {   /* first time for this JPEG object? */
-         cinfo->src = (struct jpeg_source_mgr *)
-             (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo,
-            JPOOL_PERMANENT, SIZEOF(stream_source_mgr));
-+            JPOOL_PERMANENT, sizeof(stream_source_mgr));
-         src = (stream_src_ptr) cinfo->src;
-         src->buffer = (JOCTET *)
-             (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo,
-            JPOOL_PERMANENT, INPUT_BUF_SIZE * SIZEOF(JOCTET));
-+            JPOOL_PERMANENT, INPUT_BUF_SIZE * sizeof(JOCTET));
-     }
- 
-     src = (stream_src_ptr) cinfo->src;
--- a/system-libpng.patch
+++ b/system-libpng.patch
@ -1,111 +0,0 @@
--- jdk8/common/autoconf/libraries.m4	2014-09-26 08:45:01.057310067 +0200
-+++ jdk8/common/autoconf/libraries.m4	2014-09-26 08:46:38.602049970 +0200
-@@ -679,6 +679,47 @@
- 
-   ###############################################################################
-   #
-+  # Check for the png library
-+  #
-+
-+  AC_ARG_WITH(libpng, [AS_HELP_STRING([--with-libpng],
-+     [use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
-+
-+  AC_CHECK_LIB(png, png_sig_cmp,
-+               [ LIBPNG_FOUND=yes ],
-+               [ LIBPNG_FOUND=no ])
-+
-+  AC_MSG_CHECKING([for which libpng to use])
-+
-+  # default is bundled
-+  DEFAULT_LIBPNG=bundled
-+
-+  #
-+  # if user didn't specify, use DEFAULT_LIBPNG
-+  #
-+  if test "x${with_libpng}" = "x"; then
-+      with_libpng=${DEFAULT_libpng}
-+  fi
-+
-+
-+  if test "x${with_libpng}" = "xbundled"; then
-+      USE_EXTERNAL_LIBPNG=false
-+      AC_MSG_RESULT([bundled])
-+  elif test "x${with_libpng}" = "xsystem"; then
-+      if test "x${LIBPNG_FOUND}" = "xyes"; then
-+          USE_EXTERNAL_LIBPNG=true
-+          AC_MSG_RESULT([system])
-+      else
-+          AC_MSG_RESULT([system not found])
-+          AC_MSG_ERROR([--with-libpng=system specified, but no libpng found!])
-+      fi
-+  else
-+      AC_MSG_ERROR([Invalid value of --with-libpng: ${with_libpng}, use 'system' or 'bundled'])
-+  fi
-+  AC_SUBST(USE_EXTERNAL_LIBPNG)
-+
-+  ###############################################################################
-+  #
-   # Check for the zlib library
-   #
- 
--- jdk8/common/autoconf/spec.gmk.in	2014-09-26 08:45:01.057310067 +0200
-+++ jdk8/common/autoconf/spec.gmk.in	2014-09-26 08:46:38.603049945 +0200
-@@ -555,6 +555,7 @@
- ENABLE_JFR=@ENABLE_JFR@
- ENABLE_INTREE_EC=@ENABLE_INTREE_EC@
- USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
-+USE_EXTERNAL_LIBPNG:=@USE_EXTERNAL_LIBPNG@
- USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
- USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
- LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@
--- jdk8/jdk/make/lib/Awt2dLibraries.gmk	2014-09-26 08:45:00.475323552 +0200
-+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk	2014-09-26 08:46:38.603049945 +0200
-@@ -1211,7 +1211,6 @@
- ifndef BUILD_HEADLESS_ONLY
-   LIBSPLASHSCREEN_DIRS := \
-     $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
-    $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
-     $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
- 
-   ifeq ($(USE_EXTERNAL_LIBGIF), true)
-@@ -1228,6 +1227,13 @@
-     LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
-   endif
- 
-+  ifeq ($(USE_EXTERNAL_LIBPNG), true)
-+    LIBPNG_LDFLAGS := -lpng
-+  else
-+    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/image/libpng
-+    LIBPNG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/libpng
-+  endif
-+
-   ifneq ($(OPENJDK_TARGET_OS), macosx)
-     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
-   else
-@@ -1291,12 +1297,12 @@
-       LANG := C, \
-       OPTIMIZATION := LOW, \
-       CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
-                $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS), \
-+                $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(LIBPNG_CFLAGS), \
-       MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
-       LDFLAGS := $(LDFLAGS_JDKLIB) \
-           $(call SET_SHARED_LIBRARY_ORIGIN), \
-       LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \
-                        $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS), \
-+                        $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(LIBPNG_LDFLAGS), \
-       LDFLAGS_SUFFIX_solaris := -lc, \
-       VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
-       RC_FLAGS := $(RC_FLAGS) \
--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c	2014-09-26 08:45:00.414324966 +0200
-+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c	2014-09-26 08:46:38.603049945 +0200
-@@ -25,8 +25,7 @@
- 
- #include "splashscreen_impl.h"
- 
-#include "../libpng/png.h"
-
-+#include <png.h>
- #include <setjmp.h>
- 
- #define SIG_BYTES 8
--- a/systemtap-tapset.tar.gz
+++ b/systemtap-tapset.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2f3a47f150b94421f8a64a9d73deea5f60a11fae2c48636fe4533197f91573a4
-size 26712
--- a/zero-dummy.patch
+++ b/zero-dummy.patch
@ -1,13 +0,0 @@
--- jdk8/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	2015-06-10 10:06:49.485230587 +0200
-+++ jdk8/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	2015-06-10 10:07:33.645229254 +0200
-@@ -55,8 +55,8 @@
- #include "utilities/vmError.hpp"
- 
- address os::current_stack_pointer() {
-  address dummy = (address) &dummy;
-  return dummy;
-+  // return the address of the current function
-+  return (address)__builtin_frame_address(0);
- }
- 
- frame os::get_sender_for_C_frame(frame* fr) {
--- a/zero-javadoc-verbose.patch
+++ b/zero-javadoc-verbose.patch
@ -1,7 +1,5 @@
-Index: jdk8u-3e6d3c8810ee/make/Javadoc.gmk
-===================================================================
--- jdk8u-3e6d3c8810ee.orig/make/Javadoc.gmk
-+++ jdk8u-3e6d3c8810ee/make/Javadoc.gmk
+--- openjdk/make/Javadoc.gmk
+++ openjdk/make/Javadoc.gmk
@@ -260,7 +260,6 @@ $(call CopyrightLine,$(COPYRIGHT_URL),$(
 # Common javadoc options used by all
 COMMON_JAVADOCFLAGS = \