Architecture specific change in rpms/java-1.8.0-openjdk-aarch32.git
by githook-noreply@fedoraproject.org
The package rpms/java-1.8.0-openjdk-aarch32.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-1.8.0-openjdk-aarch32.git/co....
Change:
+%ifarch %{ix86}
Thanks.
Full change:
============
commit af80df107c065146ddfaa568284d2398dcc7d215
Author: Alex Kashchenko <akashche(a)redhat.com>
Date: Thu Feb 14 17:05:27 2019 -0500
8u201 update
diff --git a/.gitignore b/.gitignore
index f0901ad..f2590e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@
/aarch32-port-jdk8u-jdk8u171-b11-aarch32-180511.tar.xz
/aarch32-port-jdk8u-jdk8u181-b13-aarch32-180802.tar.xz
/aarch32-port-jdk8u-jdk8u191-b12-aarch32-181022.tar.xz
+/aarch32-port-jdk8u-jdk8u201-b09-aarch32-190124.tar.xz
+/systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
diff --git a/6260348-pr3066.patch b/6260348-pr3066.patch
deleted file mode 100644
index 06be502..0000000
--- a/6260348-pr3066.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-# HG changeset patch
-# User ssadetsky
-# Date 1467220169 -3600
-# Wed Jun 29 18:09:29 2016 +0100
-# Node ID 9fffaa63c49d93bff70b96af9a86b7635bce44be
-# Parent d0462c26152fc8bd5f79db7f1670777e807ef2b3
-6260348, PR3066: GTK+ L&F JTextComponent not respecting desktop caret blink rate
-Reviewed-by: alexsch, azvegint
-
-diff -r d0462c26152f -r 9fffaa63c49d src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java
---- openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java Tue Jun 28 19:44:50 2016 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java Wed Jun 29 18:09:29 2016 +0100
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2005, 2015, 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
-@@ -93,7 +93,9 @@
- */
- static enum Settings {
- GTK_FONT_NAME,
-- GTK_ICON_SIZES
-+ GTK_ICON_SIZES,
-+ GTK_CURSOR_BLINK,
-+ GTK_CURSOR_BLINK_TIME
- }
-
- /* Custom regions are needed for representing regions that don't exist
-diff -r d0462c26152f -r 9fffaa63c49d src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
---- openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Tue Jun 28 19:44:50 2016 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Wed Jun 29 18:09:29 2016 +0100
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2002, 2015, 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
-@@ -371,7 +371,17 @@
- int vProgWidth = 22 - (progXThickness * 2);
- int vProgHeight = 80 - (progYThickness * 2);
-
-- Integer caretBlinkRate = Integer.valueOf(500);
-+ Integer caretBlinkRate;
-+ if (Boolean.FALSE.equals(GTKEngine.INSTANCE.getSetting(
-+ GTKEngine.Settings.GTK_CURSOR_BLINK))) {
-+ caretBlinkRate = Integer.valueOf(0);
-+ } else {
-+ caretBlinkRate = (Integer) GTKEngine.INSTANCE.getSetting(
-+ GTKEngine.Settings.GTK_CURSOR_BLINK_TIME);
-+ if (caretBlinkRate == null) {
-+ caretBlinkRate = Integer.valueOf(500);
-+ }
-+ }
- Insets zeroInsets = new InsetsUIResource(0, 0, 0, 0);
-
- Double defaultCaretAspectRatio = new Double(0.025);
-diff -r d0462c26152f -r 9fffaa63c49d src/solaris/native/sun/awt/gtk2_interface.c
---- openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.c Tue Jun 28 19:44:50 2016 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.c Wed Jun 29 18:09:29 2016 +0100
-@@ -1316,9 +1316,6 @@
- {
- result = gtk2_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE] =
- (*fp_gtk_entry_new)();
--
-- GtkSettings* settings = fp_gtk_widget_get_settings(result);
-- fp_g_object_set(settings, "gtk-cursor-blink", FALSE, NULL);
- }
- result = gtk2_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE];
- break;
-@@ -1363,10 +1360,6 @@
- {
- gtk2_widgets[_GTK_ENTRY_TYPE] =
- (*fp_gtk_entry_new)();
--
-- GtkSettings* settings =
-- fp_gtk_widget_get_settings(gtk2_widgets[_GTK_ENTRY_TYPE]);
-- fp_g_object_set(settings, "gtk-cursor-blink", FALSE, NULL);
- }
- result = gtk2_widgets[_GTK_ENTRY_TYPE];
- break;
-@@ -1558,9 +1551,6 @@
- {
- result = gtk2_widgets[_GTK_SPIN_BUTTON_TYPE] =
- (*fp_gtk_spin_button_new)(NULL, 0, 0);
--
-- GtkSettings* settings = fp_gtk_widget_get_settings(result);
-- fp_g_object_set(settings, "gtk-cursor-blink", FALSE, NULL);
- }
- result = gtk2_widgets[_GTK_SPIN_BUTTON_TYPE];
- break;
-@@ -2510,14 +2500,20 @@
-
- return result;
- }
--/*
-+
- jobject get_integer_property(JNIEnv *env, GtkSettings* settings, const gchar* key)
- {
-- gint intval = NULL;
--
-+ gint intval = NULL;
- (*fp_g_object_get)(settings, key, &intval, NULL);
- return create_Integer(env, intval);
--}*/
-+}
-+
-+jobject get_boolean_property(JNIEnv *env, GtkSettings* settings, const gchar* key)
-+{
-+ gint intval = NULL;
-+ (*fp_g_object_get)(settings, key, &intval, NULL);
-+ return create_Boolean(env, intval);
-+}
-
- jobject gtk2_get_setting(JNIEnv *env, Setting property)
- {
-@@ -2529,6 +2525,10 @@
- return get_string_property(env, settings, "gtk-font-name");
- case GTK_ICON_SIZES:
- return get_string_property(env, settings, "gtk-icon-sizes");
-+ case GTK_CURSOR_BLINK:
-+ return get_boolean_property(env, settings, "gtk-cursor-blink");
-+ case GTK_CURSOR_BLINK_TIME:
-+ return get_integer_property(env, settings, "gtk-cursor-blink-time");
- }
-
- return NULL;
-diff -r d0462c26152f -r 9fffaa63c49d src/solaris/native/sun/awt/gtk2_interface.h
---- openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.h Tue Jun 28 19:44:50 2016 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.h Wed Jun 29 18:09:29 2016 +0100
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2005, 2015, 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
-@@ -140,7 +140,9 @@
- typedef enum _Setting
- {
- GTK_FONT_NAME,
-- GTK_ICON_SIZES
-+ GTK_ICON_SIZES,
-+ GTK_CURSOR_BLINK,
-+ GTK_CURSOR_BLINK_TIME
- } Setting;
-
- /* GTK types, here to eliminate need for GTK headers at compile time */
diff --git a/8031668-pr2842-01.patch b/8031668-pr2842-01.patch
deleted file mode 100644
index faaa309..0000000
--- a/8031668-pr2842-01.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# HG changeset patch
-# User mduigou
-# Date 1389723922 28800
-# Tue Jan 14 10:25:22 2014 -0800
-# Node ID 842cc183c9f6d29270ff002238248978c08f0a66
-# Parent f0635543beb309c4da1bb88c906a76ee4b75e16d
-8031668, PR2842: TOOLCHAIN_FIND_COMPILER unexpectedly resolves symbolic links
-Reviewed-by: erikj, ihse
-
-diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
---- openjdk///common/autoconf/toolchain.m4
-+++ openjdk///common/autoconf/toolchain.m4
-@@ -230,8 +230,8 @@
- $1="$PROPER_COMPILER_$1"
- else
- AC_MSG_RESULT([no, keeping $1])
-- $1="$TEST_COMPILER"
- fi
-+
- TOOLCHAIN_EXTRACT_COMPILER_VERSION([$1], [$COMPILER_NAME])
- ])
-
diff --git a/8036003-add-with-native-debug-symbols-configure-flag.patch b/8036003-add-with-native-debug-symbols-configure-flag.patch
deleted file mode 100644
index b7b8a05..0000000
--- a/8036003-add-with-native-debug-symbols-configure-flag.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-
-# HG changeset patch
-# User sgehwolf
-# Date 1531824954 -7200
-# Node ID 19e8754f5415cdda79904b9f21a4b8981505cb78
-# Parent 1380ce862bbd0b65c619bfcea454d612b240e332
-8036003: Add --with-native-debug-symbols=[none|internal|external|zipped]
-Reviewed-by: erikj
-
-diff -r 1380ce862bbd -r 19e8754f5415 common/autoconf/jdk-options.m4
---- openjdk/common/autoconf/jdk-options.m4 Mon Jul 16 15:37:08 2018 +0100
-+++ openjdk/common/autoconf/jdk-options.m4 Tue Jul 17 12:55:54 2018 +0200
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2011, 2018, 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
-@@ -606,11 +606,88 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
-
- if test "x${enable_zip_debug_info}" = "xno"; then
- ZIP_DEBUGINFO_FILES=false
-+ elif test "x${enable_zip_debug_info}" = "xyes"; then
-+ ZIP_DEBUGINFO_FILES=true
-+ fi
-+
-+ #
-+ # NATIVE_DEBUG_SYMBOLS
-+ # This must be done after the toolchain is setup, since we're looking at objcopy.
-+ # In addition, this must be done after ENABLE_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES
-+ # checking in order to preserve backwards compatibility post JDK-8207234.
-+ #
-+ AC_MSG_CHECKING([what type of native debug symbols to use (this will override previous settings)])
-+ AC_ARG_WITH([native-debug-symbols],
-+ [AS_HELP_STRING([--with-native-debug-symbols],
-+ [set the native debug symbol configuration (none, internal, external, zipped) @<:@varying@:>@])],
-+ [
-+ if test "x$OPENJDK_TARGET_OS" = xaix; then
-+ if test "x$with_native_debug_symbols" = xexternal || test "x$with_native_debug_symbols" = xzipped; then
-+ AC_MSG_ERROR([AIX only supports the parameters 'none' and 'internal' for --with-native-debug-symbols])
-+ fi
-+ fi
-+ ],
-+ [
-+ # Default to unset for backwards compatibility
-+ with_native_debug_symbols=""
-+ ])
-+ NATIVE_DEBUG_SYMBOLS=$with_native_debug_symbols
-+ if test "x$NATIVE_DEBUG_SYMBOLS" = x; then
-+ AC_MSG_RESULT([not specified])
- else
-+ AC_MSG_RESULT([$NATIVE_DEBUG_SYMBOLS])
-+ fi
-+ # Default is empty
-+ DEBUG_BINARIES=
-+ # Default is min_strip. Possible values are min_strip, all_strip, no_strip
-+ STRIP_POLICY=min_strip
-+
-+ if test "x$NATIVE_DEBUG_SYMBOLS" = xzipped; then
-+
-+ if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
-+ if test "x$OBJCOPY" = x; then
-+ # enabling of enable-debug-symbols and can't find objcopy
-+ # this is an error
-+ AC_MSG_ERROR([Unable to find objcopy, cannot enable native debug symbols])
-+ fi
-+ fi
-+
-+ ENABLE_DEBUG_SYMBOLS=true
-+ STRIP_POLICY=min_strip
- ZIP_DEBUGINFO_FILES=true
-+ elif test "x$NATIVE_DEBUG_SYMBOLS" = xnone; then
-+ ENABLE_DEBUG_SYMBOLS=false
-+ STRIP_POLICY=min_strip
-+ ZIP_DEBUGINFO_FILES=false
-+ elif test "x$NATIVE_DEBUG_SYMBOLS" = xinternal; then
-+ ENABLE_DEBUG_SYMBOLS=true
-+ STRIP_POLICY=no_strip
-+ ZIP_DEBUGINFO_FILES=false
-+ POST_STRIP_CMD=
-+ DEBUG_BINARIES=true
-+ elif test "x$NATIVE_DEBUG_SYMBOLS" = xexternal; then
-+
-+ if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
-+ if test "x$OBJCOPY" = x; then
-+ # enabling of enable-debug-symbols and can't find objcopy
-+ # this is an error
-+ AC_MSG_ERROR([Unable to find objcopy, cannot enable native debug symbols])
-+ fi
-+ fi
-+
-+ ENABLE_DEBUG_SYMBOLS=true
-+ STRIP_POLICY=min_strip
-+ ZIP_DEBUGINFO_FILES=false
-+ elif test "x$NATIVE_DEBUG_SYMBOLS" != x; then
-+ AC_MSG_ERROR([Allowed native debug symbols are: none, internal, external, zipped])
-+ else
-+ AC_MSG_NOTICE([--with-native-debug-symbols not specified. Using values from --disable-debug-symbols and --disable-zip-debug-info])
- fi
-
- AC_SUBST(ENABLE_DEBUG_SYMBOLS)
-+ AC_SUBST(STRIP_POLICY)
-+ AC_SUBST(POST_STRIP_CMD)
-+ AC_SUBST(DEBUG_BINARIES)
- AC_SUBST(ZIP_DEBUGINFO_FILES)
- AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
- AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
-diff -r 1380ce862bbd -r 19e8754f5415 common/autoconf/spec.gmk.in
---- openjdk/common/autoconf/spec.gmk.in Mon Jul 16 15:37:08 2018 +0100
-+++ openjdk/common/autoconf/spec.gmk.in Tue Jul 17 12:55:54 2018 +0200
-@@ -416,6 +416,8 @@
- CFLAGS_DEBUG_SYMBOLS:=@CFLAGS_DEBUG_SYMBOLS@
- CXXFLAGS_DEBUG_SYMBOLS:=@CXXFLAGS_DEBUG_SYMBOLS@
- ZIP_DEBUGINFO_FILES:=@ZIP_DEBUGINFO_FILES@
-+STRIP_POLICY:=@STRIP_POLICY@
-+DEBUG_BINARIES:=@DEBUG_BINARIES@
-
- #
- # Compress (or not) jars
-diff -r 1380ce862bbd -r 19e8754f5415 make/common/NativeCompilation.gmk
---- openjdk/make/common/NativeCompilation.gmk Mon Jul 16 15:37:08 2018 +0100
-+++ openjdk/make/common/NativeCompilation.gmk Tue Jul 17 12:55:54 2018 +0200
-@@ -260,6 +260,10 @@
- $1_CC:=$(CC)
- endif
-
-+ ifeq ($$($1_STRIP_POLICY),)
-+ $1_STRIP_POLICY:=$$(STRIP_POLICY)
-+ endif
-+
- # Make sure the dirs exist.
- $$(eval $$(call MakeDir,$$($1_OBJECT_DIR) $$($1_OUTPUT_DIR)))
- $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d)))
-@@ -455,28 +459,34 @@
- ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X
- ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows
- ifeq ($(OPENJDK_TARGET_OS), solaris)
-- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-- # empty section headers until a fixed $(OBJCOPY) is available.
-- # An empty section header has sh_addr == 0 and sh_size == 0.
-- # This problem has only been seen on Solaris X64, but we call this tool
-- # on all Solaris builds just in case.
-- #
-- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-+ # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-+ # empty section headers until a fixed $(OBJCOPY) is available.
-+ # An empty section header has sh_addr == 0 and sh_size == 0.
-+ # This problem has only been seen on Solaris X64, but we call this tool
-+ # on all Solaris builds just in case.
-+ #
-+ # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-+ # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-+ $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
- $(RM) $$@
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
- $(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
-+ endif
- else # not solaris
-- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
- $(RM) $$@
- $(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
-+ endif
- endif # Touch to not retrigger rule on rebuild
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
- $(TOUCH) $$@
-+ endif
- endif # !windows
- endif # !macosx
-
-@@ -500,7 +510,9 @@
- $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \
- $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb
- else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
-- $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
-+ endif
- endif
- endif
- endif
-@@ -539,28 +551,34 @@
- ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X
- ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows
- ifeq ($(OPENJDK_TARGET_OS), solaris)
-- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-- # empty section headers until a fixed $(OBJCOPY) is available.
-- # An empty section header has sh_addr == 0 and sh_size == 0.
-- # This problem has only been seen on Solaris X64, but we call this tool
-- # on all Solaris builds just in case.
-- #
-- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-+ # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-+ # empty section headers until a fixed $(OBJCOPY) is available.
-+ # An empty section header has sh_addr == 0 and sh_size == 0.
-+ # This problem has only been seen on Solaris X64, but we call this tool
-+ # on all Solaris builds just in case.
-+ #
-+ # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-+ # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-+ $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
- $(RM) $$@
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
- $(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
-+ endif
- else # not solaris
-- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
- $(RM) $$@
- $(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
-+ endif
- endif
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
- $(TOUCH) $$@
-+ endif
- endif # !windows
- endif # !macosx
-
-@@ -584,7 +602,9 @@
- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \
- $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb
- else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
-- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo
-+ endif
- endif
- endif
- endif
-
diff --git a/8044235-include-all-srcs.patch b/8044235-include-all-srcs.patch
deleted file mode 100644
index 1beda6d..0000000
--- a/8044235-include-all-srcs.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-# HG changeset patch
-# User omajid
-# Date 1401638044 14400
-# Sun Jun 01 11:54:04 2014 -0400
-# Node ID fd78f7e83f3f1ce7d363b681b97583138218afcb
-# Parent 8d0af21b5b9789f97b05edacc221a63f851d13b8
-8044235: src.zip should include all sources
-Reviewed-by: andrew, dholmes
-
-diff --git a/make/CreateJars.gmk b/make/CreateJars.gmk
---- openjdk/jdk/make/CreateJars.gmk
-+++ openjdk/jdk/make/CreateJars.gmk
-@@ -584,40 +584,53 @@
-
- ##########################################################################################
-
--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 \
-- 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 \
-- #
-+ifdef OPENJDK
-+ SRC_ZIP_INCLUDES = \
-+ com \
-+ java \
-+ javax \
-+ jdk \
-+ org \
-+ sun \
-+ #
-+ SRC_ZIP_EXCLUDES =
-+else
-+ 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 \
-+ 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 \
-+ #
-+ SRC_ZIP_EXCLUDES = javax/swing/beaninfo
-+endif
-
- SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes
- SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc
-@@ -648,7 +661,7 @@
- $(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
- SRC := $(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src, \
- INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \
-- EXCLUDES := javax/swing/beaninfo, \
-+ EXCLUDES := $(SRC_ZIP_EXCLUDES), \
- SUFFIXES := .java .c .h, \
- ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
- EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))
diff --git a/8044762-pr2960.patch b/8044762-pr2960.patch
deleted file mode 100644
index af5b606..0000000
--- a/8044762-pr2960.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-# HG changeset patch
-# User dsamersoff
-# Date 1403087398 25200
-# Wed Jun 18 03:29:58 2014 -0700
-# Node ID 13411144d46b50d0087f35eca2b8e827aae558f1
-# Parent 10c9f8461c297a200ef57970c1f4c32d4081d790
-8044762, PR2960: com/sun/jdi/OptionTest.java test time out
-Summary: gdata could be NULL in debugInit_exit
-Reviewed-by: dcubed
-
-diff -r 10c9f8461c29 -r 13411144d46b src/share/back/debugInit.c
---- openjdk/jdk/src/share/back/debugInit.c Fri May 20 19:42:05 2016 +0100
-+++ openjdk/jdk/src/share/back/debugInit.c Wed Jun 18 03:29:58 2014 -0700
-@@ -1307,22 +1307,26 @@
- if ( error != JVMTI_ERROR_NONE ) {
- exit_code = 1;
- if ( docoredump ) {
-+ LOG_MISC(("Dumping core as requested by command line"));
- finish_logging(exit_code);
- abort();
- }
- }
-+
- if ( msg==NULL ) {
- msg = "";
- }
-
- LOG_MISC(("Exiting with error %s(%d): %s", jvmtiErrorText(error), error, msg));
-
-- gdata->vmDead = JNI_TRUE;
-+ if (gdata != NULL) {
-+ gdata->vmDead = JNI_TRUE;
-
-- /* Let's try and cleanup the JVMTI, if we even have one */
-- if ( gdata->jvmti != NULL ) {
-- /* Dispose of jvmti (gdata->jvmti becomes NULL) */
-- disposeEnvironment(gdata->jvmti);
-+ /* Let's try and cleanup the JVMTI, if we even have one */
-+ if ( gdata->jvmti != NULL ) {
-+ /* Dispose of jvmti (gdata->jvmti becomes NULL) */
-+ disposeEnvironment(gdata->jvmti);
-+ }
- }
-
- /* Finish up logging. We reach here if JDWP is doing the exiting. */
diff --git a/8049226-pr2960.patch b/8049226-pr2960.patch
deleted file mode 100644
index 0f6bdf8..0000000
--- a/8049226-pr2960.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-# HG changeset patch
-# User dsamersoff
-# Date 1409228402 25200
-# Thu Aug 28 05:20:02 2014 -0700
-# Node ID f4c9545cd8a56a5fab74c95de3573623ba2b83c4
-# Parent 13411144d46b50d0087f35eca2b8e827aae558f1
-8049226, PR2960: com/sun/jdi/OptionTest.java test times out again
-Summary: Don't call jni_FatalError if transport initialization fails
-Reviewed-by: sspitsyn, sla
-
-diff -r 13411144d46b -r f4c9545cd8a5 src/share/back/debugInit.c
---- openjdk/jdk/src/share/back/debugInit.c Wed Jun 18 03:29:58 2014 -0700
-+++ openjdk/jdk/src/share/back/debugInit.c Thu Aug 28 05:20:02 2014 -0700
-@@ -1013,7 +1013,7 @@
- atexit_finish_logging(void)
- {
- /* Normal exit(0) (not _exit()) may only reach here */
-- finish_logging(0); /* Only first call matters */
-+ finish_logging(); /* Only first call matters */
- }
-
- static jboolean
-@@ -1301,43 +1301,49 @@
- void
- debugInit_exit(jvmtiError error, const char *msg)
- {
-- int exit_code = 0;
-+ enum exit_codes { EXIT_NO_ERRORS = 0, EXIT_JVMTI_ERROR = 1, EXIT_TRANSPORT_ERROR = 2 };
-
-- /* Pick an error code */
-- if ( error != JVMTI_ERROR_NONE ) {
-- exit_code = 1;
-- if ( docoredump ) {
-- LOG_MISC(("Dumping core as requested by command line"));
-- finish_logging(exit_code);
-- abort();
-- }
-+ // Prepare to exit. Log error and finish logging
-+ LOG_MISC(("Exiting with error %s(%d): %s", jvmtiErrorText(error), error,
-+ ((msg == NULL) ? "" : msg)));
-+
-+ // coredump requested by command line. Keep JVMTI data dirty
-+ if (error != JVMTI_ERROR_NONE && docoredump) {
-+ LOG_MISC(("Dumping core as requested by command line"));
-+ finish_logging();
-+ abort();
- }
-
-- if ( msg==NULL ) {
-- msg = "";
-- }
-+ finish_logging();
-
-- LOG_MISC(("Exiting with error %s(%d): %s", jvmtiErrorText(error), error, msg));
--
-+ // Cleanup the JVMTI if we have one
- if (gdata != NULL) {
- gdata->vmDead = JNI_TRUE;
--
-- /* Let's try and cleanup the JVMTI, if we even have one */
-- if ( gdata->jvmti != NULL ) {
-- /* Dispose of jvmti (gdata->jvmti becomes NULL) */
-+ if (gdata->jvmti != NULL) {
-+ // Dispose of jvmti (gdata->jvmti becomes NULL)
- disposeEnvironment(gdata->jvmti);
- }
- }
-
-- /* Finish up logging. We reach here if JDWP is doing the exiting. */
-- finish_logging(exit_code); /* Only first call matters */
--
-- /* Let's give the JNI a FatalError if non-exit 0, which is historic way */
-- if ( exit_code != 0 ) {
-- JNIEnv *env = NULL;
-- jniFatalError(env, msg, error, exit_code);
-+ // We are here with no errors. Kill entire process and exit with zero exit code
-+ if (error == JVMTI_ERROR_NONE) {
-+ forceExit(EXIT_NO_ERRORS);
-+ return;
- }
-
-- /* Last chance to die, this kills the entire process. */
-- forceExit(exit_code);
-+ // No transport initilized.
-+ // As we don't have any details here exiting with separate exit code
-+ if (error == AGENT_ERROR_TRANSPORT_INIT) {
-+ forceExit(EXIT_TRANSPORT_ERROR);
-+ return;
-+ }
-+
-+ // We have JVMTI error. Call hotspot jni_FatalError handler
-+ jniFatalError(NULL, msg, error, EXIT_JVMTI_ERROR);
-+
-+ // hotspot calls os:abort() so we should never reach code below,
-+ // but guard against possible hotspot changes
-+
-+ // Last chance to die, this kills the entire process.
-+ forceExit(EXIT_JVMTI_ERROR);
- }
-diff -r 13411144d46b -r f4c9545cd8a5 src/share/back/log_messages.c
---- openjdk/jdk/src/share/back/log_messages.c Wed Jun 18 03:29:58 2014 -0700
-+++ openjdk/jdk/src/share/back/log_messages.c Thu Aug 28 05:20:02 2014 -0700
-@@ -230,7 +230,7 @@
-
- /* Finish up logging, flush output to the logfile. */
- void
--finish_logging(int exit_code)
-+finish_logging()
- {
- #ifdef JDWP_LOGGING
- MUTEX_LOCK(my_mutex);
-diff -r 13411144d46b -r f4c9545cd8a5 src/share/back/log_messages.h
---- openjdk/jdk/src/share/back/log_messages.h Wed Jun 18 03:29:58 2014 -0700
-+++ openjdk/jdk/src/share/back/log_messages.h Thu Aug 28 05:20:02 2014 -0700
-@@ -29,7 +29,7 @@
- /* LOG: Must be called like: LOG_category(("anything")) or LOG_category((format,args)) */
-
- void setup_logging(const char *, unsigned);
--void finish_logging(int);
-+void finish_logging();
-
- #define LOG_NULL ((void)0)
-
diff --git a/8061305-pr3335-rh1423421.patch b/8061305-pr3335-rh1423421.patch
deleted file mode 100644
index 384c52a..0000000
--- a/8061305-pr3335-rh1423421.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# HG changeset patch
-# User ksrini
-# Date 1414764176 25200
-# Fri Oct 31 07:02:56 2014 -0700
-# Node ID 9fd9a50e7994a9659c5ef21296d0baee4c2eecff
-# Parent fd59a2d4313440077fce3fbf39174755a15d285a
-8061305: Javadoc crashes when method name ends with "Property"
-Reviewed-by: jjg
-
-diff --git jdk8/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java jdk8/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
---- jdk8/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
-+++ jdk8/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
-@@ -656,6 +656,9 @@
- // properties aren't named setA* or getA*
- private final Pattern pattern = Pattern.compile("[sg]et\\p{Upper}.*");
- private boolean isPropertyMethod(MethodDoc method) {
-+ if (!configuration.javafx) {
-+ return false;
-+ }
- if (!method.name().endsWith("Property")) {
- return false;
- }
-@@ -667,7 +670,9 @@
- if (pattern.matcher(method.name()).matches()) {
- return false;
- }
--
-+ if (method.typeParameters().length > 0) {
-+ return false;
-+ }
- return 0 == method.parameters().length
- && !"void".equals(method.returnType().simpleTypeName());
- }
diff --git a/8062808-pr3548.patch b/8062808-pr3548.patch
deleted file mode 100644
index e91abd3..0000000
--- a/8062808-pr3548.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-# HG changeset patch
-# User stefank
-# Date 1525453613 -3600
-# Fri May 04 18:06:53 2018 +0100
-# Node ID 07a1135a327362f157955d470fad5df07cc35164
-# Parent de79964656fc652f2085dac4fe99bcc128b5a3b1
-8062808, PR3548: Turn on the -Wreturn-type warning
-Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make
-@@ -210,7 +210,7 @@
- WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body
- endif
-
--WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value
-+WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value -Wreturn-type
-
- ifeq ($(USE_CLANG),)
- # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
-diff --git openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
---- openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad
-+++ openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
-@@ -1250,6 +1250,7 @@
-
-
- Unimplemented();
-+ return 0; // Mute compiler
- }
-
- #ifndef PRODUCT
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
-@@ -541,6 +541,7 @@
- err.report_and_die();
-
- ShouldNotReachHere();
-+ return true; // Mute compiler
- }
-
- void os::Linux::init_thread_fpu_state(void) {
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
-@@ -506,7 +506,7 @@
- ss.write((const char*)name->bytes(), name->utf8_length());
- ss.write((const char*)signature->bytes(), signature->utf8_length());
- ss.print(" is abstract");
-- return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
-+ return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
- }
-
- Symbol* MethodFamily::generate_conflicts_message(GrowableArray<Method*>* methods, TRAPS) const {
-@@ -521,7 +521,7 @@
- ss.print(".");
- ss.write((const char*)name->bytes(), name->utf8_length());
- }
-- return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
-+ return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
- }
-
-
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
-@@ -249,7 +249,7 @@
- MutexLocker ml(SymbolTable_lock, THREAD);
-
- // Otherwise, add to symbol to table
-- return the_table()->basic_add(index, (u1*)name, len, hashValue, true, CHECK_NULL);
-+ return the_table()->basic_add(index, (u1*)name, len, hashValue, true, THREAD);
- }
-
- Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) {
-@@ -288,7 +288,7 @@
- // Grab SymbolTable_lock first.
- MutexLocker ml(SymbolTable_lock, THREAD);
-
-- return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, CHECK_NULL);
-+ return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, THREAD);
- }
-
- Symbol* SymbolTable::lookup_only(const char* name, int len,
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
-@@ -229,15 +229,15 @@
- class_name->as_C_string(),
- class_loader.is_null() ? "null" : class_loader->klass()->name()->as_C_string()));
- if (FieldType::is_array(class_name)) {
-- return resolve_array_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
-+ return resolve_array_class_or_null(class_name, class_loader, protection_domain, THREAD);
- } else if (FieldType::is_obj(class_name)) {
- ResourceMark rm(THREAD);
- // Ignore wrapping L and ;.
- TempNewSymbol name = SymbolTable::new_symbol(class_name->as_C_string() + 1,
- class_name->utf8_length() - 2, CHECK_NULL);
-- return resolve_instance_class_or_null(name, class_loader, protection_domain, CHECK_NULL);
-+ return resolve_instance_class_or_null(name, class_loader, protection_domain, THREAD);
- } else {
-- return resolve_instance_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
-+ return resolve_instance_class_or_null(class_name, class_loader, protection_domain, THREAD);
- }
- }
-
-diff --git openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
---- openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp
-+++ openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
-@@ -367,7 +367,7 @@
- _csv_format(csv_format), _print_help(print_help),
- _print_class_stats(print_class_stats), _columns(columns) {}
- void heap_inspection(outputStream* st) NOT_SERVICES_RETURN;
-- size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN;
-+ size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN_(0);
- static void find_instances_at_safepoint(Klass* k, GrowableArray<oop>* result) NOT_SERVICES_RETURN;
- private:
- void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL);
-diff --git openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
---- openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp
-+++ openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
-@@ -93,7 +93,7 @@
- static void preload_and_dump(TRAPS) NOT_CDS_RETURN;
- static int preload_and_dump(const char * class_list_path,
- GrowableArray<Klass*>* class_promote_order,
-- TRAPS) NOT_CDS_RETURN;
-+ TRAPS) NOT_CDS_RETURN_(0);
-
- static ReservedSpace* shared_rs() {
- CDS_ONLY(return _shared_rs);
-diff --git openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp openjdk/hotspot/src/share/vm/oops/constantPool.hpp
---- openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp
-+++ openjdk/hotspot/src/share/vm/oops/constantPool.hpp
-@@ -352,7 +352,7 @@
-
- Klass* klass_at(int which, TRAPS) {
- constantPoolHandle h_this(THREAD, this);
-- return klass_at_impl(h_this, which, CHECK_NULL);
-+ return klass_at_impl(h_this, which, THREAD);
- }
-
- Symbol* klass_name_at(int which); // Returns the name, w/o resolving.
-diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
---- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
-+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
-@@ -4244,7 +4244,7 @@
- JVM_DTraceProvider* providers))
- JVMWrapper("JVM_DTraceActivate");
- return DTraceJSDT::activate(
-- version, module_name, providers_count, providers, CHECK_0);
-+ version, module_name, providers_count, providers, THREAD);
- JVM_END
-
- JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method))
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp openjdk/hotspot/src/share/vm/runtime/reflection.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/reflection.cpp
-@@ -1093,7 +1093,7 @@
- } else {
- if (rtype == T_BOOLEAN || rtype == T_BYTE || rtype == T_CHAR || rtype == T_SHORT)
- narrow((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
-- return box((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
-+ return box((jvalue*) result.get_value_addr(), rtype, THREAD);
- }
- }
-
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
-@@ -1046,7 +1046,7 @@
- // last java frame on stack (which includes native call frames)
- vframeStream vfst(thread, true); // Do not skip and javaCalls
-
-- return find_callee_info_helper(thread, vfst, bc, callinfo, CHECK_(Handle()));
-+ return find_callee_info_helper(thread, vfst, bc, callinfo, THREAD);
- }
-
-
-diff --git openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp openjdk/hotspot/src/share/vm/services/memTracker.hpp
---- openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp
-+++ openjdk/hotspot/src/share/vm/services/memTracker.hpp
-@@ -64,7 +64,7 @@
- const NativeCallStack& stack, MEMFLAGS flag = mtNone) { }
- static inline void record_virtual_memory_commit(void* addr, size_t size, const NativeCallStack& stack) { }
- static inline Tracker get_virtual_memory_uncommit_tracker() { return Tracker(); }
-- static inline Tracker get_virtual_memory_release_tracker() { }
-+ static inline Tracker get_virtual_memory_release_tracker() { return Tracker(); }
- static inline void record_virtual_memory_type(void* addr, MEMFLAGS flag) { }
- static inline void record_thread_stack(void* addr, size_t size) { }
- static inline void release_thread_stack(void* addr, size_t size) { }
diff --git a/8064786-pr3599.patch b/8064786-pr3599.patch
deleted file mode 100644
index 790ee0d..0000000
--- a/8064786-pr3599.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# HG changeset patch
-# User goetz
-# Date 1415873641 -3600
-# Thu Nov 13 11:14:01 2014 +0100
-# Node ID 1878c4c1d04e1f3c6f67a19d36c35863d6b5f906
-# Parent 533473c67de6ff767710594639033c8e83523fe5
-8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning
-Reviewed-by: stefank, tschatzl
-
-diff --git openjdk.orig/hotspot/src/share/vm/prims/jni.cpp openjdk/hotspot/src/share/vm/prims/jni.cpp
---- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp
-+++ openjdk/hotspot/src/share/vm/prims/jni.cpp
-@@ -708,6 +708,7 @@
-
- THROW_OOP_(JNIHandles::resolve(obj), JNI_OK);
- ShouldNotReachHere();
-+ return 0; // Mute compiler.
- JNI_END
-
- #ifndef USDT2
-@@ -734,6 +735,7 @@
- Handle protection_domain (THREAD, k->protection_domain());
- THROW_MSG_LOADER_(name, (char *)message, class_loader, protection_domain, JNI_OK);
- ShouldNotReachHere();
-+ return 0; // Mute compiler.
- JNI_END
-
-
diff --git a/8075942-pr3602-rh1582032.patch b/8075942-pr3602-rh1582032.patch
deleted file mode 100644
index bd2a40e..0000000
--- a/8075942-pr3602-rh1582032.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-# HG changeset patch
-# User prr
-# Date 1429299166 25200
-# Fri Apr 17 12:32:46 2015 -0700
-# Node ID 1f4b038b9550afaf88a70cee4cf9c1422ecd86d6
-# Parent 533117ae5b7587c8d9c0612581682ab984475430
-8075942, PR3602: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo
-Reviewed-by: flar, lbourges
-
-diff --git openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/Dasher.java openjdk/jdk/src/share/classes/sun/java2d/pisces/Dasher.java
---- openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/Dasher.java
-+++ openjdk/jdk/src/share/classes/sun/java2d/pisces/Dasher.java
-@@ -146,7 +146,7 @@
- if (dashOn) {
- if (starting) {
- firstSegmentsBuffer = Helpers.widenArray(firstSegmentsBuffer,
-- firstSegidx, type - 2);
-+ firstSegidx, type - 2 + 1);
- firstSegmentsBuffer[firstSegidx++] = type;
- System.arraycopy(pts, off, firstSegmentsBuffer, firstSegidx, type - 2);
- firstSegidx += type - 2;
-diff --git a/test/javopenjdk.orig/jdk/awt/BasicStroke/DashStrokeTest.java openjdk/jdk/test/java/awt/BasicStroke/DashStrokeTest.java
-new file mode 100644
---- /dev/null
-+++ openjdk/jdk/test/java/awt/BasicStroke/DashStrokeTest.java
-@@ -0,0 +1,69 @@
-+/*
-+ * Copyright (c) 2015, 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.
-+ *
-+ * 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.
-+ *
-+ * @test
-+ * @bug 8075942
-+ * @summary test there is no exception rendering a dashed stroke
-+ * @run DashStrokeTest
-+ * @run -Dsun.java2d.renderer=sun.java2d.pisces.PiscesRenderingEngine
-+ */
-+
-+import java.awt.BasicStroke;
-+import java.awt.Color;
-+import java.awt.Graphics2D;
-+import java.awt.Stroke;
-+import java.awt.geom.GeneralPath;
-+import java.awt.image.BufferedImage;
-+
-+
-+public class DashStrokeTest {
-+
-+ public static void main(String[] args) {
-+
-+ GeneralPath shape = new GeneralPath();
-+ int[] pointTypes = {0, 0, 1, 1, 0, 1, 1, 0};
-+ double[] xpoints = {428, 420, 400, 400, 400, 400, 420, 733};
-+ double[] ypoints = {180, 180, 180, 160, 30, 10, 10, 10};
-+ shape.moveTo(xpoints[0], ypoints[0]);
-+ for (int i = 1; i < pointTypes.length; i++) {
-+ if (pointTypes[i] == 1 && i < pointTypes.length - 1) {
-+ shape.quadTo(xpoints[i], ypoints[i],
-+ xpoints[i + 1], ypoints[i + 1]);
-+ } else {
-+ shape.lineTo(xpoints[i], ypoints[i]);
-+ }
-+ }
-+
-+ BufferedImage image = new
-+ BufferedImage(1000, 1000, BufferedImage.TYPE_INT_ARGB);
-+ Graphics2D g2 = image.createGraphics();
-+
-+ Color color = new Color(124, 0, 124, 255);
-+ g2.setColor(color);
-+ Stroke stroke = new BasicStroke(1.0f,
-+ BasicStroke.CAP_BUTT,
-+ BasicStroke.JOIN_BEVEL,
-+ 10.0f, new float[] {9, 6}, 0.0f);
-+ g2.setStroke(stroke);
-+ g2.draw(shape);
-+ }
-+}
diff --git a/8141570-pr3548.patch b/8141570-pr3548.patch
deleted file mode 100644
index f1e3215..0000000
--- a/8141570-pr3548.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-# HG changeset patch
-# User coleenp
-# Date 1525713256 -3600
-# Mon May 07 18:14:16 2018 +0100
-# Node ID bcbc64dfb629c5f188bbf59b8f986ad95963ed60
-# Parent 07a1135a327362f157955d470fad5df07cc35164
-8141570, PR3548: Fix Zero interpreter build for --disable-precompiled-headers
-Summary: change to include atomic.inline.hpp and allocation.inline.hpp only in .cpp files and some build fixes from Kim to build on ubuntu without devkits
-Reviewed-by: kbarrett, sgehwolf, erikj
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
---- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
-+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- # Copyright 2007, 2008 Red Hat, Inc.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- #
-@@ -25,8 +25,15 @@
-
- # Setup common to Zero (non-Shark) and Shark versions of VM
-
--# override this from the main file because some version of llvm do not like -Wundef
--WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wunused-function -Wunused-value
-+# Some versions of llvm do not like -Wundef
-+ifeq ($(USE_CLANG), true)
-+ WARNING_FLAGS += -Wno-undef
-+endif
-+# Suppress some warning flags that are normally turned on for hotspot,
-+# because some of the zero code has not been updated accordingly.
-+WARNING_FLAGS += -Wno-return-type \
-+ -Wno-format-nonliteral -Wno-format-security \
-+ -Wno-maybe-uninitialized
-
- # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
- OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-@@ -42,5 +49,3 @@
- ifeq ($(ARCH_DATA_MODEL), 64)
- CFLAGS += -D_LP64=1
- endif
--
--OPT_CFLAGS/compactingPermGenGen.o = -O1
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/java.cpp openjdk/hotspot/src/share/vm/runtime/java.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/java.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/java.cpp
-@@ -45,6 +45,7 @@
- #include "runtime/arguments.hpp"
- #include "runtime/biasedLocking.hpp"
- #include "runtime/compilationPolicy.hpp"
-+#include "runtime/deoptimization.hpp"
- #include "runtime/fprofiler.hpp"
- #include "runtime/init.hpp"
- #include "runtime/interfaceSupport.hpp"
diff --git a/8143245-pr3548.patch b/8143245-pr3548.patch
deleted file mode 100644
index eccb110..0000000
--- a/8143245-pr3548.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-# HG changeset patch
-# User sgehwolf
-# Date 1525714161 -3600
-# Mon May 07 18:29:21 2018 +0100
-# Node ID afb31413c73cbc06420fdb447aa90a7a38258904
-# Parent bcbc64dfb629c5f188bbf59b8f986ad95963ed60
-8143245, PR3548: Zero build requires disabled warnings
-Reviewed-by: dholmes, coleenp
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
---- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
-+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
- # Copyright 2007, 2008 Red Hat, Inc.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- #
-@@ -29,11 +29,6 @@
- ifeq ($(USE_CLANG), true)
- WARNING_FLAGS += -Wno-undef
- endif
--# Suppress some warning flags that are normally turned on for hotspot,
--# because some of the zero code has not been updated accordingly.
--WARNING_FLAGS += -Wno-return-type \
-- -Wno-format-nonliteral -Wno-format-security \
-- -Wno-maybe-uninitialized
-
- # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
- OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-diff --git openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
---- openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
-+++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
-@@ -100,7 +100,7 @@
- case T_DOUBLE:
- case T_VOID:
- return result;
-- default : ShouldNotReachHere();
-+ default : ShouldNotReachHere(); return NULL_WORD;
- }
- }
-
-diff --git openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
---- openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
-+++ openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2007, 2008, 2010 Red Hat, Inc.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-@@ -62,7 +62,7 @@
- }
-
- void InterpreterRuntime::SignatureHandlerGeneratorBase::push(BasicType type) {
-- ffi_type *ftype;
-+ ffi_type *ftype = NULL;
- switch (type) {
- case T_VOID:
- ftype = &ffi_type_void;
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-@@ -1,6 +1,6 @@
- /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
-- * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
-+ * Copyright 2016 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
-@@ -61,6 +61,7 @@
-
- frame os::get_sender_for_C_frame(frame* fr) {
- ShouldNotCallThis();
-+ return frame(NULL, NULL); // silence compile warning.
- }
-
- frame os::current_frame() {
-@@ -98,16 +99,19 @@
-
- address os::Linux::ucontext_get_pc(ucontext_t* uc) {
- ShouldNotCallThis();
-+ return NULL; // silence compile warnings
- }
-
- ExtendedPC os::fetch_frame_from_context(void* ucVoid,
- intptr_t** ret_sp,
- intptr_t** ret_fp) {
- ShouldNotCallThis();
-+ return NULL; // silence compile warnings
- }
-
- frame os::fetch_frame_from_context(void* ucVoid) {
- ShouldNotCallThis();
-+ return frame(NULL, NULL); // silence compile warnings
- }
-
- extern "C" JNIEXPORT int
-@@ -247,11 +251,16 @@
- }
- #endif // !PRODUCT
-
-- const char *fmt = "caught unhandled signal %d";
- char buf[64];
-
-- sprintf(buf, fmt, sig);
-+ sprintf(buf, "caught unhandled signal %d", sig);
-+
-+// Silence -Wformat-security warning for fatal()
-+PRAGMA_DIAG_PUSH
-+PRAGMA_FORMAT_NONLITERAL_IGNORED
- fatal(buf);
-+PRAGMA_DIAG_POP
-+ return true; // silence compiler warnings
- }
-
- void os::Linux::init_thread_fpu_state(void) {
-@@ -260,6 +269,7 @@
-
- int os::Linux::get_fpu_control_word() {
- ShouldNotCallThis();
-+ return -1; // silence compile warnings
- }
-
- void os::Linux::set_fpu_control_word(int fpu) {
-@@ -408,6 +418,7 @@
-
- extern "C" {
- int SpinPause() {
-+ return -1; // silence compile warnings
- }
-
-
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-@@ -110,6 +110,7 @@
- void* ucontext,
- bool isInJava) {
- ShouldNotCallThis();
-+ return false; // silence compile warning
- }
-
- // These routines are only used on cpu architectures that
diff --git a/8148351-pr2842-02.patch b/8148351-pr2842-02.patch
deleted file mode 100644
index 1812e19..0000000
--- a/8148351-pr2842-02.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-# HG changeset patch
-# User ihse
-# Date 1454642639 0
-# Fri Feb 05 03:23:59 2016 +0000
-# Node ID 61798573efe5a9efa67e268a52cf61263abb4396
-# Parent 842cc183c9f6d29270ff002238248978c08f0a66
-8148351, PR2842: Only display resolved symlink for compiler, do not change path
-Reviewed-by: erikj
-
-diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
---- openjdk///common/autoconf/toolchain.m4
-+++ openjdk///common/autoconf/toolchain.m4
-@@ -198,38 +198,22 @@
- fi
- BASIC_FIXUP_EXECUTABLE($1)
- TEST_COMPILER="[$]$1"
-- # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links
-- # to 'xlc' but it is crucial that we invoke the compiler with the right name!
-- if test "x$OPENJDK_BUILD_OS" != xaix; then
-- AC_MSG_CHECKING([resolved symbolic links for $1])
-- BASIC_REMOVE_SYMBOLIC_LINKS(TEST_COMPILER)
-- AC_MSG_RESULT([$TEST_COMPILER])
-- fi
-- AC_MSG_CHECKING([if $1 is disguised ccache])
-
-- COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"`
-- if test "x$COMPILER_BASENAME" = "xccache"; then
-- AC_MSG_RESULT([yes, trying to find proper $COMPILER_NAME compiler])
-- # We /usr/lib/ccache in the path, so cc is a symlink to /usr/bin/ccache.
-- # We want to control ccache invocation ourselves, so ignore this cc and try
-- # searching again.
-+ AC_MSG_CHECKING([resolved symbolic links for $1])
-+ SYMLINK_ORIGINAL="$TEST_COMPILER"
-+ BASIC_REMOVE_SYMBOLIC_LINKS(SYMLINK_ORIGINAL)
-+ if test "x$TEST_COMPILER" = "x$SYMLINK_ORIGINAL"; then
-+ AC_MSG_RESULT([no symlink])
-+ else
-+ AC_MSG_RESULT([$SYMLINK_ORIGINAL])
-
-- # Remove the path to the fake ccache cc from the PATH
-- RETRY_COMPILER_SAVED_PATH="$PATH"
-- COMPILER_DIRNAME=`$DIRNAME [$]$1`
-- PATH="`$ECHO $PATH | $SED -e "s,$COMPILER_DIRNAME,,g" -e "s,::,:,g" -e "s,^:,,g"`"
--
-- # Try again looking for our compiler
-- AC_CHECK_TOOLS(PROPER_COMPILER_$1, $3)
-- BASIC_FIXUP_EXECUTABLE(PROPER_COMPILER_$1)
-- PATH="$RETRY_COMPILER_SAVED_PATH"
--
-- AC_MSG_CHECKING([for resolved symbolic links for $1])
-- BASIC_REMOVE_SYMBOLIC_LINKS(PROPER_COMPILER_$1)
-- AC_MSG_RESULT([$PROPER_COMPILER_$1])
-- $1="$PROPER_COMPILER_$1"
-- else
-- AC_MSG_RESULT([no, keeping $1])
-+ # We can't handle ccache by gcc wrappers, since we need to know if we're
-+ # using ccache. Instead ccache usage must be controlled by a configure option.
-+ COMPILER_BASENAME=`$BASENAME "$SYMLINK_ORIGINAL"`
-+ if test "x$COMPILER_BASENAME" = "xccache"; then
-+ AC_MSG_NOTICE([Please use --enable-ccache instead of providing a wrapped compiler.])
-+ AC_MSG_ERROR([$TEST_COMPILER is a symbolic link to ccache. This is not supported.])
-+ fi
- fi
-
- TOOLCHAIN_EXTRACT_COMPILER_VERSION([$1], [$COMPILER_NAME])
diff --git a/8150954-pr2866-rh1176206-screenshot-xcomposite-jdk.patch b/8150954-pr2866-rh1176206-screenshot-xcomposite-jdk.patch
deleted file mode 100644
index 8b62ae6..0000000
--- a/8150954-pr2866-rh1176206-screenshot-xcomposite-jdk.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-
-# HG changeset patch
-# User neugens
-# Date 1532089120 -7200
-# Node ID 7b30bb9b05bd2e8045bc693ea5be353ce6326396
-# Parent 3d8011a1e02179e5658110981e30274c605ceac8
-8150954: Taking screenshots on x11 composite desktop produce wrong result
-Summary: The AWT Robot X11 code that takes screenshots uses the default root window, which may not contain the final composited desktop.
-Reviewed-by: alexsch, ssadetsky, prr, dbuck
-
-diff -r 3d8011a1e021 -r 7b30bb9b05bd make/mapfiles/libawt_xawt/mapfile-vers
---- openjdk/jdk/make/mapfiles/libawt_xawt/mapfile-vers Thu Jul 19 03:31:37 2018 +0100
-+++ openjdk/jdk/make/mapfiles/libawt_xawt/mapfile-vers Fri Jul 20 14:18:40 2018 +0200
-@@ -158,6 +158,7 @@
- Java_sun_awt_X11_XRobotPeer_mouseReleaseImpl;
- Java_sun_awt_X11_XRobotPeer_mouseWheelImpl;
- Java_sun_awt_X11_XRobotPeer_setup;
-+ Java_sun_awt_X11_XRobotPeer_loadNativeLibraries;
- Java_sun_awt_X11_XToolkit_getNumberOfButtonsImpl;
- Java_java_awt_Component_initIDs;
- Java_java_awt_Container_initIDs;
-diff -r 3d8011a1e021 -r 7b30bb9b05bd src/solaris/classes/sun/awt/X11/XRobotPeer.java
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XRobotPeer.java Thu Jul 19 03:31:37 2018 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XRobotPeer.java Fri Jul 20 14:18:40 2018 +0200
-@@ -34,6 +34,10 @@
-
- class XRobotPeer implements RobotPeer {
-
-+ static {
-+ loadNativeLibraries();
-+ }
-+
- private X11GraphicsConfig xgc = null;
- /*
- * native implementation uses some static shared data (pipes, processes)
-@@ -98,4 +102,5 @@
- private static native synchronized void keyReleaseImpl(int keycode);
-
- private static native synchronized void getRGBPixelsImpl(X11GraphicsConfig xgc, int x, int y, int width, int height, int pixelArray[]);
-+ private static native void loadNativeLibraries();
- }
-diff -r 3d8011a1e021 -r 7b30bb9b05bd src/solaris/native/sun/awt/awt_Robot.c
---- openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c Thu Jul 19 03:31:37 2018 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c Fri Jul 20 14:18:40 2018 +0200
-@@ -27,6 +27,9 @@
- #error This file should not be included in headless library
- #endif
-
-+#include "jvm_md.h"
-+#include <dlfcn.h>
-+
- #include "awt_p.h"
- #include "awt_GraphicsEnv.h"
- #define XK_MISCELLANY
-@@ -49,11 +52,46 @@
- #include <sys/socket.h>
- #endif
-
-+static Bool (*compositeQueryExtension) (Display*, int*, int*);
-+static Status (*compositeQueryVersion) (Display*, int*, int*);
-+static Window (*compositeGetOverlayWindow) (Display *, Window);
-+
- extern struct X11GraphicsConfigIDs x11GraphicsConfigIDs;
-
- static jint * masks;
- static jint num_buttons;
-
-+static void *xCompositeHandle;
-+
-+static const char* XCOMPOSITE = JNI_LIB_NAME("Xcomposite");
-+static const char* XCOMPOSITE_VERSIONED = VERSIONED_JNI_LIB_NAME("Xcomposite", "1");
-+
-+static Bool checkXCompositeFunctions(void) {
-+ return (compositeQueryExtension != NULL &&
-+ compositeQueryVersion != NULL &&
-+ compositeGetOverlayWindow != NULL);
-+}
-+
-+static void initXCompositeFunctions(void) {
-+
-+ if (xCompositeHandle == NULL) {
-+ xCompositeHandle = dlopen(XCOMPOSITE, RTLD_LAZY | RTLD_GLOBAL);
-+ if (xCompositeHandle == NULL) {
-+ xCompositeHandle = dlopen(XCOMPOSITE_VERSIONED, RTLD_LAZY | RTLD_GLOBAL);
-+ }
-+ }
-+ //*(void **)(&asyncGetCallTraceFunction)
-+ if (xCompositeHandle != NULL) {
-+ *(void **)(&compositeQueryExtension) = dlsym(xCompositeHandle, "XCompositeQueryExtension");
-+ *(void **)(&compositeQueryVersion) = dlsym(xCompositeHandle, "XCompositeQueryVersion");
-+ *(void **)(&compositeGetOverlayWindow) = dlsym(xCompositeHandle, "XCompositeGetOverlayWindow");
-+ }
-+
-+ if (xCompositeHandle && !checkXCompositeFunctions()) {
-+ dlclose(xCompositeHandle);
-+ }
-+}
-+
- static int32_t isXTestAvailable() {
- int32_t major_opcode, first_event, first_error;
- int32_t event_basep, error_basep, majorp, minorp;
-@@ -88,6 +126,35 @@
- return isXTestAvailable;
- }
-
-+static Bool hasXCompositeOverlayExtension(Display *display) {
-+
-+ int xoverlay = False;
-+ int eventBase, errorBase;
-+ if (checkXCompositeFunctions() &&
-+ compositeQueryExtension(display, &eventBase, &errorBase))
-+ {
-+ int major = 0;
-+ int minor = 0;
-+
-+ compositeQueryVersion(display, &major, &minor);
-+ if (major > 0 || minor >= 3) {
-+ xoverlay = True;
-+ }
-+ }
-+
-+ return xoverlay;
-+}
-+
-+static jboolean isXCompositeDisplay(Display *display, int screenNumber) {
-+
-+ char NET_WM_CM_Sn[25];
-+ snprintf(NET_WM_CM_Sn, sizeof(NET_WM_CM_Sn), "_NET_WM_CM_S%d\0", screenNumber);
-+
-+ Atom managerSelection = XInternAtom(display, NET_WM_CM_Sn, 0);
-+ Window owner = XGetSelectionOwner(display, managerSelection);
-+
-+ return owner != 0;
-+}
-
- static XImage *getWindowImage(Display * display, Window window,
- int32_t x, int32_t y,
-@@ -232,6 +299,12 @@
- DASSERT(adata != NULL);
-
- rootWindow = XRootWindow(awt_display, adata->awt_visInfo.screen);
-+ if (hasXCompositeOverlayExtension(awt_display) &&
-+ isXCompositeDisplay(awt_display, adata->awt_visInfo.screen))
-+ {
-+ rootWindow = compositeGetOverlayWindow(awt_display, rootWindow);
-+ }
-+
- image = getWindowImage(awt_display, rootWindow, x, y, width, height);
-
- /* Array to use to crunch around the pixel values */
-@@ -412,3 +485,8 @@
-
- AWT_UNLOCK();
- }
-+
-+JNIEXPORT void JNICALL
-+Java_sun_awt_X11_XRobotPeer_loadNativeLibraries (JNIEnv *env, jclass cls) {
-+ initXCompositeFunctions();
-+}
-
diff --git a/8154313.patch b/8154313.patch
deleted file mode 100644
index 3a43c5f..0000000
--- a/8154313.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- jdk8/make/Javadoc.gmk 2016-04-01 16:53:41.069477682 +0200
-+++ jdk8/make/Javadoc.gmk 2016-04-01 16:53:41.014477059 +0200
-@@ -220,6 +220,12 @@
- JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
- PLATFORM_DOCSDIR = $(DOCSDIR)/platform
-
-+
-+JAVADOC_ARCHIVE_NAME := jdk-$(FULL_VERSION)-docs.zip
-+JAVADOC_ARCHIVE_ASSEMBLY_DIR := $(DOCSTMPDIR)/zip-docs
-+JAVADOC_ARCHIVE_DIR := $(OUTPUT_ROOT)/bundles
-+JAVADOC_ARCHIVE := $(JAVADOC_ARCHIVE_DIR)/$(JAVADOC_ARCHIVE_NAME)
-+
- # The non-core api javadocs need to be able to access the root of the core
- # api directory, so for jdk/api or jre/api to get to the core api/
- # directory we would use this:
-@@ -319,6 +325,37 @@
- all: docs
- docs: coredocs otherdocs
-
-+#
-+# Optional target which bundles all generated javadocs into a zip
-+# archive. The dependency on docs is handled in Main.gmk. Incremental
-+# building of docs is currently broken so if you invoke zip-docs after
-+# docs, the docs are always rebuilt.
-+#
-+
-+zip-docs: $(JAVADOC_ARCHIVE)
-+
-+#
-+# Add the core docs as prerequisite to the archive to trigger a rebuild
-+# if the core docs were rebuilt. Ideally any doc rebuild should trigger
-+# this, but the way prerequisites are currently setup in this file, that
-+# is hard to achieve.
-+#
-+
-+$(JAVADOC_ARCHIVE): $(COREAPI_INDEX_FILE)
-+ @$(ECHO) "Compressing javadoc to single $(JAVADOC_ARCHIVE_NAME)" ;
-+ $(MKDIR) -p $(JAVADOC_ARCHIVE_DIR) ;
-+ $(RM) -r $(JAVADOC_ARCHIVE_ASSEMBLY_DIR) ;
-+ $(MKDIR) -p $(JAVADOC_ARCHIVE_ASSEMBLY_DIR);
-+ all_roots=`$(FIND) $(DOCSDIR) | $(GREP) index.html `; \
-+ pushd $(JAVADOC_ARCHIVE_ASSEMBLY_DIR); \
-+ for index_file in $${all_roots} ; do \
-+ target_dir=`dirname $${index_file}`; \
-+ name=`$(ECHO) $${target_dir} | $(SED) "s;/spec;;" | $(SED) "s;.*/;;"`; \
-+ $(LN) -s $${target_dir} $${name}; \
-+ done; \
-+ $(ZIP) -q -r $(JAVADOC_ARCHIVE) * ; \
-+ popd ;
-+
- #################################################################
- # Production Targets -- USE THESE TARGETS WHEN:
- # a) You're generating docs outside of release engineering's
---- jdk8/make/Main.gmk 2016-04-01 16:53:41.311480424 +0200
-+++ jdk8/make/Main.gmk 2016-04-01 16:53:41.266479914 +0200
-@@ -165,6 +165,12 @@
- @($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
- @$(call TargetExit)
-
-+zip-docs: docs zip-docs-only
-+zip-docs-only: start-make
-+ @$(call TargetEnter)
-+ @($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk zip-docs)
-+ @$(call TargetExit)
-+
- sign-jars: jdk sign-jars-only
- sign-jars-only: start-make
- @$(call TargetEnter)
diff --git a/8164293-pr3412-rh1459641.patch b/8164293-pr3412-rh1459641.patch
deleted file mode 100644
index 3b08f8b..0000000
--- a/8164293-pr3412-rh1459641.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-# HG changeset patch
-# User jcm
-# Date 1484137609 28800
-# Wed Jan 11 04:26:49 2017 -0800
-# Node ID 1faf7c17089922f6f72b580253725f2ecb6ba2f8
-# Parent 3d07e14d65bc223dbfe94be9224e4aa8c6e63762
-8164293, PR3412, RH1459641: HotSpot leaking memory in long-running requests
-Summary: Applied RMs in sweep_code_cache and related codes.
-Reviewed-by: kvn, thartmann
-
-diff --git a/src/share/vm/code/nmethod.cpp b/src/share/vm/code/nmethod.cpp
---- openjdk/hotspot/src/share/vm/code/nmethod.cpp
-+++ openjdk/hotspot/src/share/vm/code/nmethod.cpp
-@@ -1172,6 +1172,7 @@
- // Clear ICStubs of all compiled ICs
- void nmethod::clear_ic_stubs() {
- assert_locked_or_safepoint(CompiledIC_lock);
-+ ResourceMark rm;
- RelocIterator iter(this);
- while(iter.next()) {
- if (iter.type() == relocInfo::virtual_call_type) {
-diff --git a/src/share/vm/runtime/sweeper.cpp b/src/share/vm/runtime/sweeper.cpp
---- openjdk/hotspot/src/share/vm/runtime/sweeper.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/sweeper.cpp
-@@ -319,6 +319,7 @@
- }
-
- void NMethodSweeper::sweep_code_cache() {
-+ ResourceMark rm;
- Ticks sweep_start_counter = Ticks::now();
-
- _flushed_count = 0;
-@@ -626,6 +627,7 @@
- // state of the code cache if it's requested.
- void NMethodSweeper::log_sweep(const char* msg, const char* format, ...) {
- if (PrintMethodFlushing) {
-+ ResourceMark rm;
- stringStream s;
- // Dump code cache state into a buffer before locking the tty,
- // because log_state() will use locks causing lock conflicts.
-@@ -643,6 +645,7 @@
- }
-
- if (LogCompilation && (xtty != NULL)) {
-+ ResourceMark rm;
- stringStream s;
- // Dump code cache state into a buffer before locking the tty,
- // because log_state() will use locks causing lock conflicts.
diff --git a/8165852-pr3468.patch b/8165852-pr3468.patch
deleted file mode 100644
index 6a9f643..0000000
--- a/8165852-pr3468.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java 2017-08-23 11:40:26.690809603 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java 2017-08-23 11:44:28.314815334 +0200
-@@ -74,8 +74,16 @@
- } catch (UnixException x) {
- x.rethrowAsIOException(parent);
- }
-- if (attrs.dev() != dev())
-- break;
-+ if (attrs.dev() != dev()) {
-+
-+ // step 3: lookup mounted file systems (use /proc/mounts to ensure we
-+ // find the file system even when not in /etc/mtab)
-+ byte[] dir = path.asByteArray();
-+ for (UnixMountEntry entry: fs.getMountEntries("/proc/mounts")) {
-+ if (Arrays.equals(dir, entry.dir()))
-+ return entry;
-+ }
-+ }
- path = parent;
- parent = parent.getParent();
- }
diff --git a/8171000-pr3542-rh1402819.patch b/8171000-pr3542-rh1402819.patch
deleted file mode 100644
index d831aa9..0000000
--- a/8171000-pr3542-rh1402819.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-# HG changeset patch
-# User kaddepalli
-# Date 1517818481 -19800
-# Mon Feb 05 13:44:41 2018 +0530
-# Node ID b77308735540644d4710244e3c88865067f2905a
-# Parent 39bfc94b1f4265b645c2970a58389acc779dafe9
-8171000, PR3542, RH1402819: Robot.createScreenCapture() crashes in wayland mode
-Reviewed-by: serb, mhalder
-
-diff --git openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
---- openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c
-+++ openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
-@@ -394,77 +394,48 @@
- XRectangle bbox; /* bounding box of grabbed area */
- list_ptr regions;/* list of regions to read from */
- {
-- image_region_type *reg;
-- int32_t dst_x, dst_y; /* where in pixmap to write (UL) */
-- int32_t diff;
--
-- XImage *reg_image,*ximage ;
-- int32_t srcRect_x,srcRect_y,srcRect_width,srcRect_height ;
-- int32_t rem ;
-- int32_t bytes_per_line;
-- int32_t bitmap_unit;
--
-- bitmap_unit = sizeof (long);
-- if (format == ZPixmap)
-- bytes_per_line = width*depth/8;
-- else
-- bytes_per_line = width/8;
--
--
-- /* Find out how many more bytes are required for padding so that
-- ** bytes per scan line will be multiples of bitmap_unit bits */
-- if (format == ZPixmap) {
-- rem = (bytes_per_line*8)%bitmap_unit;
-- if (rem)
-- bytes_per_line += (rem/8 + 1);
-- }
-+ XImage *ximage ;
-
- ximage = XCreateImage(disp,fakeVis,(uint32_t) depth,format,0,NULL,
- (uint32_t)width,(uint32_t)height,8,0);
-
-- bytes_per_line = ximage->bytes_per_line;
--
-- if (format == ZPixmap)
-- ximage->data = malloc(height*bytes_per_line);
-- else
-- ximage->data = malloc(height*bytes_per_line*depth);
--
-+ ximage->data = calloc(ximage->bytes_per_line*height*((format==ZPixmap)? 1 : depth), sizeof(char));
- ximage->bits_per_pixel = depth; /** Valid only if format is ZPixmap ***/
-
-- for (reg = (image_region_type *) first_in_list( regions); reg;
-+ for (image_region_type* reg = (image_region_type *) first_in_list( regions); reg;
- reg = (image_region_type *) next_in_list( regions))
- {
-- int32_t rect;
-- struct my_XRegion *vis_reg;
-- vis_reg = (struct my_XRegion *)(reg->visible_region);
-- for (rect = 0;
-- rect < vis_reg->numRects;
-- rect++)
-+ struct my_XRegion *vis_reg = (struct my_XRegion *)(reg->visible_region);
-+ for (int32_t rect = 0; rect < vis_reg->numRects; rect++)
- {
-- /** ------------------------------------------------------------------------
-- Intersect bbox with visible part of region giving src rect & output
-- location. Width is the min right side minus the max left side.
-- Similar for height. Offset src rect so x,y are relative to
-- origin of win, not the root-relative visible rect of win.
-- ------------------------------------------------------------------------ **/
-- srcRect_width = MIN( vis_reg->rects[rect].x2, bbox.width + bbox.x)
-- - MAX( vis_reg->rects[rect].x1, bbox.x);
-+ /** ------------------------------------------------------------------------
-+ Intersect bbox with visible part of region giving src rect & output
-+ location. Width is the min right side minus the max left side.
-+ Similar for height. Offset src rect so x,y are relative to
-+ origin of win, not the root-relative visible rect of win.
-+ ------------------------------------------------------------------------ **/
-+ int32_t srcRect_width = MIN( vis_reg->rects[rect].x2, bbox.width + bbox.x)
-+ - MAX( vis_reg->rects[rect].x1, bbox.x);
-+
-+ int32_t srcRect_height = MIN( vis_reg->rects[rect].y2, bbox.height + bbox.y)
-+ - MAX( vis_reg->rects[rect].y1, bbox.y);
-
-- srcRect_height = MIN( vis_reg->rects[rect].y2, bbox.height + bbox.y)
-- - MAX( vis_reg->rects[rect].y1, bbox.y);
-+ int32_t diff = bbox.x - vis_reg->rects[rect].x1;
-+ int32_t srcRect_x = MAX( 0, diff) + (vis_reg->rects[rect].x1 - reg->x_rootrel - reg->border);
-+ int32_t dst_x = MAX( 0, -diff) ;
-
-- diff = bbox.x - vis_reg->rects[rect].x1;
-- srcRect_x = MAX( 0, diff) + (vis_reg->rects[rect].x1 - reg->x_rootrel - reg->border);
-- dst_x = MAX( 0, -diff) ;
-- diff = bbox.y - vis_reg->rects[rect].y1;
-- srcRect_y = MAX( 0, diff) + (vis_reg->rects[rect].y1 - reg->y_rootrel - reg->border);
-- dst_y = MAX( 0, -diff) ;
-- reg_image = XGetImage(disp,reg->win,srcRect_x,srcRect_y,
-- (uint32_t) srcRect_width, (uint32_t) srcRect_height,AllPlanes,format) ;
-- TransferImage(disp,reg_image,srcRect_width,
-- srcRect_height,reg,ximage,dst_x,dst_y) ;
-- XDestroyImage(reg_image);
-- }
-+ diff = bbox.y - vis_reg->rects[rect].y1;
-+ int32_t srcRect_y = MAX( 0, diff) + (vis_reg->rects[rect].y1 - reg->y_rootrel - reg->border);
-+ int32_t dst_y = MAX( 0, -diff) ;
-+ XImage* reg_image = XGetImage(disp,reg->win,srcRect_x,srcRect_y,
-+ (uint32_t) srcRect_width, (uint32_t) srcRect_height,AllPlanes,format) ;
-+
-+ if (reg_image) {
-+ TransferImage(disp,reg_image,srcRect_width,
-+ srcRect_height,reg,ximage,dst_x,dst_y) ;
-+ XDestroyImage(reg_image);
-+ }
-+ }
- }
- return ximage ;
- }
diff --git a/8184309-pr3596.patch b/8184309-pr3596.patch
deleted file mode 100644
index 00b6125..0000000
--- a/8184309-pr3596.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User ysuenaga
-# Date 1527498573 -3600
-# Mon May 28 10:09:33 2018 +0100
-# Node ID ef176cb429c49d1c330d9575938f66b04e3fb730
-# Parent 6915dc9ae18cce5625d3a3fc74b37da70a5b4215
-8184309, PR3596: Build warnings from GCC 7.1 on Fedora 26
-Reviewed-by: kbarrett, vlivanov
-
-diff --git openjdk.orig/hotspot/src/share/vm/code/dependencies.cpp openjdk/hotspot/src/share/vm/code/dependencies.cpp
---- openjdk.orig/hotspot/src/share/vm/code/dependencies.cpp
-+++ openjdk/hotspot/src/share/vm/code/dependencies.cpp
-@@ -525,7 +525,7 @@
- xtty->object("x", arg.metadata_value());
- }
- } else {
-- char xn[10]; sprintf(xn, "x%d", j);
-+ char xn[12]; sprintf(xn, "x%d", j);
- if (arg.is_oop()) {
- xtty->object(xn, arg.oop_value());
- } else {
diff --git a/8185723-pr3553.patch b/8185723-pr3553.patch
deleted file mode 100644
index f8ee50a..0000000
--- a/8185723-pr3553.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# HG changeset patch
-# User aph
-# Date 1501690960 -3600
-# Wed Aug 02 17:22:40 2017 +0100
-# Node ID 91ab2eac9856ec86c16c0bedd32e0b87974ead6f
-# Parent 4e2adbc3d2b512f6b2bf318d2db60f4d1903f8c7
-8185723, PR3553: Zero: segfaults on Power PC 32-bit
-Reviewed-by: roland
-
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-@@ -38,10 +38,10 @@
- static void atomic_copy64(volatile void *src, volatile void *dst) {
- #if defined(PPC32)
- double tmp;
-- asm volatile ("lfd %0, 0(%1)\n"
-- "stfd %0, 0(%2)\n"
-- : "=f"(tmp)
-- : "b"(src), "b"(dst));
-+ asm volatile ("lfd %0, %2\n"
-+ "stfd %0, %1\n"
-+ : "=&f"(tmp), "=Q"(*(volatile double*)dst)
-+ : "Q"(*(volatile double*)src));
- #elif defined(S390) && !defined(_LP64)
- double tmp;
- asm volatile ("ld %0, 0(%1)\n"
diff --git a/8186461-pr3557.patch b/8186461-pr3557.patch
deleted file mode 100644
index cc8020c..0000000
--- a/8186461-pr3557.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User glaubitz
-# Date 1524889690 -3600
-# Sat Apr 28 05:28:10 2018 +0100
-# Node ID be1379a186ba527b32c93a83e04c9600735fe44b
-# Parent 91ab2eac9856ec86c16c0bedd32e0b87974ead6f
-8186461, PR3557: Zero's atomic_copy64() should use SPE instructions on linux-powerpcspe
-Reviewed-by: aph
-
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-@@ -36,12 +36,18 @@
-
- // Atomically copy 64 bits of data
- static void atomic_copy64(volatile void *src, volatile void *dst) {
--#if defined(PPC32)
-+#if defined(PPC32) && !defined(__SPE__)
- double tmp;
- asm volatile ("lfd %0, %2\n"
- "stfd %0, %1\n"
- : "=&f"(tmp), "=Q"(*(volatile double*)dst)
- : "Q"(*(volatile double*)src));
-+#elif defined(PPC32) && defined(__SPE__)
-+ long tmp;
-+ asm volatile ("evldd %0, %2\n"
-+ "evstdd %0, %1\n"
-+ : "=&r"(tmp), "=Q"(*(volatile long*)dst)
-+ : "Q"(*(volatile long*)src));
- #elif defined(S390) && !defined(_LP64)
- double tmp;
- asm volatile ("ld %0, 0(%1)\n"
diff --git a/8188030-pr3459-rh1484079.patch b/8188030-pr3459-rh1484079.patch
deleted file mode 100644
index 8564c81..0000000
--- a/8188030-pr3459-rh1484079.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User neugens
-# Date 1507735508 -3600
-# Wed Oct 11 16:25:08 2017 +0100
-# Node ID 5b91bf11d0f41a6124ffb0fcd8870507b50bd734
-# Parent 7b1a2f967cd8e950fe7dc47d716af13d36239a38
-8188030, PR3459, RH1484079: AWT java apps fail to start when some minimal fonts are present
-Summary: Handle CFF fonts
-Reviewed-by: andrew, prr
-
-diff --git a/src/solaris/native/sun/awt/fontpath.c b/src/solaris/native/sun/awt/fontpath.c
---- openjdk/jdk/src/solaris/native/sun/awt/fontpath.c
-+++ openjdk/jdk/src/solaris/native/sun/awt/fontpath.c
-@@ -1233,6 +1233,7 @@
- && (strcmp((char*)fontformat, "TrueType") != 0)
- #if defined(__linux__) || defined(_AIX)
- && (strcmp((char*)fontformat, "Type 1") != 0)
-+ && (strcmp((char*)fontformat, "CFF") != 0)
- #endif
- ) {
- continue;
diff --git a/8197429-pr3546-rh1536622.patch b/8197429-pr3546-rh1536622.patch
deleted file mode 100644
index fc60cd3..0000000
--- a/8197429-pr3546-rh1536622.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -r eecfc14e66ee src/os/linux/vm/os_linux.cpp
---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp Mon Jan 22 16:25:24 2018 +0000
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Wed Feb 21 13:52:31 2018 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 2018, 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
-@@ -674,6 +674,10 @@
- }
- }
-
-+void os::Linux::expand_stack_to(address bottom) {
-+ _expand_stack_to(bottom);
-+}
-+
- bool os::Linux::manually_expand_stack(JavaThread * t, address addr) {
- assert(t!=NULL, "just checking");
- assert(t->osthread()->expanding_stack(), "expand should be set");
-diff -r eecfc14e66ee src/os/linux/vm/os_linux.hpp
---- openjdk/hotspot/src/os/linux/vm/os_linux.hpp Mon Jan 22 16:25:24 2018 +0000
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.hpp Wed Feb 21 13:52:31 2018 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 2018, 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
-@@ -245,6 +245,8 @@
- static int safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime);
-
- private:
-+ static void expand_stack_to(address bottom);
-+
- typedef int (*sched_getcpu_func_t)(void);
- typedef int (*numa_node_to_cpus_func_t)(int node, unsigned long *buffer, int bufferlen);
- typedef int (*numa_max_node_func_t)(void);
-diff -r eecfc14e66ee src/os_cpu/linux_x86/vm/os_linux_x86.cpp
---- openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Mon Jan 22 16:25:24 2018 +0000
-+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Wed Feb 21 13:52:31 2018 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 2018, 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
-@@ -892,6 +892,25 @@
- void os::workaround_expand_exec_shield_cs_limit() {
- #if defined(IA32)
- size_t page_size = os::vm_page_size();
-+
-+ /*
-+ * JDK-8197429
-+ *
-+ * Expand the stack mapping to the end of the initial stack before
-+ * attempting to install the codebuf. This is needed because newer
-+ * Linux kernels impose a distance of a megabyte between stack
-+ * memory and other memory regions. If we try to install the
-+ * codebuf before expanding the stack the installation will appear
-+ * to succeed but we'll get a segfault later if we expand the stack
-+ * in Java code.
-+ *
-+ */
-+ if (os::Linux::is_initial_thread()) {
-+ address limit = Linux::initial_thread_stack_bottom();
-+ limit += (StackYellowPages + StackRedPages) * page_size;
-+ os::Linux::expand_stack_to(limit);
-+ }
-+
- /*
- * Take the highest VA the OS will give us and exec
- *
-@@ -910,6 +929,16 @@
- char* hint = (char*) (Linux::initial_thread_stack_bottom() -
- ((StackYellowPages + StackRedPages + 1) * page_size));
- char* codebuf = os::attempt_reserve_memory_at(page_size, hint);
-+
-+ if (codebuf == NULL) {
-+ // JDK-8197429: There may be a stack gap of one megabyte between
-+ // the limit of the stack and the nearest memory region: this is a
-+ // Linux kernel workaround for CVE-2017-1000364. If we failed to
-+ // map our codebuf, try again at an address one megabyte lower.
-+ hint -= 1 * M;
-+ codebuf = os::attempt_reserve_memory_at(page_size, hint);
-+ }
-+
- if ( (codebuf == NULL) || (!os::commit_memory(codebuf, page_size, true)) ) {
- return; // No matter, we tried, best effort.
- }
diff --git a/8197546-pr3542-rh1402819.patch b/8197546-pr3542-rh1402819.patch
deleted file mode 100644
index ba712ad..0000000
--- a/8197546-pr3542-rh1402819.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# HG changeset patch
-# User prr
-# Date 1518454604 28800
-# Mon Feb 12 08:56:44 2018 -0800
-# Node ID 556adf3a76aa81bf3918d7d46554dae7cc1d5c5c
-# Parent b77308735540644d4710244e3c88865067f2905a
-8197546: Fix for 8171000 breaks Solaris + Linux builds
-Reviewed-by: serb, jdv
-
-diff --git openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
---- openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c
-+++ openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
-@@ -395,6 +395,8 @@
- list_ptr regions;/* list of regions to read from */
- {
- XImage *ximage ;
-+ image_region_type* reg;
-+ int32_t rect;
-
- ximage = XCreateImage(disp,fakeVis,(uint32_t) depth,format,0,NULL,
- (uint32_t)width,(uint32_t)height,8,0);
-@@ -402,11 +404,11 @@
- ximage->data = calloc(ximage->bytes_per_line*height*((format==ZPixmap)? 1 : depth), sizeof(char));
- ximage->bits_per_pixel = depth; /** Valid only if format is ZPixmap ***/
-
-- for (image_region_type* reg = (image_region_type *) first_in_list( regions); reg;
-+ for (reg = (image_region_type *) first_in_list( regions); reg;
- reg = (image_region_type *) next_in_list( regions))
- {
- struct my_XRegion *vis_reg = (struct my_XRegion *)(reg->visible_region);
-- for (int32_t rect = 0; rect < vis_reg->numRects; rect++)
-+ for (rect = 0; rect < vis_reg->numRects; rect++)
- {
- /** ------------------------------------------------------------------------
- Intersect bbox with visible part of region giving src rect & output
diff --git a/8197981-pr3548.patch b/8197981-pr3548.patch
deleted file mode 100644
index 5f6d9ce..0000000
--- a/8197981-pr3548.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1518667645 0
-# Thu Feb 15 04:07:25 2018 +0000
-# Node ID 1d35411eb7bdf16191e220ffe3b1dc4d5d0c6041
-# Parent 999983606f5c61b093c6f6316a7b26c4cd4ca79e
-8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
-Summary: Fix issue discovered by -Wreturn-type on systems without LP64.
-Reviewed-by: aph
-
-diff --git openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-@@ -457,6 +457,7 @@
- long long unsigned int oldval,
- long long unsigned int newval) {
- ShouldNotCallThis();
-+ return 0;
- }
- };
- #endif // !_LP64
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-@@ -498,6 +498,7 @@
- long long unsigned int oldval,
- long long unsigned int newval) {
- ShouldNotCallThis();
-+ return 0;
- }
- };
- #endif // !_LP64
diff --git a/8199936-pr3533-workaround.patch b/8199936-pr3533-workaround.patch
deleted file mode 100644
index 900e0c3..0000000
--- a/8199936-pr3533-workaround.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1526122977 -3600
-# Sat May 12 12:02:57 2018 +0100
-# Node ID 00ccc73498628a51a45301322e64ce2ad06e49be
-# Parent aecf9f48f7b5c6148b62713a6b746301435b57cc
-PR3533: HotSpot generates code with unaligned stack, crashes on SSE operations
-Summary: Enable -mstackrealign on x86 Linux as well as x86 Mac OS X
-
-diff --git openjdk.orig///common/autoconf/hotspot-spec.gmk.in openjdk///common/autoconf/hotspot-spec.gmk.in
---- openjdk.orig///common/autoconf/hotspot-spec.gmk.in
-+++ openjdk///common/autoconf/hotspot-spec.gmk.in
-@@ -110,7 +110,8 @@
- RC:=@HOTSPOT_RC@
-
- EXTRA_CFLAGS=@LEGACY_EXTRA_CFLAGS@ $(NO_DELETE_NULL_POINTER_CHECKS_CFLAG) \
-- $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG)
-+ $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG) \
-+ $(REALIGN_CFLAG)
- EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@
- EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@
-
-diff --git openjdk.orig///common/autoconf/spec.gmk.in openjdk///common/autoconf/spec.gmk.in
---- openjdk.orig///common/autoconf/spec.gmk.in
-+++ openjdk///common/autoconf/spec.gmk.in
-@@ -333,6 +333,7 @@
-
- NO_DELETE_NULL_POINTER_CHECKS_CFLAG=@NO_DELETE_NULL_POINTER_CHECKS_CFLAG@
- NO_LIFETIME_DSE_CFLAG=@NO_LIFETIME_DSE_CFLAG@
-+REALIGN_CFLAG=@REALIGN_CFLAG@
- CXXSTD_CXXFLAG=@CXXSTD_CXXFLAG@
-
- CXX:=@FIXPATH@ @CCACHE@ @CXX@
-diff --git openjdk.orig///common/autoconf/toolchain.m4 openjdk///common/autoconf/toolchain.m4
---- openjdk.orig///common/autoconf/toolchain.m4
-+++ openjdk///common/autoconf/toolchain.m4
-@@ -796,20 +796,16 @@
- #
- # NOTE: check for -mstackrealign needs to be below potential addition of -m32
- #
-- if test "x$OPENJDK_TARGET_CPU_BITS" = x32 && test "x$OPENJDK_TARGET_OS" = xmacosx; then
-+ if test "x$OPENJDK_TARGET_CPU" = xx86 && test "x$OPENJDK_TARGET_OS" = xmacosx -o \
-+ "x$OPENJDK_TARGET_OS" = xlinux; then
- # On 32-bit MacOSX the OS requires C-entry points to be 16 byte aligned.
-- # While waiting for a better solution, the current workaround is to use -mstackrealign.
-- CFLAGS="$CFLAGS -mstackrealign"
-- AC_MSG_CHECKING([if 32-bit compiler supports -mstackrealign])
-- AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],
-- [
-- AC_MSG_RESULT([yes])
-- ],
-- [
-- AC_MSG_RESULT([no])
-- AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.])
-- ]
-+ # While waiting for a better solution, the current workaround is to use -mstackrealign
-+ # This is also required on Linux systems which use libraries compiled with SSE instructions
-+ REALIGN_CFLAG="-mstackrealign"
-+ TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([$REALIGN_CFLAG -Werror], [],
-+ AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.])
- )
-+ AC_SUBST([REALIGN_CFLAG])
- fi
-
- C_FLAG_DEPS="-MMD -MF"
diff --git a/8201509-pr3579.patch b/8201509-pr3579.patch
deleted file mode 100644
index 132c225..0000000
--- a/8201509-pr3579.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-# HG changeset patch
-# User mbalao
-# Date 1525317412 -3600
-# Thu May 03 04:16:52 2018 +0100
-# Node ID de79964656fc652f2085dac4fe99bcc128b5a3b1
-# Parent ffd5260fe5adcb26f87a14f1aaaf3e1a075d712a
-8201509, PR3579: Zero: S390 31bit atomic_copy64 inline assembler is wrong
-Summary: The inline assembler for the S390 (S390 and not _LP64) has src and dst reversed thereby corrupting data
-Reviewed-by: shade
-
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-@@ -1,6 +1,6 @@
- /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-- * Copyright 2007, 2008, 2010 Red Hat, Inc.
-+ * Copyright 2007, 2008, 2010, 2018, 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
-@@ -50,10 +50,10 @@
- : "Q"(*(volatile long*)src));
- #elif defined(S390) && !defined(_LP64)
- double tmp;
-- asm volatile ("ld %0, 0(%1)\n"
-- "std %0, 0(%2)\n"
-- : "=r"(tmp)
-- : "a"(src), "a"(dst));
-+ asm volatile ("ld %0, %2\n"
-+ "std %0, %1\n"
-+ : "=&f"(tmp), "=Q"(*(volatile double*)dst)
-+ : "Q"(*(volatile double*)src));
- #elif defined(__ARM_ARCH_7A__)
- jlong tmp;
- asm volatile ("ldrexd %0, [%1]\n"
diff --git a/8203182-pr3603-rh1568033.patch b/8203182-pr3603-rh1568033.patch
deleted file mode 100644
index 031a60c..0000000
--- a/8203182-pr3603-rh1568033.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-# HG changeset patch
-# User igerasim
-# Date 1528992969 25200
-# Thu Jun 14 09:16:09 2018 -0700
-# Node ID d9b0b4bd2526818afa73b60da77403245554caa8
-# Parent 1f4b038b9550afaf88a70cee4cf9c1422ecd86d6
-8203182, PR3603: Release session if initialization of SunPKCS11 Signature fails
-Summary: Ensure session is properly released in P11Signature class
-Reviewed-by: valeriep
-Contributed-by: Martin Balao <mbalao(a)redhat.com>
-
-diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java
---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java
-+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java
-@@ -309,47 +309,51 @@
- session = token.killSession(session);
- return;
- }
-- // "cancel" operation by finishing it
-- // XXX make sure all this always works correctly
-- if (mode == M_SIGN) {
-- try {
-- if (type == T_UPDATE) {
-- token.p11.C_SignFinal(session.id(), 0);
-- } else {
-- byte[] digest;
-- if (type == T_DIGEST) {
-- digest = md.digest();
-- } else { // T_RAW
-- digest = buffer;
-+ try {
-+ // "cancel" operation by finishing it
-+ // XXX make sure all this always works correctly
-+ if (mode == M_SIGN) {
-+ try {
-+ if (type == T_UPDATE) {
-+ token.p11.C_SignFinal(session.id(), 0);
-+ } else {
-+ byte[] digest;
-+ if (type == T_DIGEST) {
-+ digest = md.digest();
-+ } else { // T_RAW
-+ digest = buffer;
-+ }
-+ token.p11.C_Sign(session.id(), digest);
- }
-- token.p11.C_Sign(session.id(), digest);
-+ } catch (PKCS11Exception e) {
-+ throw new ProviderException("cancel failed", e);
- }
-- } catch (PKCS11Exception e) {
-- throw new ProviderException("cancel failed", e);
-+ } else { // M_VERIFY
-+ try {
-+ byte[] signature;
-+ if (keyAlgorithm.equals("DSA")) {
-+ signature = new byte[40];
-+ } else {
-+ signature = new byte[(p11Key.length() + 7) >> 3];
-+ }
-+ if (type == T_UPDATE) {
-+ token.p11.C_VerifyFinal(session.id(), signature);
-+ } else {
-+ byte[] digest;
-+ if (type == T_DIGEST) {
-+ digest = md.digest();
-+ } else { // T_RAW
-+ digest = buffer;
-+ }
-+ token.p11.C_Verify(session.id(), digest, signature);
-+ }
-+ } catch (PKCS11Exception e) {
-+ // will fail since the signature is incorrect
-+ // XXX check error code
-+ }
- }
-- } else { // M_VERIFY
-- try {
-- byte[] signature;
-- if (keyAlgorithm.equals("DSA")) {
-- signature = new byte[40];
-- } else {
-- signature = new byte[(p11Key.length() + 7) >> 3];
-- }
-- if (type == T_UPDATE) {
-- token.p11.C_VerifyFinal(session.id(), signature);
-- } else {
-- byte[] digest;
-- if (type == T_DIGEST) {
-- digest = md.digest();
-- } else { // T_RAW
-- digest = buffer;
-- }
-- token.p11.C_Verify(session.id(), digest, signature);
-- }
-- } catch (PKCS11Exception e) {
-- // will fail since the signature is incorrect
-- // XXX check error code
-- }
-+ } finally {
-+ session = token.releaseSession(session);
- }
- }
-
-@@ -368,6 +372,8 @@
- }
- initialized = true;
- } catch (PKCS11Exception e) {
-+ // release session when initialization failed
-+ session = token.releaseSession(session);
- throw new ProviderException("Initialization failed", e);
- }
- if (bytesProcessed != 0) {
-@@ -529,6 +535,8 @@
- }
- bytesProcessed += len;
- } catch (PKCS11Exception e) {
-+ initialized = false;
-+ session = token.releaseSession(session);
- throw new ProviderException(e);
- }
- break;
-@@ -576,6 +584,8 @@
- bytesProcessed += len;
- byteBuffer.position(ofs + len);
- } catch (PKCS11Exception e) {
-+ initialized = false;
-+ session = token.releaseSession(session);
- throw new ProviderException("Update failed", e);
- }
- break;
diff --git a/8205104-pr3539-rh1548475.patch b/8205104-pr3539-rh1548475.patch
deleted file mode 100644
index 9b40a7f..0000000
--- a/8205104-pr3539-rh1548475.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1526065930 -3600
-# Fri May 11 20:12:10 2018 +0100
-# Node ID b8fc1e640c4c7f38ca94131279cb67c4d3de6961
-# Parent afb31413c73cbc06420fdb447aa90a7a38258904
-PR3539, RH1548475: Pass EXTRA_LDFLAGS to HotSpot build
-
-diff --git openjdk.orig/hotspot/make/aix/makefiles/jsig.make openjdk/hotspot/make/aix/makefiles/jsig.make
---- openjdk.orig/hotspot/make/aix/makefiles/jsig.make
-+++ openjdk/hotspot/make/aix/makefiles/jsig.make
-@@ -45,7 +45,7 @@
- # cause problems with interposing. See CR: 6466665
- # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
-
--LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE)
-+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
-
- LFLAGS_JSIG += $(BIN_UTILS)
-
-diff --git openjdk.orig/hotspot/make/aix/makefiles/saproc.make openjdk/hotspot/make/aix/makefiles/saproc.make
---- openjdk.orig/hotspot/make/aix/makefiles/saproc.make
-+++ openjdk/hotspot/make/aix/makefiles/saproc.make
-@@ -66,7 +66,7 @@
- endif
-
-
--SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
-+SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
-
- $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
- $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
-diff --git openjdk.orig/hotspot/make/aix/makefiles/vm.make openjdk/hotspot/make/aix/makefiles/vm.make
---- openjdk.orig/hotspot/make/aix/makefiles/vm.make
-+++ openjdk/hotspot/make/aix/makefiles/vm.make
-@@ -117,7 +117,7 @@
-
- # Extra flags from gnumake's invocation or environment
- CFLAGS += $(EXTRA_CFLAGS)
--LFLAGS += $(EXTRA_CFLAGS)
-+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
-
- # Don't set excutable bit on stack segment
- # the same could be done by separate execstack command
-diff --git openjdk.orig/hotspot/make/bsd/makefiles/jsig.make openjdk/hotspot/make/bsd/makefiles/jsig.make
---- openjdk.orig/hotspot/make/bsd/makefiles/jsig.make
-+++ openjdk/hotspot/make/bsd/makefiles/jsig.make
-@@ -52,7 +52,7 @@
- # cause problems with interposing. See CR: 6466665
- # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
-
--LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE)
-+LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
-
- # DEBUG_BINARIES overrides everything, use full -g debug information
- ifeq ($(DEBUG_BINARIES), true)
-diff --git openjdk.orig/hotspot/make/bsd/makefiles/saproc.make openjdk/hotspot/make/bsd/makefiles/saproc.make
---- openjdk.orig/hotspot/make/bsd/makefiles/saproc.make
-+++ openjdk/hotspot/make/bsd/makefiles/saproc.make
-@@ -114,7 +114,7 @@
- # bring in minimum version argument or we'll fail on OSX 10.10
- SA_LFLAGS = $(LFLAGS)
- endif
--SA_LFLAGS += $(LDFLAGS_HASH_STYLE)
-+SA_LFLAGS += $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
-
- BOOT_JAVA_INCLUDES = -I$(BOOT_JAVA_HOME)/include \
- -I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]" "[:lower:]")
-diff --git openjdk.orig/hotspot/make/bsd/makefiles/vm.make openjdk/hotspot/make/bsd/makefiles/vm.make
---- openjdk.orig/hotspot/make/bsd/makefiles/vm.make
-+++ openjdk/hotspot/make/bsd/makefiles/vm.make
-@@ -119,7 +119,7 @@
-
- # Extra flags from gnumake's invocation or environment
- CFLAGS += $(EXTRA_CFLAGS)
--LFLAGS += $(EXTRA_CFLAGS)
-+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
-
- # Don't set excutable bit on stack segment
- # the same could be done by separate execstack command
-diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
---- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
-+++ openjdk/hotspot/make/linux/makefiles/jsig.make
-@@ -44,7 +44,7 @@
- # cause problems with interposing. See CR: 6466665
- # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
-
--LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK)
-+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK) $(EXTRA_LDFLAGS)
-
- # DEBUG_BINARIES overrides everything, use full -g debug information
- ifeq ($(DEBUG_BINARIES), true)
-diff --git openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
---- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
-+++ openjdk/hotspot/make/linux/makefiles/saproc.make
-@@ -73,7 +73,7 @@
- else
- ALT_SAINCDIR=
- endif
--SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
-+SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
-
- SAARCH ?= $(BUILDARCH)
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
---- openjdk.orig/hotspot/make/linux/makefiles/vm.make
-+++ openjdk/hotspot/make/linux/makefiles/vm.make
-@@ -122,7 +122,7 @@
-
- # Extra flags from gnumake's invocation or environment
- CFLAGS += $(EXTRA_CFLAGS)
--LFLAGS += $(EXTRA_CFLAGS)
-+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
-
- # Don't set excutable bit on stack segment
- # the same could be done by separate execstack command
diff --git a/8206406-pr3610-rh1597825.patch b/8206406-pr3610-rh1597825.patch
deleted file mode 100644
index 0f38126..0000000
--- a/8206406-pr3610-rh1597825.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-# HG changeset patch
-# User aph
-# Date 1531146945 -3600
-# Mon Jul 09 15:35:45 2018 +0100
-# Node ID 95b72537801cc9946c27ad27f07e3f0790a21b08
-# Parent f6341f4635dacb56678264d29a88cd052b74036b
-8206406, PR3610, RH1597825: StubCodeDesc constructor publishes partially-constructed objects on StubCodeDesc::_list
-Reviewed-by: dholmes
-
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp
-@@ -34,12 +34,12 @@
-
- // Implementation of StubCodeDesc
-
--StubCodeDesc* StubCodeDesc::_list = NULL;
--int StubCodeDesc::_count = 0;
-+StubCodeDesc* volatile StubCodeDesc::_list = NULL;
-+int StubCodeDesc::_count = 0;
-
-
- StubCodeDesc* StubCodeDesc::desc_for(address pc) {
-- StubCodeDesc* p = _list;
-+ StubCodeDesc* p = (StubCodeDesc*)OrderAccess::load_ptr_acquire(&_list);
- while (p != NULL && !p->contains(pc)) p = p->_next;
- // p == NULL || p->contains(pc)
- return p;
-@@ -47,7 +47,7 @@
-
-
- StubCodeDesc* StubCodeDesc::desc_for_index(int index) {
-- StubCodeDesc* p = _list;
-+ StubCodeDesc* p = (StubCodeDesc*)OrderAccess::load_ptr_acquire(&_list);
- while (p != NULL && p->index() != index) p = p->_next;
- return p;
- }
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp
---- openjdk.orig/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp
-+++ openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp
-@@ -38,7 +38,7 @@
-
- class StubCodeDesc: public CHeapObj<mtCode> {
- protected:
-- static StubCodeDesc* _list; // the list of all descriptors
-+ static StubCodeDesc* volatile _list; // the list of all descriptors
- static int _count; // length of list
-
- StubCodeDesc* _next; // the next element in the linked list
-@@ -69,13 +69,13 @@
-
- StubCodeDesc(const char* group, const char* name, address begin) {
- assert(name != NULL, "no name specified");
-- _next = _list;
-+ _next = (StubCodeDesc*)OrderAccess::load_ptr_acquire(&_list);
- _group = group;
- _name = name;
- _index = ++_count; // (never zero)
- _begin = begin;
- _end = NULL;
-- _list = this;
-+ OrderAccess::release_store_ptr(&_list, this);
- };
-
- const char* group() const { return _group; }
diff --git a/8206425-hotspot-remove-debuglink.patch b/8206425-hotspot-remove-debuglink.patch
deleted file mode 100644
index adbf1f0..0000000
--- a/8206425-hotspot-remove-debuglink.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-# HG changeset patch
-# User sgehwolf
-# Date 1530808022 -7200
-# Thu Jul 05 18:27:02 2018 +0200
-# Node ID 5ba59d58d976db456c4455640111e8107b8d80e8
-# Parent ad057f2e3211cd18bc56550d8a2c400d92ec35b1
-8206425: .gnu_debuglink sections added unconditionally when no debuginfo is stripped
-Summary: Only add .gnu_debuglink sections when there is some stripping done.
-Reviewed-by: erikj, dholmes
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
---- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
-+++ openjdk/hotspot/make/linux/makefiles/jsig.make
-@@ -57,14 +57,15 @@
- $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
-+ ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
-- ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(STRIP) $@
- else
- ifeq ($(STRIP_POLICY),min_strip)
-+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
- $(QUIETLY) $(STRIP) -g $@
-+ endif
- # implied else here is no stripping at all
-- endif
- endif
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- $(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO)
-diff --git openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
---- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
-+++ openjdk/hotspot/make/linux/makefiles/saproc.make
-@@ -100,14 +100,15 @@
- -lthread_db
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
-+ ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
-- ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(STRIP) $@
- else
- ifeq ($(STRIP_POLICY),min_strip)
-+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
- $(QUIETLY) $(STRIP) -g $@
-+ endif
- # implied else here is no stripping at all
-- endif
- endif
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- $(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO)
-diff --git openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
---- openjdk.orig/hotspot/make/linux/makefiles/vm.make
-+++ openjdk/hotspot/make/linux/makefiles/vm.make
-@@ -358,14 +358,15 @@
-
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
-+ ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
-- ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(STRIP) $@
- else
- ifeq ($(STRIP_POLICY),min_strip)
-+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
- $(QUIETLY) $(STRIP) -g $@
-+ endif
- # implied else here is no stripping at all
-- endif
- endif
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
diff --git a/8207057-pr3613-assembler-debuginfo-hotspot.patch b/8207057-pr3613-assembler-debuginfo-hotspot.patch
deleted file mode 100644
index c61d972..0000000
--- a/8207057-pr3613-assembler-debuginfo-hotspot.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- openjdk/hotspot/make/linux/makefiles/gcc.make 2018-09-17 15:40:56.933127667 +0200
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2018-09-17 15:40:56.831127850 +0200
-@@ -184,6 +184,10 @@
- LFLAGS += $(ARCHFLAG)
- ASFLAGS += $(ARCHFLAG)
-
-+ifeq ($(DEBUG_BINARIES), true)
-+ ASFLAGS += $(ASFLAGS_DEBUG_SYMBOLS)
-+endif
-+
- # Use C++ Interpreter
- ifdef CC_INTERP
- CFLAGS += -DCC_INTERP
diff --git a/8207057-pr3613-assembler-debuginfo-root.patch b/8207057-pr3613-assembler-debuginfo-root.patch
deleted file mode 100644
index 7f57c0a..0000000
--- a/8207057-pr3613-assembler-debuginfo-root.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- openjdk/common/autoconf/toolchain.m4 2018-09-17 15:35:40.783695320 +0200
-+++ openjdk/common/autoconf/toolchain.m4 2018-09-17 15:35:40.608695635 +0200
-@@ -814,6 +814,10 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION],
-
- C_FLAG_DEPS="-MMD -MF"
- CXX_FLAG_DEPS="-MMD -MF"
-+ # By default don't set any specific assembler debug
-+ # info flags for toolchains unless we know they work.
-+ # See JDK-8207057.
-+ ASFLAGS_DEBUG_SYMBOLS=""
-
- case $COMPILER_TYPE in
- CC )
-@@ -842,6 +846,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION],
- CFLAGS_DEBUG_SYMBOLS="-g1"
- CXXFLAGS_DEBUG_SYMBOLS="-g1"
- fi
-+ ASFLAGS_DEBUG_SYMBOLS="-g"
- ;;
- ossc )
- #
-@@ -969,6 +974,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION],
- AC_SUBST(CXX_O_FLAG_NONE)
- AC_SUBST(C_FLAG_DEPS)
- AC_SUBST(CXX_FLAG_DEPS)
-+ AC_SUBST(ASFLAGS_DEBUG_SYMBOLS)
- ])
-
- AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_JDK],
---- openjdk/common/autoconf/spec.gmk.in 2018-09-17 15:35:43.324690758 +0200
-+++ openjdk/common/autoconf/spec.gmk.in 2018-09-17 15:35:43.169691036 +0200
-@@ -414,6 +414,7 @@
- # Options for generating debug symbols
- ENABLE_DEBUG_SYMBOLS:=@ENABLE_DEBUG_SYMBOLS@
- CFLAGS_DEBUG_SYMBOLS:=@CFLAGS_DEBUG_SYMBOLS@
-+ASFLAGS_DEBUG_SYMBOLS:=@ASFLAGS_DEBUG_SYMBOLS@
- CXXFLAGS_DEBUG_SYMBOLS:=@CXXFLAGS_DEBUG_SYMBOLS@
- ZIP_DEBUGINFO_FILES:=@ZIP_DEBUGINFO_FILES@
- STRIP_POLICY:=@STRIP_POLICY@
diff --git a/8210425-01-rh1630426-hotspot-opt-fix.patch b/8210425-01-rh1630426-hotspot-opt-fix.patch
deleted file mode 100644
index 0b05ba6..0000000
--- a/8210425-01-rh1630426-hotspot-opt-fix.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git openjdk.orig/hotspot/make/linux/makefiles/amd64.make openjdk/hotspot/make/linux/makefiles/amd64.make
---- openjdk.orig/hotspot/make/linux/makefiles/amd64.make
-+++ openjdk/hotspot/make/linux/makefiles/amd64.make
-@@ -22,10 +22,13 @@
- #
- #
-
--# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
--# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+ifeq ($(OPT_CFLAGS_NO_FMA),)
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+else
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+endif
- # Must also specify if CPU is little endian
- CFLAGS += -DVM_LITTLE_ENDIAN
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make
-@@ -225,6 +225,16 @@
- OPT_CFLAGS/SIZE=-Os
- OPT_CFLAGS/SPEED=-O3
-
-+ifeq ($(USE_CLANG),)
-+ # Only GCC 4.6 and better have machine independent -ffp-contract=off.
-+ # For other versions we need to explicitly set arch specific machine
-+ # flags or keep optimization off for them.
-+ ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 6 \) \))" "1"
-+ OPT_CFLAGS_NO_FMA = -ffp-contract=off
-+ endif
-+endif
-+
-+
- # Hotspot uses very unstrict aliasing turn this optimization off
- # This option is added to CFLAGS rather than OPT_CFLAGS
- # so that OPT_CFLAGS overrides get this option too.
-diff --git openjdk.orig/hotspot/make/linux/makefiles/i486.make openjdk/hotspot/make/linux/makefiles/i486.make
---- openjdk.orig/hotspot/make/linux/makefiles/i486.make
-+++ openjdk/hotspot/make/linux/makefiles/i486.make
-@@ -24,10 +24,13 @@
-
- # TLS helper, assembled from .s file
-
--# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
--# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+ifeq ($(OPT_CFLAGS_NO_FMA),)
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+else
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+endif
- # Must also specify if CPU is little endian
- CFLAGS += -DVM_LITTLE_ENDIAN
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/ppc64.make openjdk/hotspot/make/linux/makefiles/ppc64.make
---- openjdk.orig/hotspot/make/linux/makefiles/ppc64.make
-+++ openjdk/hotspot/make/linux/makefiles/ppc64.make
-@@ -49,3 +49,17 @@
- # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
- CFLAGS += -mcpu=power7 -mtune=power8 -minsert-sched-nops=regroup_exact -mno-multiple -mno-string
- endif
-+
-+ifeq ($(OPT_CFLAGS_NO_FMA),)
-+ ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),big)
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) -mno-fused-madd -fno-strict-aliasing
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) -mno-fused-madd -fno-strict-aliasing
-+ else
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+ endif
-+else
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+endif
-+
diff --git a/8210647-rh1630426-saproc-opt-fix.patch b/8210647-rh1630426-saproc-opt-fix.patch
deleted file mode 100644
index 0ab09e4..0000000
--- a/8210647-rh1630426-saproc-opt-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
---- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
-+++ openjdk/hotspot/make/linux/makefiles/saproc.make
-@@ -59,6 +59,11 @@
- SA_DEBUG_CFLAGS = -g
- endif
-
-+# Optimize saproc lib at level -O3 unless it's a slowdebug build
-+ifneq ($(DEBUG_LEVEL), slowdebug)
-+ SA_OPT_FLAGS = $(OPT_CFLAGS)
-+endif
-+
- # if $(AGENT_DIR) does not exist, we don't build SA
- # also, we don't build SA on Itanium or zero.
-
-@@ -95,6 +100,7 @@
- $(SASRCFILES) \
- $(SA_LFLAGS) \
- $(SA_DEBUG_CFLAGS) \
-+ $(SA_OPT_FLAGS) \
- $(EXTRA_CFLAGS) \
- -o $@ \
- -lthread_db
diff --git a/8210761-rh1630426-jsig-opt-fix.patch b/8210761-rh1630426-jsig-opt-fix.patch
deleted file mode 100644
index 5f30e59..0000000
--- a/8210761-rh1630426-jsig-opt-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
---- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
-+++ openjdk/hotspot/make/linux/makefiles/jsig.make
-@@ -51,10 +51,15 @@ ifeq ($(DEBUG_BINARIES), true)
- JSIG_DEBUG_CFLAGS = -g
- endif
-
-+# Optimize jsig lib at level -O3 unless it's a slowdebug build
-+ifneq ($(DEBUG_LEVEL), slowdebug)
-+ JSIG_OPT_FLAGS = $(OPT_CFLAGS)
-+endif
-+
- $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
- @echo Making signal interposition lib...
- $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
-- $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
-+ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(JSIG_OPT_FLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
- ifeq ($(STRIP_POLICY),all_strip)
diff --git a/README.src b/README.src
deleted file mode 100644
index b5f06d1..0000000
--- a/README.src
+++ /dev/null
@@ -1,2 +0,0 @@
-The java-1.8.0-openjdk-src subpackage contains the complete OpenJDK 8
-class library source code for use by IDE indexers and debuggers.
diff --git a/enableCommentedOutSystemNss.patch b/enableCommentedOutSystemNss.patch
deleted file mode 100644
index febd87e..0000000
--- a/enableCommentedOutSystemNss.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -r 5b86f66575b7 src/share/lib/security/java.security-linux
---- openjdk/jdk/src/share/lib/security/java.security-linux Tue May 16 13:29:05 2017 -0700
-+++ openjdk/jdk/src/share/lib/security/java.security-linux Tue Jun 06 14:05:12 2017 +0200
-@@ -74,6 +74,7 @@
- security.provider.7=com.sun.security.sasl.Provider
- security.provider.8=org.jcp.xml.dsig.internal.dom.XMLDSigRI
- security.provider.9=sun.security.smartcardio.SunPCSC
-+#security.provider.10=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/nss.cfg
-
- #
- # Sun Provider SecureRandom seed source.
diff --git a/generate_singlerepo_source_tarball.sh b/generate_singlerepo_source_tarball.sh
new file mode 100644
index 0000000..62218ba
--- /dev/null
+++ b/generate_singlerepo_source_tarball.sh
@@ -0,0 +1,145 @@
+#!/bin/bash
+# Generates the 'source tarball' for JDK projects.
+#
+# Example:
+# When used from local repo set REPO_ROOT pointing to file:// with your repo
+# if your local repo follows upstream forests conventions, you may be enough by setting OPENJDK_URL
+# if you wont to use local copy of patch PR2126 set path to it to PR2126 variable
+#
+# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
+# PROJECT_NAME=jdk
+# REPO_NAME=jdk
+# VERSION=tip
+# or to eg prepare systemtap:
+# icedtea7's jstack and other tapsets
+# VERSION=6327cf1cea9e
+# REPO_NAME=icedtea7-2.6
+# PROJECT_NAME=release
+# OPENJDK_URL=http://icedtea.classpath.org/hg/
+# TO_COMPRESS="*/tapset"
+#
+# They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set)
+
+# This script creates a single source tarball out of the repository
+# based on the given tag and removes code not allowed in fedora/rhel. For
+# consistency, the source tarball will always contain 'openjdk' as the top
+# level folder, name is created, based on parameter
+#
+
+if [ ! "x$PR2126" = "x" ] ; then
+ if [ ! -f "$PR2126" ] ; then
+ echo "You have specified PR2126 as $PR2126 but it does not exists. exiting"
+ exit 1
+ fi
+fi
+
+set -e
+
+OPENJDK_URL_DEFAULT=http://hg.openjdk.java.net
+COMPRESSION_DEFAULT=xz
+
+if [ "x$1" = "xhelp" ] ; then
+ echo -e "Behaviour may be specified by setting the following variables:\n"
+ echo "VERSION - the version of the specified OpenJDK project"
+ echo "PROJECT_NAME -- the name of the OpenJDK project being archived (optional; only needed by defaults)"
+ echo "REPO_NAME - the name of the OpenJDK repository (optional; only needed by defaults)"
+ echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
+ echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
+ echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
+ echo "REPO_ROOT - the location of the Mercurial repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
+ echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
+ echo "PR2126 - the path to the PR2126 patch to apply (optional; downloaded if unavailable)"
+ exit 1;
+fi
+
+
+if [ "x$VERSION" = "x" ] ; then
+ echo "No VERSION specified"
+ exit -2
+fi
+echo "Version: ${VERSION}"
+
+# REPO_NAME is only needed when we default on REPO_ROOT and FILE_NAME_ROOT
+if [ "x$FILE_NAME_ROOT" = "x" -o "x$REPO_ROOT" = "x" ] ; then
+ if [ "x$PROJECT_NAME" = "x" ] ; then
+ echo "No PROJECT_NAME specified"
+ exit -1
+ fi
+ echo "Project name: ${PROJECT_NAME}"
+ if [ "x$REPO_NAME" = "x" ] ; then
+ echo "No REPO_NAME specified"
+ exit -3
+ fi
+ echo "Repository name: ${REPO_NAME}"
+fi
+
+if [ "x$OPENJDK_URL" = "x" ] ; then
+ OPENJDK_URL=${OPENJDK_URL_DEFAULT}
+ echo "No OpenJDK URL specified; defaulting to ${OPENJDK_URL}"
+else
+ echo "OpenJDK URL: ${OPENJDK_URL}"
+fi
+
+if [ "x$COMPRESSION" = "x" ] ; then
+ # rhel 5 needs tar.gz
+ COMPRESSION=${COMPRESSION_DEFAULT}
+fi
+echo "Creating a tar.${COMPRESSION} archive"
+
+if [ "x$FILE_NAME_ROOT" = "x" ] ; then
+ FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
+ echo "No file name root specified; default to ${FILE_NAME_ROOT}"
+fi
+if [ "x$REPO_ROOT" = "x" ] ; then
+ REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}"
+ echo "No repository root specified; default to ${REPO_ROOT}"
+fi;
+
+if [ "x$TO_COMPRESS" = "x" ] ; then
+ TO_COMPRESS="openjdk"
+ echo "No to be compressed targets specified, ; default to ${TO_COMPRESS}"
+fi;
+
+if [ -d ${FILE_NAME_ROOT} ] ; then
+ echo "exists exists exists exists exists exists exists "
+ echo "reusing reusing reusing reusing reusing reusing "
+ echo ${FILE_NAME_ROOT}
+else
+ mkdir "${FILE_NAME_ROOT}"
+ pushd "${FILE_NAME_ROOT}"
+ echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
+ hg clone ${REPO_ROOT} openjdk -r ${VERSION}
+ popd
+fi
+pushd "${FILE_NAME_ROOT}"
+ if [ -d openjdk/src ]; then
+ pushd openjdk
+ echo "Removing EC source code we don't build"
+ CRYPTO_PATH=src/jdk.crypto.ec/share/native/libsunec/impl
+ rm -vrf $CRYPTO_PATH
+ echo "Syncing EC list with NSS"
+ if [ "x$PR2126" = "x" ] ; then
+ # orriginally for 8:
+ # get pr2126.patch (from http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8d2c9a898f50) from most correct tag
+ # Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2126)
+ # there is currnetly no "upstram version of this patch, hardcoding custom version
+ PR2126="../../pr2126-11.patch"
+ fi;
+ echo "Applying ${PR2126}"
+ patch -Np1 < $PR2126
+ find . -name '*.orig' -exec rm -vf '{}' ';'
+ popd
+ fi
+
+ echo "Compressing remaining forest"
+ if [ "X$COMPRESSION" = "Xxz" ] ; then
+ SWITCH=cJf
+ else
+ SWITCH=czf
+ fi
+ tar --exclude-vcs -$SWITCH ${FILE_NAME_ROOT}.tar.${COMPRESSION} $TO_COMPRESS
+ mv ${FILE_NAME_ROOT}.tar.${COMPRESSION} ..
+popd
+echo "Done. You may want to remove the uncompressed version - $FILE_NAME_ROOT."
+
+
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
new file mode 100755
index 0000000..ecbc982
--- /dev/null
+++ b/generate_source_tarball.sh
@@ -0,0 +1,152 @@
+#!/bin/bash
+# Generates the 'source tarball' for JDK 8 projects.
+#
+# Example:
+# When used from local repo set REPO_ROOT pointing to file:// with your repo
+# If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL
+# If you want to use a local copy of patch PR3667, set the path to it in the PR3667 variable
+#
+# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
+# PROJECT_NAME=jdk8u OR aarch64-port
+# REPO_NAME=jdk8u60 OR jdk8u60
+# VERSION=jdk8u60-b27 OR aarch64-jdk8u65-b17 OR for head, keyword 'tip' should do the job there
+#
+# They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set)
+
+# This script creates a single source tarball out of the repository
+# based on the given tag and removes code not allowed in fedora/rhel. For
+# consistency, the source tarball will always contain 'openjdk' as the top
+# level folder, name is created, based on parameter
+#
+
+if [ ! "x$PR3667" = "x" ] ; then
+ if [ ! -f "$PR3667" ] ; then
+ echo "You have specified PR3667 as $PR3667 but it does not exists. exiting"
+ exit 1
+ fi
+fi
+set -e
+
+OPENJDK_URL_DEFAULT=http://hg.openjdk.java.net
+COMPRESSION_DEFAULT=xz
+# jdk is last for its size
+REPOS_DEFAULT="hotspot corba jaxws jaxp langtools nashorn jdk"
+
+if [ "x$1" = "xhelp" ] ; then
+ echo -e "Behaviour may be specified by setting the following variables:\n"
+ echo "VERSION - the version of the specified OpenJDK project"
+ echo "PROJECT_NAME -- the name of the OpenJDK project being archived (optional; only needed by defaults)"
+ echo "REPO_NAME - the name of the OpenJDK repository (optional; only needed by defaults)"
+ echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
+ echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
+ echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
+ echo "REPO_ROOT - the location of the Mercurial repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
+ echo "PR3667 - the path to the PR3667 patch to apply (optional; downloaded if unavailable)"
+ echo "REPOS - specify the repositories to use (optional; defaults to ${REPOS_DEFAULT})"
+ exit 1;
+fi
+
+
+if [ "x$VERSION" = "x" ] ; then
+ echo "No VERSION specified"
+ exit -2
+fi
+echo "Version: ${VERSION}"
+
+# REPO_NAME is only needed when we default on REPO_ROOT and FILE_NAME_ROOT
+if [ "x$FILE_NAME_ROOT" = "x" -o "x$REPO_ROOT" = "x" ] ; then
+ if [ "x$PROJECT_NAME" = "x" ] ; then
+ echo "No PROJECT_NAME specified"
+ exit -1
+ fi
+ echo "Project name: ${PROJECT_NAME}"
+ if [ "x$REPO_NAME" = "x" ] ; then
+ echo "No REPO_NAME specified"
+ exit -3
+ fi
+ echo "Repository name: ${REPO_NAME}"
+fi
+
+if [ "x$OPENJDK_URL" = "x" ] ; then
+ OPENJDK_URL=${OPENJDK_URL_DEFAULT}
+ echo "No OpenJDK URL specified; defaulting to ${OPENJDK_URL}"
+else
+ echo "OpenJDK URL: ${OPENJDK_URL}"
+fi
+
+if [ "x$COMPRESSION" = "x" ] ; then
+# rhel 5 needs tar.gz
+ COMPRESSION=${COMPRESSION_DEFAULT}
+fi
+echo "Creating a tar.${COMPRESSION} archive"
+
+if [ "x$FILE_NAME_ROOT" = "x" ] ; then
+ FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
+ echo "No file name root specified; default to ${FILE_NAME_ROOT}"
+fi
+if [ "x$REPO_ROOT" = "x" ] ; then
+ REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}"
+ echo "No repository root specified; default to ${REPO_ROOT}"
+fi;
+
+mkdir "${FILE_NAME_ROOT}"
+pushd "${FILE_NAME_ROOT}"
+
+echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
+hg clone ${REPO_ROOT} openjdk -r ${VERSION}
+pushd openjdk
+
+
+if [ "x$REPOS" = "x" ] ; then
+ repos=${REPOS_DEFAULT}
+ echo "No repositories specified; defaulting to ${repos}"
+else
+ repos=$REPOS
+ echo "Repositories: ${repos}"
+fi;
+
+for subrepo in $repos
+do
+ echo "Cloning ${VERSION} ${subrepo} repository from ${REPO_ROOT}"
+ hg clone ${REPO_ROOT}/${subrepo} -r ${VERSION}
+done
+
+if [ -d jdk ]; then
+echo "Removing EC source code we don't build"
+rm -vf jdk/src/share/native/sun/security/ec/impl/ec2.h
+rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_163.c
+rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_193.c
+rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_233.c
+rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_aff.c
+rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_mont.c
+rm -vf jdk/src/share/native/sun/security/ec/impl/ecp_192.c
+rm -vf jdk/src/share/native/sun/security/ec/impl/ecp_224.c
+
+echo "Syncing EC list with NSS"
+
+if [ "x$PR3667" = "x" ] ; then
+# get pr3667.patch (from http://icedtea.classpath.org/hg/icedtea8) from most correct tag
+# Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3667)
+ wget http://icedtea.classpath.org/hg/icedtea8/raw-file/tip/patches/pr3667.patch
+ patch -Np1 < pr3667.patch
+ rm pr3667.patch
+else
+ echo "Applying ${PR3667}"
+ patch -Np1 < $PR3667
+fi;
+fi
+find . -name '*.orig' -exec rm -vf '{}' ';'
+
+popd
+echo "Compressing remaining forest"
+if [ "X$COMPRESSION" = "Xxz" ] ; then
+ tar --exclude-vcs -cJf ${FILE_NAME_ROOT}.tar.${COMPRESSION} openjdk
+else
+ tar --exclude-vcs -czf ${FILE_NAME_ROOT}.tar.${COMPRESSION} openjdk
+fi
+
+mv ${FILE_NAME_ROOT}.tar.${COMPRESSION} ..
+popd
+echo "Done. You may want to remove the uncompressed version."
+
+
diff --git a/java-1.8.0-openjdk-aarch32.spec b/java-1.8.0-openjdk-aarch32.spec
index 14e81e7..d8287df 100644
--- a/java-1.8.0-openjdk-aarch32.spec
+++ b/java-1.8.0-openjdk-aarch32.spec
@@ -21,7 +21,11 @@
# Enable release builds by default on relevant arches.
%bcond_without release
-%define _find_debuginfo_opts -g
+# The -g flag says to use strip -g instead of full strip on DSOs or EXEs.
+# This fixes detailed NMT and other tools which need minimal debug info.
+# See: https://bugzilla.redhat.com/show_bug.cgi?id=1520879
+%global _find_debuginfo_opts -g
+
# note: parametrized macros are order-sensitive (unlike not-parametrized) even with normal macros
# also necessary when passing it as parameter to other macros. If not macro, then it is considered a switch
# see the difference between global and define:
@@ -55,6 +59,7 @@
%global ppc64be ppc64 ppc64p7
%global multilib_arches %{power64} sparc64 x86_64
%global jit_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm}
+%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64}
# By default, we build a debug build during main build on JIT architectures
%if %{with slowdebug}
@@ -212,7 +217,7 @@
# links src files
# maybe depend on jfx and generate the lists in build time? Yes, bad idea to inlcude cyclic depndenci, but this list is aweful
%global jfx_jre_libs jfxswt.jar javafx.properties
-%global jfx_jre_native libprism_es2.so libprism_common.so libjavafx_font.so libdecora_sse.so libjavafx_font_freetype.so libprism_sw.so libjavafx_font_pango.so libglass.so libjavafx_iio.so
+%global jfx_jre_native libprism_es2.so libprism_common.so libjavafx_font.so libdecora_sse.so libjavafx_font_freetype.so libprism_sw.so libjavafx_font_pango.so libglass.so libjavafx_iio.so libglassgtk2.so libglassgtk3.so
%global jfx_sdk_libs javafx-mx.jar packager.jar ant-javafx.jar
%global jfx_sdk_bins javafxpackager javapackager
%global jfx_jre_exts jfxrt.jar
@@ -227,11 +232,11 @@
# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
%global shenandoah_project aarch64-port
%global shenandoah_repo jdk8u-shenandoah
-%global shenandoah_revision aarch64-shenandoah-jdk8u191-b12
+%global shenandoah_revision aarch64-shenandoah-jdk8u201-b09
# Define old aarch64/jdk8u tree variables for compatibility
%global project aarch32-port
%global repo jdk8u
-%global revision jdk8u191-b12-aarch32-181022
+%global revision jdk8u201-b09-aarch32-190124
# eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60 (dont forget spec escape % by %%)
%global whole_update %(VERSION=%{revision}; echo ${VERSION%%-*})
@@ -296,7 +301,7 @@ exit 0
# MetaspaceShared::generate_vtable_methods not implemented for PPC JIT
%ifnarch %{power64}
%ifnarch %{arm}
-#see https://bugzilla.redhat.com/show_bug.cgi?id=513605
+# see https://bugzilla.redhat.com/show_bug.cgi?id=513605
%{jrebindir -- %{?1}}/java -Xshare:dump >/dev/null 2>/dev/null
%endif
%endif
@@ -795,7 +800,7 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/ir.idl
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jconsole.jar
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/orb.idl
-%ifarch x86_64 %{ix86}
+%ifarch %{sa_arches}
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/sa-jdi.jar
%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/dt.jar
@@ -881,7 +886,6 @@ Requires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
# for java-X-openjdk package's desktop binding
Recommends: gtk2%{?_isa}
-Suggests: cups
#Provides: java-%{javaver}-%{origin} = %{epoch}:%{version}-%{release}
@@ -912,6 +916,8 @@ Requires: nss-softokn%{?_isa} %{NSSSOFTOKN_BUILDTIME_VERSION}
# considered as regression
Requires: copy-jdk-configs >= 3.3
OrderWithRequires: copy-jdk-configs
+# for printing support
+Requires: cups-libs
# Post requires alternatives to install tool alternatives
Requires(post): %{_sbindir}/alternatives
# in version 1.7 and higher for --family switch
@@ -1011,12 +1017,12 @@ OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release
}
-# Prevent brp-java-repack-jars from being run.
+# Prevent brp-java-repack-jars from being run
%global __jar_repack 0
Name: java-%{javaver}-%{origin}-aarch32
Version: %{javaver}.%{updatever}.%{buildver}
-Release: 2%{?dist}
+Release: 1%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -1052,7 +1058,6 @@ URL: http://openjdk.java.net/
# REPO_ROOT=<path to checked-out repository> generate_source_tarball.sh
# where the source is obtained from http://hg.openjdk.java.net/%%{project}/%%{repo}
Source0: %{project}-%{repo}-%{revision}.tar.xz
-#Source1: {shenandoah_project}-{shenandoah_repo}-{shenandoah_revision}.tar.xz
# Custom README for -src subpackage
Source2: README.md
@@ -1060,7 +1065,7 @@ Source2: README.md
# run update_systemtap.sh to regenerate or update systemtap sources
# update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
-Source8: systemtap-tapset-3.4.0pre01.tar.xz
+Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
# Desktop files. Adapted from IcedTea
Source9: jconsole.desktop.in
@@ -1088,202 +1093,225 @@ Source101: config.sub
#
# RPM/distribution specific patches
#
+# This section includes patches specific to
+# Fedora/RHEL which can not be upstreamed
+# either in their current form or at all.
############################################
# Accessibility patches
# Ignore AWTError when assistive technologies are loaded
-Patch1: java-1.8.0-openjdk-accessible-toolkit.patch
+Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
# Restrict access to java-atk-wrapper classes
-Patch3: java-atk-wrapper-security.patch
-# Support for building the SunEC provider with the system NSS installation
-# PR1983: Support using the system installation of NSS with the SunEC provider
-# PR2127: SunEC provider crashes when built using system NSS
-# PR2815: Race condition in SunEC provider with system NSS
-# PR2899: Don't use WithSeed versions of NSS functions as they don't fully process the seed
-# PR2934: SunEC provider throwing KeyException with current NSS
-# PR3479, RH1486025: ECC and NSS JVM crash
-Patch513: pr1983-jdk.patch
-Patch514: pr1983-root.patch
-Patch515: pr2127.patch
-Patch516: pr2815.patch
-Patch517: pr2899.patch
-Patch518: pr2934.patch
-Patch519: pr3479-rh1486025.patch
-# PR3183, RH1340845: Support Fedora/RHEL8 system crypto policy
-Patch300: pr3183-rh1340845-system-crypto-policy.patch
+Patch3: rh1648644-java_access_bridge_privileged_security.patch
+# PR1834, RH1022017: Reduce curves reported by SSL to those in NSS
+# Not currently suitable to go upstream as it disables curves
+# for all providers unconditionally
+Patch525: pr1834-rh1022017-reduce_ellipticcurvesextension_to_provide_only_three_nss_supported_nist_curves_23_24_25.patch
+# Turn on AssumeMP by default on RHEL systems
+Patch534: rh1648246-always_instruct_vm_to_assume_multiple_processors_are_available.patch
#############################################
#
# Upstreamable patches
#
+# This section includes patches which need to
+# be reviewed & pushed to the current development
+# tree of OpenJDK.
#############################################
# PR2737: Allow multiple initialization of PKCS11 libraries
-Patch5: multiple-pkcs11-library-init.patch
+Patch5: pr2737-allow_multiple_pkcs11_library_initialisation_to_be_a_non_critical_error.patch
# PR2095, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure (sync with IcedTea 2.x)
-Patch504: rh1163501.patch
+Patch504: rh1163501-increase_2048_bit_dh_upper_bound_fedora_infrastructure_in_dhparametergenerator.patch
# Turn off strict overflow on IndicRearrangementProcessor{,2}.cpp following 8140543: Arrange font actions
-Patch512: no_strict_overflow.patch
+Patch512: rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch
# RH1337583, PR2974: PKCS#10 certificate requests now use CRLF line endings rather than system line endings
-Patch523: pr2974-rh1337583.patch
+Patch523: pr2974-rh1337583-add_systemlineendings_option_to_keytool_and_use_line_separator_instead_of_crlf_in_pkcs10.patch
# PR3083, RH1346460: Regression in SSL debug output without an ECC provider
-Patch528: pr3083-rh1346460.patch
+Patch528: pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch
# RH1566890: CVE-2018-3639
-Patch529: rh1566890_embargoed20180521.patch
+Patch529: rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch
# PR3601: Fix additional -Wreturn-type issues introduced by 8061651
-Patch530: pr3601.patch
+Patch530: pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
+# Support for building the SunEC provider with the system NSS installation
+# PR1983: Support using the system installation of NSS with the SunEC provider
+# PR2127: SunEC provider crashes when built using system NSS
+# PR2815: Race condition in SunEC provider with system NSS
+# PR2899: Don't use WithSeed versions of NSS functions as they don't fully process the seed
+# PR2934: SunEC provider throwing KeyException with current NSS
+# PR3479, RH1486025: ECC and NSS JVM crash
+Patch513: pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_jdk8.patch
+Patch514: pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_root8.patch
+Patch515: pr2127-sunec_provider_crashes_when_built_using_system_nss_thus_use_of_nss_memory_management_functions.patch
+Patch516: pr2815-race_condition_in_sunec_provider_with_system_nss_fix.patch
+Patch517: pr2899-dont_use_withseed_versions_of_nss_functions_as_they_dont_fully_process_the_seed.patch
+Patch518: pr2934-sunec_provider_throwing_keyexception_withine.separator_current_nss_thus_initialise_the_random_number_generator_and_feed_the_seed_to_it.patch
+Patch519: pr3479-rh1486025-sunec_provider_can_have_multiple_instances_leading_to_premature_nss_shutdown.patch
+# PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
+Patch539: pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch
+# PR3575, RH1567204: System cacerts database handling should not affect jssecacerts
+Patch540: pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch
+# PR3183, RH1340845: Support Fedora/RHEL8 system crypto policy
+Patch300: pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch
+#############################################
+#
# Arch-specific upstreamable patches
-
+#
+# This section includes patches which need to
+# be reviewed & pushed upstream and are specific
+# to certain architectures. This usually means the
+# current OpenJDK development branch, but may also
+# include other trees e.g. for the AArch64 port for
+# OpenJDK 8u.
+#############################################
# s390: PR3593: Use "%z" for size_t on s390 as size_t != intptr_t
-#Patch103: pr3593-s390-size_t_format_flags.patch
+Patch103: pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_equals_to_int.patch
# x86: S8199936, PR3533: HotSpot generates code with unaligned stack, crashes on SSE operations (-mstackrealign workaround)
-Patch105: 8199936-pr3533-workaround.patch
+Patch105: jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch
# AArch64: PR3519: Fix further functions with a missing return value (AArch64)
-#Patch106: pr3519.patch
+Patch106: pr3519-fix_further_functions_with_a_missing_return_value.patch
+# AArch64: JDK-8160748: [AArch64] Inconsistent types for ideal_reg
+Patch107: jdk8160748-aarch64_ideal_reg.patch
+# AArch64: JDK-8189170: [AArch64] Add option to disable stack overflow checking in primordial thread for use with JNI_CreateJavaJVM
+Patch108: jdk8189170-aarch64_primordial_thread.patch
#############################################
#
# Patches which need backporting to 8u
#
+# This section includes patches which have
+# been pushed upstream to the latest OpenJDK
+# development tree, but need to be backported
+# to OpenJDK 8u.
#############################################
# S8074839, PR2462: Resolve disabled warnings for libunpack and the unpack200 binary
# This fixes printf warnings that lead to build failure with -Werror=format-security from optflags
-Patch502: pr2462.patch
+Patch502: pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binary.patch
# S8154313: Generated javadoc scattered all over the place
-Patch400: 8154313.patch
+Patch400: jdk8154313-generated_javadoc_scattered_all_over_the_place.patch
# 8197429, PR3546, RH153662{2,3}: 32 bit java app started via JNI crashes with larger stack sizes
-Patch561: 8197429-pr3546-rh1536622.patch
+Patch561: jdk8197429-pr3546-rh1536622-increased_stack_guard_causes_segfaults_on_x86_32.patch
# 8171000, PR3542, RH1402819: Robot.createScreenCapture() crashes in wayland mode
-Patch563: 8171000-pr3542-rh1402819.patch
+Patch563: jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch
# 8197546, PR3542, RH1402819: Fix for 8171000 breaks Solaris + Linux builds
-Patch564: 8197546-pr3542-rh1402819.patch
+Patch564: jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch
# PR3559: Use ldrexd for atomic reads on ARMv7.
-Patch567: pr3559.patch
+Patch567: pr3559-use_ldrexd_for_atomic_reads_on_armv7_zero.patch
# PR3591: Fix for bug 3533 doesn't add -mstackrealign to JDK code
-Patch571: pr3591.patch
+Patch571: jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch
# 8184309, PR3596: Build warnings from GCC 7.1 on Fedora 26
-Patch572: 8184309-pr3596.patch
+Patch572: jdk8184309-pr3596-build_warnings_from_gcc_7_1_on_fedora_26.patch
# 8141570, PR3548: Fix Zero interpreter build for --disable-precompiled-headers
-Patch573: 8141570-pr3548.patch
+Patch573: jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch
# 8143245, PR3548: Zero build requires disabled warnings
-Patch574: 8143245-pr3548.patch
+Patch574: jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
# 8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
-Patch575: 8197981-pr3548.patch
+Patch575: jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
# 8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning
-Patch576: 8064786-pr3599.patch
+Patch576: jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch
# 8062808, PR3548: Turn on the -Wreturn-type warning
-Patch577: 8062808-pr3548.patch
+Patch577: jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
# s390: JDK-8203030, Type fixing for s390
-#Patch102: 8203030-size_t-fixes.patch
+Patch102: jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch
+# 8035341: Allow using a system installed libpng
+Patch202: jdk8035341-allow_using_system_installed_libpng.patch
+# 8042159: Allow using a system-installed lcms2
+Patch203: jdk8042159-allow_using_system_installed_lcms2.patch
# 8210761: libjsig is being compiled without optimization
-Patch620: 8210761-rh1630426-jsig-opt-fix.patch
+Patch620: jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch
# 8210647: libsaproc is being compiled without optimization
-Patch621: 8210647-rh1630426-saproc-opt-fix.patch
+Patch621: jdk8210647-rh1632174-libsaproc_is_being_compiled_without_optimization.patch
# 8210416: [linux] Poor StrictMath performance due to non-optimized compilation
-#Patch622: 8210416-rh1630426-strict-math-opt.patch
+Patch622: jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch
# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
# Upstream 8u part.
-Patch623: 8210425-01-rh1630426-hotspot-opt-fix.patch
+Patch623: jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch
# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
# Aarch64-port 8u local part
-#Patch624: 8210425-02-rh1630426-hotspot-opt-fix-aarch64.patch
+Patch624: jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch
# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
# Zero part of the fix for (arm/s390 arches)
-#Patch625: 8210425-03-rh1630426-hotspot-opt-fix-zero.patch
-
-#############################################
-#
-# Patches appearing in 8u192
-#
-#############################################
-# S8031668, PR2842: TOOLCHAIN_FIND_COMPILER unexpectedly resolves symbolic links
-Patch506: 8031668-pr2842-01.patch
-# S8148351, PR2842: Only display resolved symlink for compiler, do not change path
-Patch507: 8148351-pr2842-02.patch
-# S6260348, PR3066: GTK+ L&F JTextComponent not respecting desktop caret blink rate
-Patch526: 6260348-pr3066.patch
-# 8061305, PR3335, RH1423421: Javadoc crashes when method name ends with "Property"
-Patch538: 8061305-pr3335-rh1423421.patch
-# 8188030, PR3459, RH1484079: AWT java apps fail to start when some minimal fonts are present
-Patch560: 8188030-pr3459-rh1484079.patch
-# 8205104, PR3539, RH1548475: Pass EXTRA_LDFLAGS to HotSpot build
-Patch562: 8205104-pr3539-rh1548475.patch
-# 8185723, PR3553: Zero: segfaults on Power PC 32-bit
-Patch565: 8185723-pr3553.patch
-# 8186461, PR3557: Zero's atomic_copy64() should use SPE instructions on linux-powerpcspe
-Patch566: 8186461-pr3557.patch
-# 8201509, PR3579: Zero: S390 31bit atomic_copy64 inline assembler is wrong
-Patch569: 8201509-pr3579.patch
-# 8075942, PR3602: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo
-Patch578: 8075942-pr3602-rh1582032.patch
-# 8203182, PR3603: Release session if initialization of SunPKCS11 Signature fails
-Patch579: 8203182-pr3603-rh1568033.patch
-# 8206406, PR3610, RH1597825: StubCodeDesc constructor publishes partially-constructed objects on StubCodeDesc::_list
-Patch580: 8206406-pr3610-rh1597825.patch
-# Patches 204 and 205 stop the build adding .gnu_debuglink sections to unstripped files
-# 8206425: .gnu_debuglink sections added unconditionally when no debuginfo is stripped
-Patch204: 8206425-hotspot-remove-debuglink.patch
-# 8036003: Add --with-native-debug-symbols=[none|internal|external|zipped]
-Patch205: 8036003-add-with-native-debug-symbols-configure-flag.patch
-# s390: JDK-8201495, PR2415: JVM -Xmx requirement is too high on s390
-#Patch100: 8201495-s390-java-opts.patch
+Patch625: jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch
#############################################
#
# Patches appearing in 8u202
#
+# This section includes patches which are present
+# in the listed OpenJDK 8u release and should be
+# able to be removed once that release is out
+# and used by this RPM.
#############################################
-# S8150954, RH1176206, PR2866: Taking screenshots on x11 composite desktop produces wrong result
-Patch508: 8150954-pr2866-rh1176206-screenshot-xcomposite-jdk.patch
# 8207057, PR3613: Enable debug information for assembly code files
-Patch206: 8207057-pr3613-assembler-debuginfo-hotspot.patch
-Patch207: 8207057-pr3613-assembler-debuginfo-root.patch
+Patch206: jdk8207057-pr3613-no_debug_info_for_assembler_files_hotspot.patch
+Patch207: jdk8207057-pr3613-no_debug_info_for_assembler_files_root.patch
# 8165852, PR3468: (fs) Mount point not found for a file which is present in overlayfs
-Patch210: 8165852-pr3468.patch
+Patch210: jdk8165852-pr3468-mount_point_not_found_for_a_file_which_is_present_in_overlayfs.patch
# S8073139, RH1191652; fix name of ppc64le architecture
-#Patch601: 8073139-rh1191652-root.patch
-#Patch602: 8073139-rh1191652-jdk.patch
-#Patch603: 8073139-rh1191652-hotspot-aarch64.patch
+Patch601: jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch
+Patch602: jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_jdk.patch
+Patch603: jdk8073139-pr2236-rh1191652--use_ppc64le_as_the_arch_directory_on_that_platform_and_report_it_in_os_arch_aarch64_forest.patch
# 8044235: src.zip should include all sources
-Patch7: 8044235-include-all-srcs.patch
+Patch7: jdk8044235-src_zip_should_include_all_sources.patch
+# JDK-8172850, RH1640127: Anti-dependency on membar causes crash in register allocator due to invalid instruction scheduling
+Patch583: jdk8172850-rh1640127-01-register_allocator_crash.patch
+# JDK-8209639, RH1640127: assert failure in coalesce.cpp: attempted to spill a non-spillable item
+Patch584: jdk8209639-rh1640127-02-coalesce_attempted_spill_non_spillable.patch
+# JDK-8131048, PR3574, RH1498936: ppc implement CRC32 intrinsic
+Patch586: jdk8131048-pr3574-rh1498936-ppc_crc32.patch
+# JDK-8164920, PR3574, RH1498936: ppc: enhancement of CRC32 intrinsic
+Patch587: jdk8164920-pr3574-rh1498936-ppc_crc32_enhancement.patch
#############################################
#
-# Patches ineligible for 8u
+# Patches appearing in 8u211
#
+# This section includes patches which are present
+# in the listed OpenJDK 8u release and should be
+# able to be removed once that release is out
+# and used by this RPM.
#############################################
-# 8043805: Allow using a system-installed libjpeg
-Patch201: system-libjpeg.patch
-# 8035341: Allow using a system installed libpng
-Patch202: system-libpng.patch
-# 8042159: Allow using a system-installed lcms2
-Patch203: system-lcms.patch
+# JDK-8029661, PR3642, RH1477159: Support TLS v1.2 algorithm in SunPKCS11 provider
+Patch585: jdk8029661-pr3642-rh1477159-add_tlsv1_2_support_to_pkcs11_provider.patch
+# JDK-8145096, PR3693: Undefined behaviour in HotSpot
+Patch588: jdk8145096-pr3693-undefined_behaviour.patch
#############################################
#
-# Local fixes
+# Patches ineligible for 8u
#
+# This section includes patches which are present
+# upstream, but ineligible for upstream 8u backport.
#############################################
-# PR1834, RH1022017: Reduce curves reported by SSL to those in NSS
-Patch525: pr1834-rh1022017.patch
-# Turn on AssumeMP by default on RHEL systems
-#Patch534: always_assumemp.patch
-# PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
-Patch539: pr2888.patch
-# PR3575, RH1567204: System cacerts database handling should not affect jssecacerts
-Patch540: pr3575-rh1567204.patch
+# 8043805: Allow using a system-installed libjpeg
+Patch201: jdk8043805-allow_using_system_installed_libjpeg.patch
+#############################################
+#
# Shenandoah fixes
+#
+# This section includes patches which are
+# specific to the Shenandoah garbage collector
+# and should be upstreamed to the appropriate
+# trees.
+#############################################
# PR3634: Shenandoah still broken on s390 with aarch64-shenandoah-jdk8u181-b16
-#Patch582: pr3634.patch
+Patch582: pr3634-fix_shenandoah_for_size_t_on_s390.patch
#############################################
#
# Non-OpenJDK fixes
#
+# This section includes patches to code other
+# that from OpenJDK.
#############################################
-Patch1000: enableCommentedOutSystemNss.patch
+Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
+#############################################
+#
+# Dependencies
+#
+#############################################
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: alsa-lib-devel
@@ -1600,8 +1628,6 @@ sh %{SOURCE12}
%patch203
# Debugging fixes
-%patch204
-%patch205
%patch206
%patch207
%patch210
@@ -1614,12 +1640,13 @@ sh %{SOURCE12}
%patch7
# s390 build fixes
-#%patch100
-#%patch102
-#%patch103
+%patch102
+%patch103
# AArch64 fixes
#%patch106
+#%patch107
+#%patch108
# x86 fixes
%patch105
@@ -1632,9 +1659,6 @@ sh %{SOURCE12}
# Upstreamable fixes
%patch502
%patch504
-%patch506
-%patch507
-%patch508
%patch512
%patch513
%patch514
@@ -1645,20 +1669,13 @@ sh %{SOURCE12}
%patch519
%patch400
%patch523
-%patch526
%patch528
%patch529
%patch530
-%patch538
-%patch560
%patch561
-%patch562
%patch563
%patch564
-%patch565
-%patch566
%patch567
-%patch569
%patch571
%patch572
%patch573
@@ -1666,15 +1683,18 @@ sh %{SOURCE12}
%patch575
%patch576
%patch577
-%patch578
-%patch579
-%patch580
%patch620
%patch621
#%patch622
%patch623
#%patch624
-#%patch625
+%patch625
+%patch583
+%patch584
+%patch585
+%patch586
+%patch587
+%patch588
# RPM-only fixes
%patch525
@@ -1800,8 +1820,13 @@ bash ../../configure \
--with-libpng=system \
--with-lcms=system \
--with-stdc++lib=dynamic \
+%ifarch %{ix86}
+ --with-extra-cxxflags="-mstackrealign $EXTRA_CPP_FLAGS" \
+ --with-extra-cflags="-mstackrealign $EXTRA_CFLAGS" \
+%else
--with-extra-cxxflags="$EXTRA_CPP_FLAGS" \
--with-extra-cflags="$EXTRA_CFLAGS" \
+%endif
--with-extra-ldflags="%{ourldflags}" \
--with-num-cores="$NUM_PROC"
@@ -2062,6 +2087,7 @@ find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/demo \
pushd $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/lib/aarch32
ln -s %{_libdir}/java-atk-wrapper/libatk-wrapper.so.0 libatk-wrapper.so
popd
+
pushd $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/lib/ext
ln -s %{_libdir}/java-atk-wrapper/java-atk-wrapper.jar java-atk-wrapper.jar
popd
@@ -2377,8 +2403,9 @@ require "copy_jdk_configs.lua"
%endif
%changelog
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.8.0.191.181022-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+* Tue Feb 12 2019 Alex Kashchenko <akashche(a)redhat.com> - 1:1.8.0.201-1.190124
+- update sources to 8u201
+- sync with mainline package
* Tue Oct 30 2018 Alex Kashchenko <akashche(a)redhat.com> - 1:1.8.0.191-1.181022
- update sources to 8u191
diff --git a/java-1.8.0-openjdk-accessible-toolkit.patch b/java-1.8.0-openjdk-accessible-toolkit.patch
deleted file mode 100644
index bddd702..0000000
--- a/java-1.8.0-openjdk-accessible-toolkit.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -uNr openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java jdk8/jdk/src/share/classes/java/awt/Toolkit.java
---- openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 11:59:47.000000000 -0500
-+++ jdk8/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 12:05:20.000000000 -0500
-@@ -883,7 +883,11 @@
- return null;
- }
- });
-- loadAssistiveTechnologies();
-+ try {
-+ loadAssistiveTechnologies();
-+ } catch ( AWTError error) {
-+ // ignore silently
-+ }
- }
- return toolkit;
- }
diff --git a/java-1.8.0-openjdk-remove-intree-libraries.sh b/java-1.8.0-openjdk-remove-intree-libraries.sh
index 879d462..b52d016 100644
--- a/java-1.8.0-openjdk-remove-intree-libraries.sh
+++ b/java-1.8.0-openjdk-remove-intree-libraries.sh
@@ -99,6 +99,7 @@ if [ ! -d ${LCMS_SRC} ]; then
fi
# temporary change to move bundled LCMS
if [ ! true ]; then
+rm -vf ${LCMS_SRC}/cmsalpha.c
rm -vf ${LCMS_SRC}/cmscam02.c
rm -vf ${LCMS_SRC}/cmscgats.c
rm -vf ${LCMS_SRC}/cmscnvrt.c
@@ -128,3 +129,10 @@ rm -vf ${LCMS_SRC}/lcms2.h
rm -vf ${LCMS_SRC}/lcms2_internal.h
rm -vf ${LCMS_SRC}/lcms2_plugin.h
fi
+
+# Get rid of in-tree SunEC until RH1656676 is implemented
+echo "Removing SunEC native code"
+mv -v openjdk/jdk/src/share/native/sun/security/ec/impl/ecc_impl.h .
+rm -vrf openjdk/jdk/src/share/native/sun/security/ec/impl
+mkdir openjdk/jdk/src/share/native/sun/security/ec/impl
+mv -v ecc_impl.h openjdk/jdk/src/share/native/sun/security/ec/impl
diff --git a/java-atk-wrapper-security.patch b/java-atk-wrapper-security.patch
deleted file mode 100644
index 538468a..0000000
--- a/java-atk-wrapper-security.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- jdk8/jdk/src/share/lib/security/java.security-linux.orig
-+++ jdk8/jdk/src/share/lib/security/java.security-linux
-@@ -223,7 +223,9 @@
- jdk.nashorn.internal.,\
- jdk.nashorn.tools.,\
- jdk.xml.internal.,\
-- com.sun.activation.registries.
-+ com.sun.activation.registries.,\
-+ org.GNOME.Accessibility.,\
-+ org.GNOME.Bonobo.
-
- #
- # List of comma-separated packages that start with or equal this string
-@@ -273,7 +275,9 @@
- jdk.nashorn.internal.,\
- jdk.nashorn.tools.,\
- jdk.xml.internal.,\
-- com.sun.activation.registries.
-+ com.sun.activation.registries.,\
-+ org.GNOME.Accessibility.,\
-+ org.GNOME.Bonobo.
-
- #
- # Determines whether this properties file can be appended to
diff --git a/jdk8029661-pr3642-rh1477159-add_tlsv1_2_support_to_pkcs11_provider.patch b/jdk8029661-pr3642-rh1477159-add_tlsv1_2_support_to_pkcs11_provider.patch
new file mode 100644
index 0000000..f7a816a
--- /dev/null
+++ b/jdk8029661-pr3642-rh1477159-add_tlsv1_2_support_to_pkcs11_provider.patch
@@ -0,0 +1,2269 @@
+# HG changeset patch
+# User mbalao
+# Date 1541016287 10800
+# Wed Oct 31 17:04:47 2018 -0300
+# Node ID fa06cdb4c6f7b5ca148f26d345090d48014fecff
+# Parent 478a4add975beb90696a4ead5f8fcd9c17fc1a83
+8029661, PR3642, RH1477159: Support TLS v1.2 algorithm in SunPKCS11 provider
+Summary: TLS v1.2 algorithms for key and MAC derivation added to SunPKCS11 crypto provider. 8210912 fix is included as part of this changeset.
+Reviewed-by: valeriep
+
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 2018, 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
+@@ -95,9 +95,9 @@
+ throw new InvalidAlgorithmParameterException("init() failed", e);
+ }
+ version = (spec.getMajorVersion() << 8) | spec.getMinorVersion();
+- if ((version < 0x0300) && (version > 0x0302)) {
+- throw new InvalidAlgorithmParameterException
+- ("Only SSL 3.0, TLS 1.0, and TLS 1.1 are supported");
++ if ((version < 0x0300) && (version > 0x0303)) {
++ throw new InvalidAlgorithmParameterException("Only SSL 3.0," +
++ " TLS 1.0, TLS 1.1, and TLS 1.2 are supported");
+ }
+ // we assume the token supports both the CKM_SSL3_* and the CKM_TLS_*
+ // mechanisms
+@@ -112,8 +112,11 @@
+ throw new IllegalStateException
+ ("TlsKeyMaterialGenerator must be initialized");
+ }
+- mechanism = (version == 0x0300) ? CKM_SSL3_KEY_AND_MAC_DERIVE
+- : CKM_TLS_KEY_AND_MAC_DERIVE;
++ if (version == 0x0300) {
++ mechanism = CKM_SSL3_KEY_AND_MAC_DERIVE;
++ } else if (version == 0x0301 || version == 0x0302) {
++ mechanism = CKM_TLS_KEY_AND_MAC_DERIVE;
++ }
+ int macBits = spec.getMacKeyLength() << 3;
+ int ivBits = spec.getIvLength() << 3;
+
+@@ -129,8 +132,18 @@
+
+ CK_SSL3_RANDOM_DATA random = new CK_SSL3_RANDOM_DATA
+ (spec.getClientRandom(), spec.getServerRandom());
+- CK_SSL3_KEY_MAT_PARAMS params = new CK_SSL3_KEY_MAT_PARAMS
+- (macBits, keyBits, ivBits, isExportable, random);
++ Object params = null;
++ CK_MECHANISM ckMechanism = null;
++ if (version < 0x0303) {
++ params = new CK_SSL3_KEY_MAT_PARAMS
++ (macBits, keyBits, ivBits, isExportable, random);
++ ckMechanism = new CK_MECHANISM(mechanism, (CK_SSL3_KEY_MAT_PARAMS)params);
++ } else if (version == 0x0303) {
++ params = new CK_TLS12_KEY_MAT_PARAMS
++ (macBits, keyBits, ivBits, isExportable, random,
++ Functions.getHashMechId(spec.getPRFHashAlg()));
++ ckMechanism = new CK_MECHANISM(mechanism, (CK_TLS12_KEY_MAT_PARAMS)params);
++ }
+
+ String cipherAlgorithm = spec.getCipherAlgorithm();
+ long keyType = P11SecretKeyFactory.getKeyType(cipherAlgorithm);
+@@ -162,9 +175,14 @@
+ (O_GENERATE, CKO_SECRET_KEY, keyType, attributes);
+ // the returned keyID is a dummy, ignore
+ long keyID = token.p11.C_DeriveKey(session.id(),
+- new CK_MECHANISM(mechanism, params), p11Key.keyID, attributes);
++ ckMechanism, p11Key.keyID, attributes);
+
+- CK_SSL3_KEY_MAT_OUT out = params.pReturnedKeyMaterial;
++ CK_SSL3_KEY_MAT_OUT out = null;
++ if (params instanceof CK_SSL3_KEY_MAT_PARAMS) {
++ out = ((CK_SSL3_KEY_MAT_PARAMS)params).pReturnedKeyMaterial;
++ } else if (params instanceof CK_TLS12_KEY_MAT_PARAMS) {
++ out = ((CK_TLS12_KEY_MAT_PARAMS)params).pReturnedKeyMaterial;
++ }
+ // Note that the MAC keys do not inherit all attributes from the
+ // template, but they do inherit the sensitive/extractable/token
+ // flags, which is all P11Key cares about.
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 2018, 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
+@@ -89,9 +89,9 @@
+ throw new InvalidAlgorithmParameterException("init() failed", e);
+ }
+ version = (spec.getMajorVersion() << 8) | spec.getMinorVersion();
+- if ((version < 0x0300) || (version > 0x0302)) {
+- throw new InvalidAlgorithmParameterException
+- ("Only SSL 3.0, TLS 1.0, and TLS 1.1 supported");
++ if ((version < 0x0300) && (version > 0x0303)) {
++ throw new InvalidAlgorithmParameterException("Only SSL 3.0," +
++ " TLS 1.0, TLS 1.1, and TLS 1.2 are supported");
+ }
+ // We assume the token supports the required mechanism. If it does not,
+ // generateKey() will fail and the failover should take care of us.
+@@ -106,10 +106,20 @@
+ throw new IllegalStateException
+ ("TlsMasterSecretGenerator must be initialized");
+ }
++ final boolean isTlsRsaPremasterSecret =
++ p11Key.getAlgorithm().equals("TlsRsaPremasterSecret");
++ if (version == 0x0300) {
++ mechanism = isTlsRsaPremasterSecret ?
++ CKM_SSL3_MASTER_KEY_DERIVE : CKM_SSL3_MASTER_KEY_DERIVE_DH;
++ } else if (version == 0x0301 || version == 0x0302) {
++ mechanism = isTlsRsaPremasterSecret ?
++ CKM_TLS_MASTER_KEY_DERIVE : CKM_TLS_MASTER_KEY_DERIVE_DH;
++ } else if (version == 0x0303) {
++ mechanism = isTlsRsaPremasterSecret ?
++ CKM_TLS12_MASTER_KEY_DERIVE : CKM_TLS12_MASTER_KEY_DERIVE_DH;
++ }
+ CK_VERSION ckVersion;
+- if (p11Key.getAlgorithm().equals("TlsRsaPremasterSecret")) {
+- mechanism = (version == 0x0300) ? CKM_SSL3_MASTER_KEY_DERIVE
+- : CKM_TLS_MASTER_KEY_DERIVE;
++ if (isTlsRsaPremasterSecret) {
+ ckVersion = new CK_VERSION(0, 0);
+ } else {
+ // Note: we use DH for all non-RSA premaster secrets. That includes
+@@ -118,16 +128,23 @@
+ // TLS PRF (or the SSL equivalent).
+ // The only thing special about RSA master secret calculation is
+ // that it extracts the version numbers from the premaster secret.
+- mechanism = (version == 0x0300) ? CKM_SSL3_MASTER_KEY_DERIVE_DH
+- : CKM_TLS_MASTER_KEY_DERIVE_DH;
+ ckVersion = null;
+ }
+ byte[] clientRandom = spec.getClientRandom();
+ byte[] serverRandom = spec.getServerRandom();
+ CK_SSL3_RANDOM_DATA random =
+ new CK_SSL3_RANDOM_DATA(clientRandom, serverRandom);
+- CK_SSL3_MASTER_KEY_DERIVE_PARAMS params =
+- new CK_SSL3_MASTER_KEY_DERIVE_PARAMS(random, ckVersion);
++ CK_MECHANISM ckMechanism = null;
++ if (version < 0x0303) {
++ CK_SSL3_MASTER_KEY_DERIVE_PARAMS params =
++ new CK_SSL3_MASTER_KEY_DERIVE_PARAMS(random, ckVersion);
++ ckMechanism = new CK_MECHANISM(mechanism, params);
++ } else if (version == 0x0303) {
++ CK_TLS12_MASTER_KEY_DERIVE_PARAMS params =
++ new CK_TLS12_MASTER_KEY_DERIVE_PARAMS(random, ckVersion,
++ Functions.getHashMechId(spec.getPRFHashAlg()));
++ ckMechanism = new CK_MECHANISM(mechanism, params);
++ }
+
+ Session session = null;
+ try {
+@@ -135,9 +152,8 @@
+ CK_ATTRIBUTE[] attributes = token.getAttributes(O_GENERATE,
+ CKO_SECRET_KEY, CKK_GENERIC_SECRET, new CK_ATTRIBUTE[0]);
+ long keyID = token.p11.C_DeriveKey(session.id(),
+- new CK_MECHANISM(mechanism, params), p11Key.keyID, attributes);
++ ckMechanism, p11Key.keyID, attributes);
+ int major, minor;
+- ckVersion = params.pVersion;
+ if (ckVersion == null) {
+ major = -1;
+ minor = -1;
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 2018, 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
+@@ -124,8 +124,46 @@
+ if (spec == null) {
+ throw new IllegalStateException("TlsPrfGenerator must be initialized");
+ }
++ byte[] seed = spec.getSeed();
++
++ // TLS 1.2
++ if (mechanism == CKM_TLS_MAC) {
++ SecretKey k = null;
++ int ulServerOrClient = 0;
++ if (spec.getLabel().equals("server finished")) {
++ ulServerOrClient = 1;
++ }
++ if (spec.getLabel().equals("client finished")) {
++ ulServerOrClient = 2;
++ }
++
++ if (ulServerOrClient != 0) {
++ // Finished message
++ CK_TLS_MAC_PARAMS params = new CK_TLS_MAC_PARAMS(
++ Functions.getHashMechId(spec.getPRFHashAlg()),
++ spec.getOutputLength(), ulServerOrClient);
++ Session session = null;
++ try {
++ session = token.getOpSession();
++ token.p11.C_SignInit(session.id(),
++ new CK_MECHANISM(mechanism, params), p11Key.keyID);
++ token.p11.C_SignUpdate(session.id(), 0, seed, 0, seed.length);
++ byte[] out = token.p11.C_SignFinal
++ (session.id(), spec.getOutputLength());
++ k = new SecretKeySpec(out, "TlsPrf");
++ } catch (PKCS11Exception e) {
++ throw new ProviderException("Could not calculate PRF", e);
++ } finally {
++ token.releaseSession(session);
++ }
++ } else {
++ throw new ProviderException("Only Finished message authentication code"+
++ " generation supported for TLS 1.2.");
++ }
++ return k;
++ }
++
+ byte[] label = P11Util.getBytesUTF8(spec.getLabel());
+- byte[] seed = spec.getSeed();
+
+ if (mechanism == CKM_NSS_TLS_PRF_GENERAL) {
+ Session session = null;
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 2018, 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
+@@ -57,6 +57,8 @@
+ // mechanism id
+ private long mechanism;
+
++ private int version;
++
+ private TlsRsaPremasterSecretParameterSpec spec;
+
+ P11TlsRsaPremasterSecretGenerator(Token token, String algorithm, long mechanism)
+@@ -77,6 +79,11 @@
+ throw new InvalidAlgorithmParameterException(MSG);
+ }
+ this.spec = (TlsRsaPremasterSecretParameterSpec)params;
++ version = (spec.getMajorVersion() << 8) | spec.getMinorVersion();
++ if ((version < 0x0300) && (version > 0x0303)) {
++ throw new InvalidAlgorithmParameterException
++ ("Only SSL 3.0, TLS 1.0, TLS 1.1, and TLS 1.2 are supported");
++ }
+ }
+
+ protected void engineInit(int keysize, SecureRandom random) {
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java openjdk/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, 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
+@@ -720,38 +720,28 @@
+ s("1.2.840.113549.1.1.13", "OID.1.2.840.113549.1.1.13"),
+ m(CKM_SHA512_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
+
+- /*
+- * TLS 1.2 uses a different hash algorithm than 1.0/1.1 for the
+- * PRF calculations. As of 2010, there is no PKCS11-level
+- * support for TLS 1.2 PRF calculations, and no known OS's have
+- * an internal variant we could use. Therefore for TLS 1.2, we
+- * are updating JSSE to request different provider algorithms
+- * (e.g. "SunTls12Prf"), and currently only SunJCE has these
+- * TLS 1.2 algorithms.
+- *
+- * If we reused the names such as "SunTlsPrf", the PKCS11
+- * providers would need be updated to fail correctly when
+- * presented with the wrong version number (via
+- * Provider.Service.supportsParameters()), and we would also
+- * need to add the appropriate supportsParamters() checks into
+- * KeyGenerators (not currently there).
+- *
+- * In the future, if PKCS11 support is added, we will restructure
+- * this.
+- */
+ d(KG, "SunTlsRsaPremasterSecret",
+ "sun.security.pkcs11.P11TlsRsaPremasterSecretGenerator",
++ s("SunTls12RsaPremasterSecret"),
+ m(CKM_SSL3_PRE_MASTER_KEY_GEN, CKM_TLS_PRE_MASTER_KEY_GEN));
+ d(KG, "SunTlsMasterSecret",
+ "sun.security.pkcs11.P11TlsMasterSecretGenerator",
+ m(CKM_SSL3_MASTER_KEY_DERIVE, CKM_TLS_MASTER_KEY_DERIVE,
+ CKM_SSL3_MASTER_KEY_DERIVE_DH,
+ CKM_TLS_MASTER_KEY_DERIVE_DH));
++ d(KG, "SunTls12MasterSecret",
++ "sun.security.pkcs11.P11TlsMasterSecretGenerator",
++ m(CKM_TLS12_MASTER_KEY_DERIVE, CKM_TLS12_MASTER_KEY_DERIVE_DH));
+ d(KG, "SunTlsKeyMaterial",
+ "sun.security.pkcs11.P11TlsKeyMaterialGenerator",
+ m(CKM_SSL3_KEY_AND_MAC_DERIVE, CKM_TLS_KEY_AND_MAC_DERIVE));
++ d(KG, "SunTls12KeyMaterial",
++ "sun.security.pkcs11.P11TlsKeyMaterialGenerator",
++ m(CKM_TLS12_KEY_AND_MAC_DERIVE));
+ d(KG, "SunTlsPrf", "sun.security.pkcs11.P11TlsPrfGenerator",
+ m(CKM_TLS_PRF, CKM_NSS_TLS_PRF_GENERAL));
++ d(KG, "SunTls12Prf", "sun.security.pkcs11.P11TlsPrfGenerator",
++ m(CKM_TLS_MAC));
+ }
+
+ // background thread that periodically checks for token insertion
+@@ -1016,13 +1006,16 @@
+ if (algorithm == "SunTlsRsaPremasterSecret") {
+ return new P11TlsRsaPremasterSecretGenerator(
+ token, algorithm, mechanism);
+- } else if (algorithm == "SunTlsMasterSecret") {
++ } else if (algorithm == "SunTlsMasterSecret"
++ || algorithm == "SunTls12MasterSecret") {
+ return new P11TlsMasterSecretGenerator(
+ token, algorithm, mechanism);
+- } else if (algorithm == "SunTlsKeyMaterial") {
++ } else if (algorithm == "SunTlsKeyMaterial"
++ || algorithm == "SunTls12KeyMaterial") {
+ return new P11TlsKeyMaterialGenerator(
+ token, algorithm, mechanism);
+- } else if (algorithm == "SunTlsPrf") {
++ } else if (algorithm == "SunTlsPrf"
++ || algorithm == "SunTls12Prf") {
+ return new P11TlsPrfGenerator(token, algorithm, mechanism);
+ } else {
+ return new P11KeyGenerator(token, algorithm, mechanism);
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+
+ /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
+@@ -112,14 +112,26 @@
+ init(mechanism, params);
+ }
+
++ public CK_MECHANISM(long mechanism, CK_TLS12_MASTER_KEY_DERIVE_PARAMS params) {
++ init(mechanism, params);
++ }
++
+ public CK_MECHANISM(long mechanism, CK_SSL3_KEY_MAT_PARAMS params) {
+ init(mechanism, params);
+ }
+
++ public CK_MECHANISM(long mechanism, CK_TLS12_KEY_MAT_PARAMS params) {
++ init(mechanism, params);
++ }
++
+ public CK_MECHANISM(long mechanism, CK_TLS_PRF_PARAMS params) {
+ init(mechanism, params);
+ }
+
++ public CK_MECHANISM(long mechanism, CK_TLS_MAC_PARAMS params) {
++ init(mechanism, params);
++ }
++
+ public CK_MECHANISM(long mechanism, CK_ECDH1_DERIVE_PARAMS params) {
+ init(mechanism, params);
+ }
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS12_KEY_MAT_PARAMS.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS12_KEY_MAT_PARAMS.java
+new file mode 100644
+--- /dev/null
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS12_KEY_MAT_PARAMS.java
+@@ -0,0 +1,151 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ */
++
++package sun.security.pkcs11.wrapper;
++
++/**
++ * CK_TLS12_KEY_MAT_PARAMS from PKCS#11 v2.40.
++ */
++public class CK_TLS12_KEY_MAT_PARAMS {
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_ULONG ulMacSizeInBits;
++ * </PRE>
++ */
++ public long ulMacSizeInBits;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_ULONG ulKeySizeInBits;
++ * </PRE>
++ */
++ public long ulKeySizeInBits;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_ULONG ulIVSizeInBits;
++ * </PRE>
++ */
++ public long ulIVSizeInBits;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_BBOOL bIsExport;
++ * </PRE>
++ */
++ public boolean bIsExport;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_SSL3_RANDOM_DATA RandomInfo;
++ * </PRE>
++ */
++ public CK_SSL3_RANDOM_DATA RandomInfo;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_SSL3_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
++ * </PRE>
++ */
++ public CK_SSL3_KEY_MAT_OUT pReturnedKeyMaterial;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_MECHANISM_TYPE prfHashMechanism;
++ * </PRE>
++ */
++ public long prfHashMechanism;
++
++ public CK_TLS12_KEY_MAT_PARAMS(
++ int macSize, int keySize, int ivSize, boolean export,
++ CK_SSL3_RANDOM_DATA random, long prfHashMechanism) {
++ ulMacSizeInBits = macSize;
++ ulKeySizeInBits = keySize;
++ ulIVSizeInBits = ivSize;
++ bIsExport = export;
++ RandomInfo = random;
++ pReturnedKeyMaterial = new CK_SSL3_KEY_MAT_OUT();
++ if (ivSize != 0) {
++ int n = ivSize >> 3;
++ pReturnedKeyMaterial.pIVClient = new byte[n];
++ pReturnedKeyMaterial.pIVServer = new byte[n];
++ }
++ this.prfHashMechanism = prfHashMechanism;
++ }
++
++ /**
++ * Returns the string representation of CK_TLS12_KEY_MAT_PARAMS.
++ *
++ * @return the string representation of CK_TLS12_KEY_MAT_PARAMS
++ */
++ public String toString() {
++ StringBuilder buffer = new StringBuilder();
++
++ buffer.append(Constants.INDENT);
++ buffer.append("ulMacSizeInBits: ");
++ buffer.append(ulMacSizeInBits);
++ buffer.append(Constants.NEWLINE);
++
++ buffer.append(Constants.INDENT);
++ buffer.append("ulKeySizeInBits: ");
++ buffer.append(ulKeySizeInBits);
++ buffer.append(Constants.NEWLINE);
++
++ buffer.append(Constants.INDENT);
++ buffer.append("ulIVSizeInBits: ");
++ buffer.append(ulIVSizeInBits);
++ buffer.append(Constants.NEWLINE);
++
++ buffer.append(Constants.INDENT);
++ buffer.append("bIsExport: ");
++ buffer.append(bIsExport);
++ buffer.append(Constants.NEWLINE);
++
++ buffer.append(Constants.INDENT);
++ buffer.append("RandomInfo: ");
++ buffer.append(RandomInfo);
++ buffer.append(Constants.NEWLINE);
++
++ buffer.append(Constants.INDENT);
++ buffer.append("pReturnedKeyMaterial: ");
++ buffer.append(pReturnedKeyMaterial);
++ buffer.append(Constants.NEWLINE);
++
++ buffer.append(Constants.INDENT);
++ buffer.append("prfHashMechanism: ");
++ buffer.append(prfHashMechanism);
++
++ return buffer.toString();
++ }
++
++}
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS12_MASTER_KEY_DERIVE_PARAMS.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS12_MASTER_KEY_DERIVE_PARAMS.java
+new file mode 100644
+--- /dev/null
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS12_MASTER_KEY_DERIVE_PARAMS.java
+@@ -0,0 +1,65 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ */
++
++package sun.security.pkcs11.wrapper;
++
++/**
++ * CK_TLS12_MASTER_KEY_DERIVE_PARAMS from PKCS#11 v2.40.
++ */
++public class CK_TLS12_MASTER_KEY_DERIVE_PARAMS {
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_SSL3_RANDOM_DATA RandomInfo;
++ * </PRE>
++ */
++ public CK_SSL3_RANDOM_DATA RandomInfo;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_VERSION_PTR pVersion;
++ * </PRE>
++ */
++ public CK_VERSION pVersion;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_MECHANISM_TYPE prfHashMechanism;
++ * </PRE>
++ */
++ public long prfHashMechanism;
++
++ public CK_TLS12_MASTER_KEY_DERIVE_PARAMS(
++ CK_SSL3_RANDOM_DATA random, CK_VERSION version,
++ long prfHashMechanism) {
++ RandomInfo = random;
++ pVersion = version;
++ this.prfHashMechanism = prfHashMechanism;
++ }
++
++}
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS_MAC_PARAMS.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS_MAC_PARAMS.java
+new file mode 100644
+--- /dev/null
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS_MAC_PARAMS.java
+@@ -0,0 +1,64 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ */
++
++package sun.security.pkcs11.wrapper;
++
++/**
++ * CK_TLS_MAC_PARAMS from PKCS#11 v2.40.
++ */
++public class CK_TLS_MAC_PARAMS {
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_MECHANISM_TYPE prfMechanism;
++ * </PRE>
++ */
++ public long prfMechanism;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_ULONG ulMacLength;
++ * </PRE>
++ */
++ public long ulMacLength;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_ULONG ulServerOrClient;
++ * </PRE>
++ */
++ public long ulServerOrClient;
++
++ public CK_TLS_MAC_PARAMS(long prfMechanism,
++ long ulMacLength, long ulServerOrClient) {
++ this.prfMechanism = prfMechanism;
++ this.ulMacLength = ulMacLength;
++ this.ulServerOrClient = ulServerOrClient;
++ }
++
++}
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/Functions.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/Functions.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/Functions.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/Functions.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+
+ /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
+@@ -73,6 +73,9 @@
+ private static final Map<String,Integer> mechIds =
+ new HashMap<String,Integer>();
+
++ private static final Map<String, Long> hashMechIds =
++ new HashMap<String, Long>();
++
+ // key types (CKK_*)
+ private static final Map<Integer,String> keyNames =
+ new HashMap<Integer,String>();
+@@ -94,7 +97,6 @@
+ private static final Map<String,Integer> objectClassIds =
+ new HashMap<String,Integer>();
+
+-
+ /**
+ * For converting numbers to their hex presentation.
+ */
+@@ -444,6 +446,10 @@
+ return getId(objectClassIds, name);
+ }
+
++ public static long getHashMechId(String name) {
++ return hashMechIds.get(name);
++ }
++
+ /**
+ * Check the given arrays for equalitiy. This method considers both arrays as
+ * equal, if both are <code>null</code> or both have the same length and
+@@ -589,6 +595,10 @@
+ addMapping(objectClassNames, objectClassIds, id, name);
+ }
+
++ private static void addHashMech(long id, String name) {
++ hashMechIds.put(name, id);
++ }
++
+ static {
+ addMech(CKM_RSA_PKCS_KEY_PAIR_GEN, "CKM_RSA_PKCS_KEY_PAIR_GEN");
+ addMech(CKM_RSA_PKCS, "CKM_RSA_PKCS");
+@@ -719,6 +729,10 @@
+ addMech(CKM_TLS_PRF, "CKM_TLS_PRF");
+ addMech(CKM_SSL3_MD5_MAC, "CKM_SSL3_MD5_MAC");
+ addMech(CKM_SSL3_SHA1_MAC, "CKM_SSL3_SHA1_MAC");
++ addMech(CKM_TLS12_MASTER_KEY_DERIVE, "CKM_TLS12_MASTER_KEY_DERIVE");
++ addMech(CKM_TLS12_KEY_AND_MAC_DERIVE, "CKM_TLS12_KEY_AND_MAC_DERIVE");
++ addMech(CKM_TLS12_MASTER_KEY_DERIVE_DH, "CKM_TLS12_MASTER_KEY_DERIVE_DH");
++ addMech(CKM_TLS_MAC, "CKM_TLS_MAC");
+ addMech(CKM_MD5_KEY_DERIVATION, "CKM_MD5_KEY_DERIVATION");
+ addMech(CKM_MD2_KEY_DERIVATION, "CKM_MD2_KEY_DERIVATION");
+ addMech(CKM_SHA1_KEY_DERIVATION, "CKM_SHA1_KEY_DERIVATION");
+@@ -794,6 +808,12 @@
+ addMech(PCKM_SECURERANDOM, "SecureRandom");
+ addMech(PCKM_KEYSTORE, "KeyStore");
+
++ addHashMech(CKM_SHA_1, "SHA-1");
++ addHashMech(CKM_SHA224, "SHA-224");
++ addHashMech(CKM_SHA256, "SHA-256");
++ addHashMech(CKM_SHA384, "SHA-384");
++ addHashMech(CKM_SHA512, "SHA-512");
++
+ addKeyType(CKK_RSA, "CKK_RSA");
+ addKeyType(CKK_DSA, "CKK_DSA");
+ addKeyType(CKK_DH, "CKK_DH");
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+
+ /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
+@@ -625,6 +625,14 @@
+ public static final long CKM_PKCS5_PBKD2 = 0x000003B0L;
+
+ public static final long CKM_PBA_SHA1_WITH_SHA1_HMAC = 0x000003C0L;
++
++ /* CKM_TLS12_MASTER_KEY_DERIVE, CKM_TLS12_KEY_AND_MAC_DERIVE,
++ * CKM_TLS12_MASTER_KEY_DERIVE_DH and CKM_TLS_MAC are new for v2.40 */
++ public static final long CKM_TLS12_MASTER_KEY_DERIVE = 0x000003E0L;
++ public static final long CKM_TLS12_KEY_AND_MAC_DERIVE = 0x000003E1L;
++ public static final long CKM_TLS12_MASTER_KEY_DERIVE_DH = 0x000003E2L;
++ public static final long CKM_TLS_MAC = 0x000003E4L;
++
+ public static final long CKM_KEY_WRAP_LYNKS = 0x00000400L;
+ public static final long CKM_KEY_WRAP_SET_OAEP = 0x00000401L;
+
+diff --git openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
+--- openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
++++ openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+
+ /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
+@@ -457,67 +457,113 @@
+ return ckAttribute ;
+ }
+
+-/*
+- * converts the Java CK_SSL3_MASTER_KEY_DERIVE_PARAMS object to a
+- * CK_SSL3_MASTER_KEY_DERIVE_PARAMS structure
+- *
+- * @param env - used to call JNI funktions to get the Java classes and objects
+- * @param jParam - the Java CK_SSL3_MASTER_KEY_DERIVE_PARAMS object to convert
+- * @return - the new CK_SSL3_MASTER_KEY_DERIVE_PARAMS structure
+- */
+-CK_SSL3_MASTER_KEY_DERIVE_PARAMS jSsl3MasterKeyDeriveParamToCKSsl3MasterKeyDeriveParam(JNIEnv *env, jobject jParam)
+-{
+- // XXX don't return structs
+- // XXX prefetch class and field ids
+- jclass jSsl3MasterKeyDeriveParamsClass;
+- CK_SSL3_MASTER_KEY_DERIVE_PARAMS ckParam;
++void masterKeyDeriveParamToCKMasterKeyDeriveParam(JNIEnv *env, jobject jParam,
++ jclass masterKeyDeriveParamClass,
++ CK_VERSION_PTR* cKMasterKeyDeriveParamVersion,
++ CK_SSL3_RANDOM_DATA* cKMasterKeyDeriveParamRandomInfo) {
+ jfieldID fieldID;
+ jclass jSsl3RandomDataClass;
+ jobject jRandomInfo, jRIClientRandom, jRIServerRandom, jVersion;
+- memset(&ckParam, 0, sizeof(CK_SSL3_MASTER_KEY_DERIVE_PARAMS));
+
+ /* get RandomInfo */
+- jSsl3MasterKeyDeriveParamsClass = (*env)->FindClass(env, CLASS_SSL3_MASTER_KEY_DERIVE_PARAMS);
+- if (jSsl3MasterKeyDeriveParamsClass == NULL) { return ckParam; }
+- fieldID = (*env)->GetFieldID(env, jSsl3MasterKeyDeriveParamsClass, "RandomInfo", "Lsun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA;");
+- if (fieldID == NULL) { return ckParam; }
++ fieldID = (*env)->GetFieldID(env, masterKeyDeriveParamClass, "RandomInfo",
++ "Lsun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA;");
++ if (fieldID == NULL) { return; }
+ jRandomInfo = (*env)->GetObjectField(env, jParam, fieldID);
+
+ /* get pClientRandom and ulClientRandomLength out of RandomInfo */
+ jSsl3RandomDataClass = (*env)->FindClass(env, CLASS_SSL3_RANDOM_DATA);
+- if (jSsl3RandomDataClass == NULL) { return ckParam; }
++ if (jSsl3RandomDataClass == NULL) { return; }
+ fieldID = (*env)->GetFieldID(env, jSsl3RandomDataClass, "pClientRandom", "[B");
+- if (fieldID == NULL) { return ckParam; }
++ if (fieldID == NULL) { return; }
+ jRIClientRandom = (*env)->GetObjectField(env, jRandomInfo, fieldID);
+
+ /* get pServerRandom and ulServerRandomLength out of RandomInfo */
+ fieldID = (*env)->GetFieldID(env, jSsl3RandomDataClass, "pServerRandom", "[B");
+- if (fieldID == NULL) { return ckParam; }
++ if (fieldID == NULL) { return; }
+ jRIServerRandom = (*env)->GetObjectField(env, jRandomInfo, fieldID);
+
+ /* get pVersion */
+- fieldID = (*env)->GetFieldID(env, jSsl3MasterKeyDeriveParamsClass, "pVersion", "Lsun/security/pkcs11/wrapper/CK_VERSION;");
+- if (fieldID == NULL) { return ckParam; }
++ fieldID = (*env)->GetFieldID(env, masterKeyDeriveParamClass, "pVersion",
++ "Lsun/security/pkcs11/wrapper/CK_VERSION;");
++ if (fieldID == NULL) { return; }
+ jVersion = (*env)->GetObjectField(env, jParam, fieldID);
+
+ /* populate java values */
+- ckParam.pVersion = jVersionToCKVersionPtr(env, jVersion);
+- if ((*env)->ExceptionCheck(env)) { return ckParam; }
+- jByteArrayToCKByteArray(env, jRIClientRandom, &(ckParam.RandomInfo.pClientRandom), &(ckParam.RandomInfo.ulClientRandomLen));
++ *cKMasterKeyDeriveParamVersion = jVersionToCKVersionPtr(env, jVersion);
++ if ((*env)->ExceptionCheck(env)) { return; }
++ jByteArrayToCKByteArray(env, jRIClientRandom,
++ &(cKMasterKeyDeriveParamRandomInfo->pClientRandom),
++ &(cKMasterKeyDeriveParamRandomInfo->ulClientRandomLen));
+ if ((*env)->ExceptionCheck(env)) {
+- free(ckParam.pVersion);
+- return ckParam;
++ free(*cKMasterKeyDeriveParamVersion);
++ return;
+ }
+- jByteArrayToCKByteArray(env, jRIServerRandom, &(ckParam.RandomInfo.pServerRandom), &(ckParam.RandomInfo.ulServerRandomLen));
++ jByteArrayToCKByteArray(env, jRIServerRandom,
++ &(cKMasterKeyDeriveParamRandomInfo->pServerRandom),
++ &(cKMasterKeyDeriveParamRandomInfo->ulServerRandomLen));
+ if ((*env)->ExceptionCheck(env)) {
+- free(ckParam.pVersion);
+- free(ckParam.RandomInfo.pClientRandom);
+- return ckParam;
++ free(*cKMasterKeyDeriveParamVersion);
++ free(cKMasterKeyDeriveParamRandomInfo->pClientRandom);
++ return;
+ }
+-
+- return ckParam ;
+ }
+
++/*
++ * converts the Java CK_SSL3_MASTER_KEY_DERIVE_PARAMS object to a
++ * CK_SSL3_MASTER_KEY_DERIVE_PARAMS structure
++ *
++ * @param env - used to call JNI functions to get the Java classes and objects
++ * @param jParam - the Java CK_SSL3_MASTER_KEY_DERIVE_PARAMS object to convert
++ * @return - the new CK_SSL3_MASTER_KEY_DERIVE_PARAMS structure
++ */
++CK_SSL3_MASTER_KEY_DERIVE_PARAMS
++jSsl3MasterKeyDeriveParamToCKSsl3MasterKeyDeriveParam(JNIEnv *env,
++ jobject jParam)
++{
++ CK_SSL3_MASTER_KEY_DERIVE_PARAMS ckParam;
++ jclass jSsl3MasterKeyDeriveParamsClass;
++ memset(&ckParam, 0, sizeof(CK_SSL3_MASTER_KEY_DERIVE_PARAMS));
++ jSsl3MasterKeyDeriveParamsClass =
++ (*env)->FindClass(env, CLASS_SSL3_MASTER_KEY_DERIVE_PARAMS);
++ if (jSsl3MasterKeyDeriveParamsClass == NULL) { return ckParam; }
++ masterKeyDeriveParamToCKMasterKeyDeriveParam(env, jParam,
++ jSsl3MasterKeyDeriveParamsClass,
++ &ckParam.pVersion, &ckParam.RandomInfo);
++ return ckParam;
++}
++
++/*
++ * converts the Java CK_TLS12_MASTER_KEY_DERIVE_PARAMS object to a
++ * CK_TLS12_MASTER_KEY_DERIVE_PARAMS structure
++ *
++ * @param env - used to call JNI functions to get the Java classes and objects
++ * @param jParam - the Java CK_TLS12_MASTER_KEY_DERIVE_PARAMS object to convert
++ * @return - the new CK_TLS12_MASTER_KEY_DERIVE_PARAMS structure
++ */
++CK_TLS12_MASTER_KEY_DERIVE_PARAMS
++jTls12MasterKeyDeriveParamToCKTls12MasterKeyDeriveParam(JNIEnv *env,
++ jobject jParam)
++{
++ CK_TLS12_MASTER_KEY_DERIVE_PARAMS ckParam;
++ jclass jTls12MasterKeyDeriveParamsClass;
++ jfieldID fieldID;
++ memset(&ckParam, 0, sizeof(CK_TLS12_MASTER_KEY_DERIVE_PARAMS));
++ jTls12MasterKeyDeriveParamsClass =
++ (*env)->FindClass(env, CLASS_TLS12_MASTER_KEY_DERIVE_PARAMS);
++ if (jTls12MasterKeyDeriveParamsClass == NULL) { return ckParam; }
++ masterKeyDeriveParamToCKMasterKeyDeriveParam(env, jParam,
++ jTls12MasterKeyDeriveParamsClass, &ckParam.pVersion,
++ &ckParam.RandomInfo);
++ fieldID = (*env)->GetFieldID(env,
++ jTls12MasterKeyDeriveParamsClass, "prfHashMechanism", "J");
++ if (fieldID != NULL) {
++ jlong prfHashMechanism =
++ (*env)->GetLongField(env, jParam, fieldID);
++ ckParam.prfHashMechanism = (CK_MECHANISM_TYPE)prfHashMechanism;
++ }
++ return ckParam;
++}
+
+ /*
+ * converts the Java CK_TLS_PRF_PARAMS object to a CK_TLS_PRF_PARAMS structure
+@@ -576,126 +622,220 @@
+ }
+
+ /*
+- * converts the Java CK_SSL3_KEY_MAT_PARAMS object to a CK_SSL3_KEY_MAT_PARAMS structure
+- *
+- * @param env - used to call JNI funktions to get the Java classes and objects
+- * @param jParam - the Java CK_SSL3_KEY_MAT_PARAMS object to convert
+- * @return - the new CK_SSL3_KEY_MAT_PARAMS structure
++ * converts the Java CK_TLS_MAC_PARAMS object to a CK_TLS_MAC_PARAMS structure
+ */
+-CK_SSL3_KEY_MAT_PARAMS jSsl3KeyMatParamToCKSsl3KeyMatParam(JNIEnv *env, jobject jParam)
++CK_TLS_MAC_PARAMS jTlsMacParamsToCKTlsMacParam(JNIEnv *env, jobject jParam)
+ {
+- // XXX don't return structs
+- // XXX prefetch class and field ids
+- jclass jSsl3KeyMatParamsClass, jSsl3RandomDataClass, jSsl3KeyMatOutClass;
+- CK_SSL3_KEY_MAT_PARAMS ckParam;
++ jclass jTlsMacParamsClass;
++ CK_TLS_MAC_PARAMS ckParam;
++ jfieldID fieldID;
++ jlong jPrfMechanism, jUlMacLength, jUlServerOrClient;
++ memset(&ckParam, 0, sizeof(CK_TLS_MAC_PARAMS));
++
++ jTlsMacParamsClass = (*env)->FindClass(env, CLASS_TLS_MAC_PARAMS);
++ if (jTlsMacParamsClass == NULL) { return ckParam; }
++
++ /* get prfMechanism */
++ fieldID = (*env)->GetFieldID(env, jTlsMacParamsClass, "prfMechanism", "J");
++ if (fieldID == NULL) { return ckParam; }
++ jPrfMechanism = (*env)->GetLongField(env, jParam, fieldID);
++
++ /* get ulMacLength */
++ fieldID = (*env)->GetFieldID(env, jTlsMacParamsClass, "ulMacLength", "J");
++ if (fieldID == NULL) { return ckParam; }
++ jUlMacLength = (*env)->GetLongField(env, jParam, fieldID);
++
++ /* get ulServerOrClient */
++ fieldID = (*env)->GetFieldID(env, jTlsMacParamsClass, "ulServerOrClient", "J");
++ if (fieldID == NULL) { return ckParam; }
++ jUlServerOrClient = (*env)->GetLongField(env, jParam, fieldID);
++
++ /* populate java values */
++ ckParam.prfMechanism = jLongToCKULong(jPrfMechanism);
++ ckParam.ulMacLength = jLongToCKULong(jUlMacLength);
++ ckParam.ulServerOrClient = jLongToCKULong(jUlServerOrClient);
++
++ return ckParam;
++}
++
++void keyMatParamToCKKeyMatParam(JNIEnv *env, jobject jParam,
++ jclass jKeyMatParamClass,
++ CK_ULONG* cKKeyMatParamUlMacSizeInBits,
++ CK_ULONG* cKKeyMatParamUlKeySizeInBits,
++ CK_ULONG* cKKeyMatParamUlIVSizeInBits,
++ CK_BBOOL* cKKeyMatParamBIsExport,
++ CK_SSL3_RANDOM_DATA* cKKeyMatParamRandomInfo,
++ CK_SSL3_KEY_MAT_OUT_PTR* cKKeyMatParamPReturnedKeyMaterial)
++{
++ jclass jSsl3RandomDataClass, jSsl3KeyMatOutClass;
+ jfieldID fieldID;
+ jlong jMacSizeInBits, jKeySizeInBits, jIVSizeInBits;
+ jboolean jIsExport;
+ jobject jRandomInfo, jRIClientRandom, jRIServerRandom;
+ jobject jReturnedKeyMaterial, jRMIvClient, jRMIvServer;
+ CK_ULONG ckTemp;
+- memset(&ckParam, 0, sizeof(CK_SSL3_KEY_MAT_PARAMS));
+
+ /* get ulMacSizeInBits */
+- jSsl3KeyMatParamsClass = (*env)->FindClass(env, CLASS_SSL3_KEY_MAT_PARAMS);
+- if (jSsl3KeyMatParamsClass == NULL) { return ckParam; }
+- fieldID = (*env)->GetFieldID(env, jSsl3KeyMatParamsClass, "ulMacSizeInBits", "J");
+- if (fieldID == NULL) { return ckParam; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamClass, "ulMacSizeInBits", "J");
++ if (fieldID == NULL) { return; }
+ jMacSizeInBits = (*env)->GetLongField(env, jParam, fieldID);
+
+ /* get ulKeySizeInBits */
+- fieldID = (*env)->GetFieldID(env, jSsl3KeyMatParamsClass, "ulKeySizeInBits", "J");
+- if (fieldID == NULL) { return ckParam; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamClass, "ulKeySizeInBits", "J");
++ if (fieldID == NULL) { return; }
+ jKeySizeInBits = (*env)->GetLongField(env, jParam, fieldID);
+
+ /* get ulIVSizeInBits */
+- fieldID = (*env)->GetFieldID(env, jSsl3KeyMatParamsClass, "ulIVSizeInBits", "J");
+- if (fieldID == NULL) { return ckParam; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamClass, "ulIVSizeInBits", "J");
++ if (fieldID == NULL) { return; }
+ jIVSizeInBits = (*env)->GetLongField(env, jParam, fieldID);
+
+ /* get bIsExport */
+- fieldID = (*env)->GetFieldID(env, jSsl3KeyMatParamsClass, "bIsExport", "Z");
+- if (fieldID == NULL) { return ckParam; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamClass, "bIsExport", "Z");
++ if (fieldID == NULL) { return; }
+ jIsExport = (*env)->GetBooleanField(env, jParam, fieldID);
+
+ /* get RandomInfo */
+ jSsl3RandomDataClass = (*env)->FindClass(env, CLASS_SSL3_RANDOM_DATA);
+- if (jSsl3RandomDataClass == NULL) { return ckParam; }
+- fieldID = (*env)->GetFieldID(env, jSsl3KeyMatParamsClass, "RandomInfo", "Lsun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA;");
+- if (fieldID == NULL) { return ckParam; }
++ if (jSsl3RandomDataClass == NULL) { return; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamClass, "RandomInfo",
++ "Lsun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA;");
++ if (fieldID == NULL) { return; }
+ jRandomInfo = (*env)->GetObjectField(env, jParam, fieldID);
+
+ /* get pClientRandom and ulClientRandomLength out of RandomInfo */
+ fieldID = (*env)->GetFieldID(env, jSsl3RandomDataClass, "pClientRandom", "[B");
+- if (fieldID == NULL) { return ckParam; }
++ if (fieldID == NULL) { return; }
+ jRIClientRandom = (*env)->GetObjectField(env, jRandomInfo, fieldID);
+
+ /* get pServerRandom and ulServerRandomLength out of RandomInfo */
+ fieldID = (*env)->GetFieldID(env, jSsl3RandomDataClass, "pServerRandom", "[B");
+- if (fieldID == NULL) { return ckParam; }
++ if (fieldID == NULL) { return; }
+ jRIServerRandom = (*env)->GetObjectField(env, jRandomInfo, fieldID);
+
+ /* get pReturnedKeyMaterial */
+ jSsl3KeyMatOutClass = (*env)->FindClass(env, CLASS_SSL3_KEY_MAT_OUT);
+- if (jSsl3KeyMatOutClass == NULL) { return ckParam; }
+- fieldID = (*env)->GetFieldID(env, jSsl3KeyMatParamsClass, "pReturnedKeyMaterial", "Lsun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT;");
+- if (fieldID == NULL) { return ckParam; }
++ if (jSsl3KeyMatOutClass == NULL) { return; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamClass, "pReturnedKeyMaterial",
++ "Lsun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT;");
++ if (fieldID == NULL) { return; }
+ jReturnedKeyMaterial = (*env)->GetObjectField(env, jParam, fieldID);
+
+ /* get pIVClient out of pReturnedKeyMaterial */
+ fieldID = (*env)->GetFieldID(env, jSsl3KeyMatOutClass, "pIVClient", "[B");
+- if (fieldID == NULL) { return ckParam; }
++ if (fieldID == NULL) { return; }
+ jRMIvClient = (*env)->GetObjectField(env, jReturnedKeyMaterial, fieldID);
+
+ /* get pIVServer out of pReturnedKeyMaterial */
+ fieldID = (*env)->GetFieldID(env, jSsl3KeyMatOutClass, "pIVServer", "[B");
+- if (fieldID == NULL) { return ckParam; }
++ if (fieldID == NULL) { return; }
+ jRMIvServer = (*env)->GetObjectField(env, jReturnedKeyMaterial, fieldID);
+
+ /* populate java values */
+- ckParam.ulMacSizeInBits = jLongToCKULong(jMacSizeInBits);
+- ckParam.ulKeySizeInBits = jLongToCKULong(jKeySizeInBits);
+- ckParam.ulIVSizeInBits = jLongToCKULong(jIVSizeInBits);
+- ckParam.bIsExport = jBooleanToCKBBool(jIsExport);
+- jByteArrayToCKByteArray(env, jRIClientRandom, &(ckParam.RandomInfo.pClientRandom), &(ckParam.RandomInfo.ulClientRandomLen));
+- if ((*env)->ExceptionCheck(env)) { return ckParam; }
+- jByteArrayToCKByteArray(env, jRIServerRandom, &(ckParam.RandomInfo.pServerRandom), &(ckParam.RandomInfo.ulServerRandomLen));
++ *cKKeyMatParamUlMacSizeInBits = jLongToCKULong(jMacSizeInBits);
++ *cKKeyMatParamUlKeySizeInBits = jLongToCKULong(jKeySizeInBits);
++ *cKKeyMatParamUlIVSizeInBits = jLongToCKULong(jIVSizeInBits);
++ *cKKeyMatParamBIsExport = jBooleanToCKBBool(jIsExport);
++ jByteArrayToCKByteArray(env, jRIClientRandom,
++ &(cKKeyMatParamRandomInfo->pClientRandom),
++ &(cKKeyMatParamRandomInfo->ulClientRandomLen));
++ if ((*env)->ExceptionCheck(env)) { return; }
++ jByteArrayToCKByteArray(env, jRIServerRandom,
++ &(cKKeyMatParamRandomInfo->pServerRandom),
++ &(cKKeyMatParamRandomInfo->ulServerRandomLen));
+ if ((*env)->ExceptionCheck(env)) {
+- free(ckParam.RandomInfo.pClientRandom);
+- return ckParam;
++ free(cKKeyMatParamRandomInfo->pClientRandom);
++ return;
+ }
+ /* allocate memory for pRetrunedKeyMaterial */
+- ckParam.pReturnedKeyMaterial = (CK_SSL3_KEY_MAT_OUT_PTR) malloc(sizeof(CK_SSL3_KEY_MAT_OUT));
+- if (ckParam.pReturnedKeyMaterial == NULL) {
+- free(ckParam.RandomInfo.pClientRandom);
+- free(ckParam.RandomInfo.pServerRandom);
++ *cKKeyMatParamPReturnedKeyMaterial =
++ (CK_SSL3_KEY_MAT_OUT_PTR)malloc(sizeof(CK_SSL3_KEY_MAT_OUT));
++ if (*cKKeyMatParamPReturnedKeyMaterial == NULL) {
++ free(cKKeyMatParamRandomInfo->pClientRandom);
++ free(cKKeyMatParamRandomInfo->pServerRandom);
+ throwOutOfMemoryError(env, 0);
+- return ckParam;
++ return;
+ }
+
+ // the handles are output params only, no need to fetch them from Java
+- ckParam.pReturnedKeyMaterial->hClientMacSecret = 0;
+- ckParam.pReturnedKeyMaterial->hServerMacSecret = 0;
+- ckParam.pReturnedKeyMaterial->hClientKey = 0;
+- ckParam.pReturnedKeyMaterial->hServerKey = 0;
++ (*cKKeyMatParamPReturnedKeyMaterial)->hClientMacSecret = 0;
++ (*cKKeyMatParamPReturnedKeyMaterial)->hServerMacSecret = 0;
++ (*cKKeyMatParamPReturnedKeyMaterial)->hClientKey = 0;
++ (*cKKeyMatParamPReturnedKeyMaterial)->hServerKey = 0;
+
+- jByteArrayToCKByteArray(env, jRMIvClient, &(ckParam.pReturnedKeyMaterial->pIVClient), &ckTemp);
++ jByteArrayToCKByteArray(env, jRMIvClient,
++ &((*cKKeyMatParamPReturnedKeyMaterial)->pIVClient), &ckTemp);
+ if ((*env)->ExceptionCheck(env)) {
+- free(ckParam.RandomInfo.pClientRandom);
+- free(ckParam.RandomInfo.pServerRandom);
+- free(ckParam.pReturnedKeyMaterial);
+- return ckParam;
++ free(cKKeyMatParamRandomInfo->pClientRandom);
++ free(cKKeyMatParamRandomInfo->pServerRandom);
++ free((*cKKeyMatParamPReturnedKeyMaterial));
++ return;
+ }
+- jByteArrayToCKByteArray(env, jRMIvServer, &(ckParam.pReturnedKeyMaterial->pIVServer), &ckTemp);
++ jByteArrayToCKByteArray(env, jRMIvServer,
++ &((*cKKeyMatParamPReturnedKeyMaterial)->pIVServer), &ckTemp);
+ if ((*env)->ExceptionCheck(env)) {
+- free(ckParam.RandomInfo.pClientRandom);
+- free(ckParam.RandomInfo.pServerRandom);
+- free(ckParam.pReturnedKeyMaterial->pIVClient);
+- free(ckParam.pReturnedKeyMaterial);
+- return ckParam;
++ free(cKKeyMatParamRandomInfo->pClientRandom);
++ free(cKKeyMatParamRandomInfo->pServerRandom);
++ free((*cKKeyMatParamPReturnedKeyMaterial)->pIVClient);
++ free((*cKKeyMatParamPReturnedKeyMaterial));
++ return;
+ }
+
+- return ckParam ;
++ return;
++}
++/*
++ * converts the Java CK_SSL3_KEY_MAT_PARAMS object to a
++ * CK_SSL3_KEY_MAT_PARAMS structure
++ *
++ * @param env - used to call JNI funktions to get the Java classes and objects
++ * @param jParam - the Java CK_SSL3_KEY_MAT_PARAMS object to convert
++ * @return - the new CK_SSL3_KEY_MAT_PARAMS structure
++ */
++CK_SSL3_KEY_MAT_PARAMS
++jSsl3KeyMatParamToCKSsl3KeyMatParam(JNIEnv *env, jobject jParam)
++{
++ CK_SSL3_KEY_MAT_PARAMS ckParam;
++ jclass jSsl3KeyMatParamsClass;
++ memset(&ckParam, 0, sizeof(CK_SSL3_KEY_MAT_PARAMS));
++ jSsl3KeyMatParamsClass = (*env)->FindClass(env,
++ CLASS_SSL3_KEY_MAT_PARAMS);
++ if (jSsl3KeyMatParamsClass == NULL) { return ckParam; }
++ keyMatParamToCKKeyMatParam(env, jParam, jSsl3KeyMatParamsClass,
++ &ckParam.ulMacSizeInBits, &ckParam.ulKeySizeInBits,
++ &ckParam.ulIVSizeInBits, &ckParam.bIsExport,
++ &ckParam.RandomInfo, &ckParam.pReturnedKeyMaterial);
++ return ckParam;
++}
++
++/*
++ * converts the Java CK_TLS12_KEY_MAT_PARAMS object to a
++ * CK_TLS12_KEY_MAT_PARAMS structure
++ *
++ * @param env - used to call JNI functions to get the Java classes and objects
++ * @param jParam - the Java CK_TLS12_KEY_MAT_PARAMS object to convert
++ * @return - the new CK_TLS12_KEY_MAT_PARAMS structure
++ */
++CK_TLS12_KEY_MAT_PARAMS jTls12KeyMatParamToCKTls12KeyMatParam(JNIEnv *env,
++ jobject jParam)
++{
++ CK_TLS12_KEY_MAT_PARAMS ckParam;
++ jclass jTls12KeyMatParamsClass;
++ jfieldID fieldID;
++ memset(&ckParam, 0, sizeof(CK_TLS12_KEY_MAT_PARAMS));
++ jTls12KeyMatParamsClass = (*env)->FindClass(env,
++ CLASS_TLS12_KEY_MAT_PARAMS);
++ if (jTls12KeyMatParamsClass == NULL) { return ckParam; }
++ keyMatParamToCKKeyMatParam(env, jParam, jTls12KeyMatParamsClass,
++ &ckParam.ulMacSizeInBits, &ckParam.ulKeySizeInBits,
++ &ckParam.ulIVSizeInBits, &ckParam.bIsExport,
++ &ckParam.RandomInfo, &ckParam.pReturnedKeyMaterial);
++ fieldID = (*env)->GetFieldID(env, jTls12KeyMatParamsClass,
++ "prfHashMechanism", "J");
++ if (fieldID != NULL) {
++ jlong prfHashMechanism = (*env)->GetLongField(env, jParam, fieldID);
++ ckParam.prfHashMechanism = (CK_MECHANISM_TYPE)prfHashMechanism;
++ }
++ return ckParam;
+ }
+
+ /*
+@@ -980,8 +1120,11 @@
+ void jMechanismParameterToCKMechanismParameterSlow(JNIEnv *env, jobject jParam, CK_VOID_PTR *ckpParamPtr, CK_ULONG *ckpLength)
+ {
+ /* get all Java mechanism parameter classes */
+- jclass jVersionClass, jSsl3MasterKeyDeriveParamsClass, jSsl3KeyMatParamsClass;
+- jclass jTlsPrfParamsClass, jAesCtrParamsClass, jRsaPkcsOaepParamsClass;
++ jclass jVersionClass, jSsl3MasterKeyDeriveParamsClass;
++ jclass jTls12MasterKeyDeriveParamsClass, jSsl3KeyMatParamsClass;
++ jclass jTls12KeyMatParamsClass;
++ jclass jTlsPrfParamsClass, jTlsMacParamsClass, jAesCtrParamsClass;
++ jclass jRsaPkcsOaepParamsClass;
+ jclass jPbeParamsClass, jPkcs5Pbkd2ParamsClass, jRsaPkcsPssParamsClass;
+ jclass jEcdh1DeriveParamsClass, jEcdh2DeriveParamsClass;
+ jclass jX942Dh1DeriveParamsClass, jX942Dh2DeriveParamsClass;
+@@ -1061,6 +1204,62 @@
+ return;
+ }
+
++ jTls12KeyMatParamsClass = (*env)->FindClass(env, CLASS_TLS12_KEY_MAT_PARAMS);
++ if (jTls12KeyMatParamsClass == NULL) { return; }
++ if ((*env)->IsInstanceOf(env, jParam, jTls12KeyMatParamsClass)) {
++ /*
++ * CK_TLS12_KEY_MAT_PARAMS
++ */
++ CK_TLS12_KEY_MAT_PARAMS_PTR ckpParam;
++
++ ckpParam = (CK_TLS12_KEY_MAT_PARAMS_PTR) malloc(sizeof(CK_TLS12_KEY_MAT_PARAMS));
++ if (ckpParam == NULL) {
++ throwOutOfMemoryError(env, 0);
++ return;
++ }
++
++ /* convert jParameter to CKParameter */
++ *ckpParam = jTls12KeyMatParamToCKTls12KeyMatParam(env, jParam);
++ if ((*env)->ExceptionCheck(env)) {
++ free(ckpParam);
++ return;
++ }
++
++ /* get length and pointer of parameter */
++ *ckpLength = sizeof(CK_TLS12_KEY_MAT_PARAMS);
++ *ckpParamPtr = ckpParam;
++ return;
++ }
++
++ jTls12MasterKeyDeriveParamsClass =
++ (*env)->FindClass(env, CLASS_TLS12_MASTER_KEY_DERIVE_PARAMS);
++ if (jTls12MasterKeyDeriveParamsClass == NULL) { return; }
++ if ((*env)->IsInstanceOf(env, jParam, jTls12MasterKeyDeriveParamsClass)) {
++ /*
++ * CK_TLS12_MASTER_KEY_DERIVE_PARAMS
++ */
++ CK_TLS12_MASTER_KEY_DERIVE_PARAMS_PTR ckpParam;
++
++ ckpParam = (CK_TLS12_MASTER_KEY_DERIVE_PARAMS_PTR)malloc(
++ sizeof(CK_TLS12_MASTER_KEY_DERIVE_PARAMS));
++ if (ckpParam == NULL) {
++ throwOutOfMemoryError(env, 0);
++ return;
++ }
++
++ /* convert jParameter to CKParameter */
++ *ckpParam = jTls12MasterKeyDeriveParamToCKTls12MasterKeyDeriveParam(env, jParam);
++ if ((*env)->ExceptionCheck(env)) {
++ free(ckpParam);
++ return;
++ }
++
++ /* get length and pointer of parameter */
++ *ckpLength = sizeof(CK_TLS12_MASTER_KEY_DERIVE_PARAMS);
++ *ckpParamPtr = ckpParam;
++ return;
++ }
++
+ jTlsPrfParamsClass = (*env)->FindClass(env, CLASS_TLS_PRF_PARAMS);
+ if (jTlsPrfParamsClass == NULL) { return; }
+ if ((*env)->IsInstanceOf(env, jParam, jTlsPrfParamsClass)) {
+@@ -1088,6 +1287,30 @@
+ return;
+ }
+
++ jTlsMacParamsClass = (*env)->FindClass(env, CLASS_TLS_MAC_PARAMS);
++ if (jTlsMacParamsClass == NULL) { return; }
++ if ((*env)->IsInstanceOf(env, jParam, jTlsMacParamsClass)) {
++ CK_TLS_MAC_PARAMS_PTR ckpParam;
++
++ ckpParam = (CK_TLS_MAC_PARAMS_PTR) malloc(sizeof(CK_TLS_MAC_PARAMS));
++ if (ckpParam == NULL) {
++ throwOutOfMemoryError(env, 0);
++ return;
++ }
++
++ /* convert jParameter to CKParameter */
++ *ckpParam = jTlsMacParamsToCKTlsMacParam(env, jParam);
++ if ((*env)->ExceptionCheck(env)) {
++ free(ckpParam);
++ return;
++ }
++
++ /* get length and pointer of parameter */
++ *ckpLength = sizeof(CK_TLS_MAC_PARAMS);
++ *ckpParamPtr = ckpParam;
++ return;
++ }
++
+ jAesCtrParamsClass = (*env)->FindClass(env, CLASS_AES_CTR_PARAMS);
+ if (jAesCtrParamsClass == NULL) { return; }
+ if ((*env)->IsInstanceOf(env, jParam, jAesCtrParamsClass)) {
+diff --git openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
+--- openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
++++ openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+
+ /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
+@@ -355,25 +355,38 @@
+
+ #ifdef P11_ENABLE_C_DERIVEKEY
+
+-void freeMasterKeyDeriveParams(CK_MECHANISM_PTR ckMechanism) {
++static void freeMasterKeyDeriveParams(CK_SSL3_RANDOM_DATA *RandomInfo, CK_VERSION_PTR pVersion) {
++ if (RandomInfo->pClientRandom != NULL) {
++ free(RandomInfo->pClientRandom);
++ }
++ if (RandomInfo->pServerRandom != NULL) {
++ free(RandomInfo->pServerRandom);
++ }
++ if (pVersion != NULL) {
++ free(pVersion);
++ }
++}
++
++void ssl3FreeMasterKeyDeriveParams(CK_MECHANISM_PTR ckMechanism) {
+ CK_SSL3_MASTER_KEY_DERIVE_PARAMS *params = (CK_SSL3_MASTER_KEY_DERIVE_PARAMS *) ckMechanism->pParameter;
+ if (params == NULL) {
+ return;
+ }
++ freeMasterKeyDeriveParams(&(params->RandomInfo), params->pVersion);
++}
+
+- if (params->RandomInfo.pClientRandom != NULL) {
+- free(params->RandomInfo.pClientRandom);
++void tls12FreeMasterKeyDeriveParams(CK_MECHANISM_PTR ckMechanism) {
++ CK_TLS12_MASTER_KEY_DERIVE_PARAMS *params =
++ (CK_TLS12_MASTER_KEY_DERIVE_PARAMS *)ckMechanism->pParameter;
++ if (params == NULL) {
++ return;
+ }
+- if (params->RandomInfo.pServerRandom != NULL) {
+- free(params->RandomInfo.pServerRandom);
+- }
+- if (params->pVersion != NULL) {
+- free(params->pVersion);
+- }
++ freeMasterKeyDeriveParams(&(params->RandomInfo), params->pVersion);
+ }
+
+ void freeEcdh1DeriveParams(CK_MECHANISM_PTR ckMechanism) {
+- CK_ECDH1_DERIVE_PARAMS *params = (CK_ECDH1_DERIVE_PARAMS *) ckMechanism->pParameter;
++ CK_ECDH1_DERIVE_PARAMS *params =
++ (CK_ECDH1_DERIVE_PARAMS *)ckMechanism->pParameter;
+ if (params == NULL) {
+ return;
+ }
+@@ -498,6 +511,7 @@
+ switch (ckMechanism.mechanism) {
+ case CKM_SSL3_KEY_AND_MAC_DERIVE:
+ case CKM_TLS_KEY_AND_MAC_DERIVE:
++ case CKM_TLS12_KEY_AND_MAC_DERIVE:
+ case CKM_TLS_PRF:
+ // these mechanism do not return a key handle via phKey
+ // set to NULL in case pedantic implementations check for it
+@@ -519,17 +533,28 @@
+ case CKM_SSL3_MASTER_KEY_DERIVE:
+ case CKM_TLS_MASTER_KEY_DERIVE:
+ /* we must copy back the client version */
+- copyBackClientVersion(env, &ckMechanism, jMechanism);
+- freeMasterKeyDeriveParams(&ckMechanism);
++ ssl3CopyBackClientVersion(env, &ckMechanism, jMechanism);
++ ssl3FreeMasterKeyDeriveParams(&ckMechanism);
++ break;
++ case CKM_TLS12_MASTER_KEY_DERIVE:
++ tls12CopyBackClientVersion(env, &ckMechanism, jMechanism);
++ tls12FreeMasterKeyDeriveParams(&ckMechanism);
+ break;
+ case CKM_SSL3_MASTER_KEY_DERIVE_DH:
+ case CKM_TLS_MASTER_KEY_DERIVE_DH:
+- freeMasterKeyDeriveParams(&ckMechanism);
++ ssl3FreeMasterKeyDeriveParams(&ckMechanism);
++ break;
++ case CKM_TLS12_MASTER_KEY_DERIVE_DH:
++ tls12FreeMasterKeyDeriveParams(&ckMechanism);
+ break;
+ case CKM_SSL3_KEY_AND_MAC_DERIVE:
+ case CKM_TLS_KEY_AND_MAC_DERIVE:
+ /* we must copy back the unwrapped key info to the jMechanism object */
+- copyBackSSLKeyMatParams(env, &ckMechanism, jMechanism);
++ ssl3CopyBackKeyMatParams(env, &ckMechanism, jMechanism);
++ break;
++ case CKM_TLS12_KEY_AND_MAC_DERIVE:
++ /* we must copy back the unwrapped key info to the jMechanism object */
++ tls12CopyBackKeyMatParams(env, &ckMechanism, jMechanism);
+ break;
+ case CKM_TLS_PRF:
+ copyBackTLSPrfParams(env, &ckMechanism, jMechanism);
+@@ -550,53 +575,42 @@
+ return jKeyHandle ;
+ }
+
+-/*
+- * Copy back the client version information from the native
+- * structure to the Java object. This is only used for the
+- * CKM_SSL3_MASTER_KEY_DERIVE mechanism when used for deriving a key.
+- *
+- */
+-void copyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism)
++static void copyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism,
++ CK_VERSION *ckVersion, const char *class_master_key_derive_params)
+ {
+- jclass jMechanismClass, jSSL3MasterKeyDeriveParamsClass, jVersionClass;
+- CK_SSL3_MASTER_KEY_DERIVE_PARAMS *ckSSL3MasterKeyDeriveParams;
+- CK_VERSION *ckVersion;
+- jfieldID fieldID;
+- CK_MECHANISM_TYPE ckMechanismType;
+- jlong jMechanismType;
+- jobject jSSL3MasterKeyDeriveParams;
+- jobject jVersion;
++ jclass jMasterKeyDeriveParamsClass, jMechanismClass, jVersionClass;
++ jobject jMasterKeyDeriveParams;
++ jfieldID fieldID;
++ CK_MECHANISM_TYPE ckMechanismType;
++ jlong jMechanismType;
++ jobject jVersion;
+
+- /* get mechanism */
+- jMechanismClass = (*env)->FindClass(env, CLASS_MECHANISM);
+- if (jMechanismClass == NULL) { return; }
+- fieldID = (*env)->GetFieldID(env, jMechanismClass, "mechanism", "J");
+- if (fieldID == NULL) { return; }
+- jMechanismType = (*env)->GetLongField(env, jMechanism, fieldID);
+- ckMechanismType = jLongToCKULong(jMechanismType);
+- if (ckMechanismType != ckMechanism->mechanism) {
+- /* we do not have maching types, this should not occur */
+- return;
+- }
++ /* get mechanism */
++ jMechanismClass = (*env)->FindClass(env, CLASS_MECHANISM);
++ if (jMechanismClass == NULL) { return; }
++ fieldID = (*env)->GetFieldID(env, jMechanismClass, "mechanism", "J");
++ if (fieldID == NULL) { return; }
++ jMechanismType = (*env)->GetLongField(env, jMechanism, fieldID);
++ ckMechanismType = jLongToCKULong(jMechanismType);
++ if (ckMechanismType != ckMechanism->mechanism) {
++ /* we do not have maching types, this should not occur */
++ return;
++ }
+
+- /* get the native CK_SSL3_MASTER_KEY_DERIVE_PARAMS */
+- ckSSL3MasterKeyDeriveParams = (CK_SSL3_MASTER_KEY_DERIVE_PARAMS *) ckMechanism->pParameter;
+- if (ckSSL3MasterKeyDeriveParams != NULL_PTR) {
+- /* get the native CK_VERSION */
+- ckVersion = ckSSL3MasterKeyDeriveParams->pVersion;
+ if (ckVersion != NULL_PTR) {
+ /* get the Java CK_SSL3_MASTER_KEY_DERIVE_PARAMS (pParameter) */
+ fieldID = (*env)->GetFieldID(env, jMechanismClass, "pParameter", "Ljava/lang/Object;");
+ if (fieldID == NULL) { return; }
+
+- jSSL3MasterKeyDeriveParams = (*env)->GetObjectField(env, jMechanism, fieldID);
++ jMasterKeyDeriveParams = (*env)->GetObjectField(env, jMechanism, fieldID);
+
+ /* get the Java CK_VERSION */
+- jSSL3MasterKeyDeriveParamsClass = (*env)->FindClass(env, CLASS_SSL3_MASTER_KEY_DERIVE_PARAMS);
+- if (jSSL3MasterKeyDeriveParamsClass == NULL) { return; }
+- fieldID = (*env)->GetFieldID(env, jSSL3MasterKeyDeriveParamsClass, "pVersion", "L"CLASS_VERSION";");
++ jMasterKeyDeriveParamsClass = (*env)->FindClass(env, class_master_key_derive_params);
++ if (jMasterKeyDeriveParamsClass == NULL) { return; }
++ fieldID = (*env)->GetFieldID(env, jMasterKeyDeriveParamsClass,
++ "pVersion", "L"CLASS_VERSION";");
+ if (fieldID == NULL) { return; }
+- jVersion = (*env)->GetObjectField(env, jSSL3MasterKeyDeriveParams, fieldID);
++ jVersion = (*env)->GetObjectField(env, jMasterKeyDeriveParams, fieldID);
+
+ /* now copy back the version from the native structure to the Java structure */
+
+@@ -612,92 +626,126 @@
+ if (fieldID == NULL) { return; }
+ (*env)->SetByteField(env, jVersion, fieldID, ckByteToJByte(ckVersion->minor));
+ }
+- }
+ }
+
++/*
++ * Copy back the client version information from the native
++ * structure to the Java object. This is only used for
++ * CKM_SSL3_MASTER_KEY_DERIVE and CKM_TLS_MASTER_KEY_DERIVE
++ * mechanisms when used for deriving a key.
++ *
++ */
++void ssl3CopyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism,
++ jobject jMechanism)
++{
++ CK_SSL3_MASTER_KEY_DERIVE_PARAMS *ckSSL3MasterKeyDeriveParams;
++ ckSSL3MasterKeyDeriveParams =
++ (CK_SSL3_MASTER_KEY_DERIVE_PARAMS *)ckMechanism->pParameter;
++ if (ckSSL3MasterKeyDeriveParams != NULL_PTR) {
++ copyBackClientVersion(env, ckMechanism, jMechanism,
++ ckSSL3MasterKeyDeriveParams->pVersion,
++ CLASS_SSL3_MASTER_KEY_DERIVE_PARAMS);
++ }
++}
+
+ /*
+- * Copy back the derived keys and initialization vectors from the native
+- * structure to the Java object. This is only used for the
+- * CKM_SSL3_KEY_AND_MAC_DERIVE mechanism when used for deriving a key.
++ * Copy back the client version information from the native
++ * structure to the Java object. This is only used for
++ * CKM_TLS12_MASTER_KEY_DERIVE mechanism when used for deriving a key.
+ *
+ */
+-void copyBackSSLKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism)
++void tls12CopyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism,
++ jobject jMechanism)
+ {
+- jclass jMechanismClass, jSSL3KeyMatParamsClass, jSSL3KeyMatOutClass;
+- CK_SSL3_KEY_MAT_PARAMS *ckSSL3KeyMatParam;
+- CK_SSL3_KEY_MAT_OUT *ckSSL3KeyMatOut;
+- jfieldID fieldID;
+- CK_MECHANISM_TYPE ckMechanismType;
+- jlong jMechanismType;
+- CK_BYTE_PTR iv;
+- jobject jSSL3KeyMatParam;
+- jobject jSSL3KeyMatOut;
+- jobject jIV;
+- jint jLength;
+- jbyte* jBytes;
+- int i;
++ CK_TLS12_MASTER_KEY_DERIVE_PARAMS *ckTLS12MasterKeyDeriveParams;
++ ckTLS12MasterKeyDeriveParams =
++ (CK_TLS12_MASTER_KEY_DERIVE_PARAMS *)ckMechanism->pParameter;
++ if (ckTLS12MasterKeyDeriveParams != NULL_PTR) {
++ copyBackClientVersion(env, ckMechanism, jMechanism,
++ ckTLS12MasterKeyDeriveParams->pVersion,
++ CLASS_TLS12_MASTER_KEY_DERIVE_PARAMS);
++ }
++}
+
+- /* get mechanism */
+- jMechanismClass= (*env)->FindClass(env, CLASS_MECHANISM);
+- if (jMechanismClass == NULL) { return; }
+- fieldID = (*env)->GetFieldID(env, jMechanismClass, "mechanism", "J");
+- if (fieldID == NULL) { return; }
+- jMechanismType = (*env)->GetLongField(env, jMechanism, fieldID);
+- ckMechanismType = jLongToCKULong(jMechanismType);
+- if (ckMechanismType != ckMechanism->mechanism) {
+- /* we do not have maching types, this should not occur */
+- return;
+- }
++static void copyBackKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism,
++ jobject jMechanism, CK_SSL3_RANDOM_DATA *RandomInfo,
++ CK_SSL3_KEY_MAT_OUT_PTR ckSSL3KeyMatOut, const char *class_key_mat_params)
++{
++ jclass jMechanismClass, jKeyMatParamsClass, jSSL3KeyMatOutClass;
++ jfieldID fieldID;
++ CK_MECHANISM_TYPE ckMechanismType;
++ jlong jMechanismType;
++ CK_BYTE_PTR iv;
++ jobject jKeyMatParam;
++ jobject jSSL3KeyMatOut;
++ jobject jIV;
++ jint jLength;
++ jbyte* jBytes;
++ int i;
+
+- /* get the native CK_SSL3_KEY_MAT_PARAMS */
+- ckSSL3KeyMatParam = (CK_SSL3_KEY_MAT_PARAMS *) ckMechanism->pParameter;
+- if (ckSSL3KeyMatParam != NULL_PTR) {
+- // free malloc'd data
+- if (ckSSL3KeyMatParam->RandomInfo.pClientRandom != NULL) {
+- free(ckSSL3KeyMatParam->RandomInfo.pClientRandom);
+- }
+- if (ckSSL3KeyMatParam->RandomInfo.pServerRandom != NULL) {
+- free(ckSSL3KeyMatParam->RandomInfo.pServerRandom);
++ /* get mechanism */
++ jMechanismClass= (*env)->FindClass(env, CLASS_MECHANISM);
++ if (jMechanismClass == NULL) { return; }
++ fieldID = (*env)->GetFieldID(env, jMechanismClass, "mechanism", "J");
++ if (fieldID == NULL) { return; }
++ jMechanismType = (*env)->GetLongField(env, jMechanism, fieldID);
++ ckMechanismType = jLongToCKULong(jMechanismType);
++ if (ckMechanismType != ckMechanism->mechanism) {
++ /* we do not have maching types, this should not occur */
++ return;
+ }
+
+- /* get the native CK_SSL3_KEY_MAT_OUT */
+- ckSSL3KeyMatOut = ckSSL3KeyMatParam->pReturnedKeyMaterial;
++ // free malloc'd data
++ if (RandomInfo->pClientRandom != NULL) {
++ free(RandomInfo->pClientRandom);
++ }
++ if (RandomInfo->pServerRandom != NULL) {
++ free(RandomInfo->pServerRandom);
++ }
++
+ if (ckSSL3KeyMatOut != NULL_PTR) {
+- /* get the Java CK_SSL3_KEY_MAT_PARAMS (pParameter) */
+- fieldID = (*env)->GetFieldID(env, jMechanismClass, "pParameter", "Ljava/lang/Object;");
++ /* get the Java params object (pParameter) */
++ fieldID = (*env)->GetFieldID(env, jMechanismClass, "pParameter",
++ "Ljava/lang/Object;");
+ if (fieldID == NULL) { return; }
+- jSSL3KeyMatParam = (*env)->GetObjectField(env, jMechanism, fieldID);
++ jKeyMatParam = (*env)->GetObjectField(env, jMechanism, fieldID);
+
+ /* get the Java CK_SSL3_KEY_MAT_OUT */
+- jSSL3KeyMatParamsClass = (*env)->FindClass(env, CLASS_SSL3_KEY_MAT_PARAMS);
+- if (jSSL3KeyMatParamsClass == NULL) { return; }
+- fieldID = (*env)->GetFieldID(env, jSSL3KeyMatParamsClass, "pReturnedKeyMaterial", "L"CLASS_SSL3_KEY_MAT_OUT";");
++ jKeyMatParamsClass = (*env)->FindClass(env, class_key_mat_params);
++ if (jKeyMatParamsClass == NULL) { return; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamsClass,
++ "pReturnedKeyMaterial", "L"CLASS_SSL3_KEY_MAT_OUT";");
+ if (fieldID == NULL) { return; }
+- jSSL3KeyMatOut = (*env)->GetObjectField(env, jSSL3KeyMatParam, fieldID);
++ jSSL3KeyMatOut = (*env)->GetObjectField(env, jKeyMatParam, fieldID);
+
+ /* now copy back all the key handles and the initialization vectors */
+ /* copy back client MAC secret handle */
+ jSSL3KeyMatOutClass = (*env)->FindClass(env, CLASS_SSL3_KEY_MAT_OUT);
+ if (jSSL3KeyMatOutClass == NULL) { return; }
+- fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass, "hClientMacSecret", "J");
++ fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass,
++ "hClientMacSecret", "J");
+ if (fieldID == NULL) { return; }
+- (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID, ckULongToJLong(ckSSL3KeyMatOut->hClientMacSecret));
++ (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID,
++ ckULongToJLong(ckSSL3KeyMatOut->hClientMacSecret));
+
+ /* copy back server MAC secret handle */
+- fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass, "hServerMacSecret", "J");
++ fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass,
++ "hServerMacSecret", "J");
+ if (fieldID == NULL) { return; }
+- (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID, ckULongToJLong(ckSSL3KeyMatOut->hServerMacSecret));
++ (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID,
++ ckULongToJLong(ckSSL3KeyMatOut->hServerMacSecret));
+
+ /* copy back client secret key handle */
+ fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass, "hClientKey", "J");
+ if (fieldID == NULL) { return; }
+- (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID, ckULongToJLong(ckSSL3KeyMatOut->hClientKey));
++ (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID,
++ ckULongToJLong(ckSSL3KeyMatOut->hClientKey));
+
+ /* copy back server secret key handle */
+ fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass, "hServerKey", "J");
+ if (fieldID == NULL) { return; }
+- (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID, ckULongToJLong(ckSSL3KeyMatOut->hServerKey));
++ (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID,
++ ckULongToJLong(ckSSL3KeyMatOut->hServerKey));
+
+ /* copy back the client IV */
+ fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass, "pIVClient", "[B");
+@@ -740,7 +788,45 @@
+ free(ckSSL3KeyMatOut->pIVServer);
+ free(ckSSL3KeyMatOut);
+ }
+- }
++}
++
++/*
++ * Copy back the derived keys and initialization vectors from the native
++ * structure to the Java object. This is only used for
++ * CKM_SSL3_KEY_AND_MAC_DERIVE and CKM_TLS_KEY_AND_MAC_DERIVE mechanisms
++ * when used for deriving a key.
++ *
++ */
++void ssl3CopyBackKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism,
++ jobject jMechanism)
++{
++ CK_SSL3_KEY_MAT_PARAMS *ckSSL3KeyMatParam;
++ ckSSL3KeyMatParam = (CK_SSL3_KEY_MAT_PARAMS *)ckMechanism->pParameter;
++ if (ckSSL3KeyMatParam != NULL_PTR) {
++ copyBackKeyMatParams(env, ckMechanism, jMechanism,
++ &(ckSSL3KeyMatParam->RandomInfo),
++ ckSSL3KeyMatParam->pReturnedKeyMaterial,
++ CLASS_SSL3_KEY_MAT_PARAMS);
++ }
++}
++
++/*
++ * Copy back the derived keys and initialization vectors from the native
++ * structure to the Java object. This is only used for
++ * CKM_TLS12_KEY_AND_MAC_DERIVE mechanism when used for deriving a key.
++ *
++ */
++void tls12CopyBackKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism,
++ jobject jMechanism)
++{
++ CK_TLS12_KEY_MAT_PARAMS *ckTLS12KeyMatParam;
++ ckTLS12KeyMatParam = (CK_TLS12_KEY_MAT_PARAMS *) ckMechanism->pParameter;
++ if (ckTLS12KeyMatParam != NULL_PTR) {
++ copyBackKeyMatParams(env, ckMechanism, jMechanism,
++ &(ckTLS12KeyMatParam->RandomInfo),
++ ckTLS12KeyMatParam->pReturnedKeyMaterial,
++ CLASS_TLS12_KEY_MAT_PARAMS);
++ }
+ }
+
+ #endif
+diff --git openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
+--- openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
++++ openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
+@@ -807,6 +807,12 @@
+ #define CKM_WTLS_SERVER_KEY_AND_MAC_DERIVE 0x000003D4
+ #define CKM_WTLS_CLIENT_KEY_AND_MAC_DERIVE 0x000003D5
+
++/* new for v2.40 */
++#define CKM_TLS12_MASTER_KEY_DERIVE 0x000003E0
++#define CKM_TLS12_KEY_AND_MAC_DERIVE 0x000003E1
++#define CKM_TLS12_MASTER_KEY_DERIVE_DH 0x000003E2
++#define CKM_TLS_MAC 0x000003E4
++
+ #define CKM_KEY_WRAP_LYNKS 0x00000400
+ #define CKM_KEY_WRAP_SET_OAEP 0x00000401
+
+@@ -1682,4 +1688,34 @@
+
+ typedef CK_PKCS5_PBKD2_PARAMS CK_PTR CK_PKCS5_PBKD2_PARAMS_PTR;
+
++/* new for v2.40 */
++
++typedef struct CK_TLS12_MASTER_KEY_DERIVE_PARAMS {
++ CK_SSL3_RANDOM_DATA RandomInfo;
++ CK_VERSION_PTR pVersion;
++ CK_MECHANISM_TYPE prfHashMechanism;
++} CK_TLS12_MASTER_KEY_DERIVE_PARAMS;
++
++typedef CK_TLS12_MASTER_KEY_DERIVE_PARAMS CK_PTR CK_TLS12_MASTER_KEY_DERIVE_PARAMS_PTR;
++
++typedef struct CK_TLS12_KEY_MAT_PARAMS {
++ CK_ULONG ulMacSizeInBits;
++ CK_ULONG ulKeySizeInBits;
++ CK_ULONG ulIVSizeInBits;
++ CK_BBOOL bIsExport;
++ CK_SSL3_RANDOM_DATA RandomInfo;
++ CK_SSL3_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
++ CK_MECHANISM_TYPE prfHashMechanism;
++} CK_TLS12_KEY_MAT_PARAMS;
++
++typedef CK_TLS12_KEY_MAT_PARAMS CK_PTR CK_TLS12_KEY_MAT_PARAMS_PTR;
++
++typedef struct CK_TLS_MAC_PARAMS {
++ CK_MECHANISM_TYPE prfMechanism;
++ CK_ULONG ulMacLength;
++ CK_ULONG ulServerOrClient;
++} CK_TLS_MAC_PARAMS;
++
++typedef CK_TLS_MAC_PARAMS CK_PTR CK_TLS_MAC_PARAMS_PTR;
++
+ #endif
+diff --git openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
+--- openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
++++ openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+
+ /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
+@@ -268,10 +268,13 @@
+ #define CLASS_SSL3_RANDOM_DATA "sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA"
+ // CLASS_SSL3_RANDOM_DATA is used by CLASS_SSL3_MASTER_KEY_DERIVE_PARAMS
+ #define CLASS_SSL3_KEY_MAT_OUT "sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT"
+-// CLASS_SSL3_KEY_MAT_OUT is used by CLASS_SSL3_KEY_MAT_PARAMS
++// CLASS_SSL3_KEY_MAT_OUT is used by CLASS_SSL3_KEY_MAT_PARAMS and CK_TLS12_KEY_MAT_PARAMS
+ #define CLASS_SSL3_MASTER_KEY_DERIVE_PARAMS "sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS"
++#define CLASS_TLS12_MASTER_KEY_DERIVE_PARAMS "sun/security/pkcs11/wrapper/CK_TLS12_MASTER_KEY_DERIVE_PARAMS"
+ #define CLASS_SSL3_KEY_MAT_PARAMS "sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_PARAMS"
++#define CLASS_TLS12_KEY_MAT_PARAMS "sun/security/pkcs11/wrapper/CK_TLS12_KEY_MAT_PARAMS"
+ #define CLASS_TLS_PRF_PARAMS "sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS"
++#define CLASS_TLS_MAC_PARAMS "sun/security/pkcs11/wrapper/CK_TLS_MAC_PARAMS"
+ #define CLASS_AES_CTR_PARAMS "sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS"
+
+ /* function to convert a PKCS#11 return value other than CK_OK into a Java Exception
+@@ -361,9 +364,11 @@
+ CK_KEY_WRAP_SET_OAEP_PARAMS jKeyWrapSetOaepParamToCKKeyWrapSetOaepParam(JNIEnv *env, jobject jParam);
+ void copyBackSetUnwrappedKey(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
+ CK_SSL3_MASTER_KEY_DERIVE_PARAMS jSsl3MasterKeyDeriveParamToCKSsl3MasterKeyDeriveParam(JNIEnv *env, jobject jParam);
+-void copyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
++void ssl3CopyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
++void tls12CopyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
+ CK_SSL3_KEY_MAT_PARAMS jSsl3KeyMatParamToCKSsl3KeyMatParam(JNIEnv *env, jobject jParam);
+-void copyBackSSLKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
++void ssl3CopyBackKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
++void tls12CopyBackKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
+ CK_KEY_DERIVATION_STRING_DATA jKeyDerivationStringDataToCKKeyDerivationStringData(JNIEnv *env, jobject jParam);
+ CK_RSA_PKCS_PSS_PARAMS jRsaPkcsPssParamToCKRsaPkcsPssParam(JNIEnv *env, jobject jParam);
+ CK_ECDH1_DERIVE_PARAMS jEcdh1DeriveParamToCKEcdh1DeriveParam(JNIEnv *env, jobject jParam);
+diff --git openjdk.orig/jdk/test/sun/security/pkcs11/fips/TestTLS12.java openjdk/jdk/test/sun/security/pkcs11/fips/TestTLS12.java
+new file mode 100644
+--- /dev/null
++++ openjdk/jdk/test/sun/security/pkcs11/fips/TestTLS12.java
+@@ -0,0 +1,449 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ *
++ * 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.
++ */
++
++/*
++ * @test
++ * @bug 8029661
++ * @summary Test TLS 1.2
++ * @library ..
++ * @run main/othervm/timeout=120 TestTLS12
++ */
++
++import java.io.File;
++import java.io.FileInputStream;
++import java.io.InputStream;
++import java.nio.ByteBuffer;
++
++import java.security.interfaces.RSAPrivateKey;
++import java.security.interfaces.RSAPublicKey;
++import java.security.KeyStore;
++import java.security.NoSuchAlgorithmException;
++import java.security.Provider;
++import java.security.SecureRandom;
++import java.security.Security;
++
++import java.util.Arrays;
++
++import javax.crypto.Cipher;
++import javax.crypto.KeyGenerator;
++import javax.crypto.SecretKey;
++import javax.crypto.spec.SecretKeySpec;
++
++import javax.net.ssl.KeyManagerFactory;
++import javax.net.ssl.SSLContext;
++import javax.net.ssl.SSLEngine;
++import javax.net.ssl.SSLEngineResult;
++import javax.net.ssl.SSLEngineResult.HandshakeStatus;
++import javax.net.ssl.SSLParameters;
++import javax.net.ssl.SSLSession;
++import javax.net.ssl.TrustManagerFactory;
++
++import sun.security.internal.spec.TlsMasterSecretParameterSpec;
++import sun.security.internal.spec.TlsPrfParameterSpec;
++import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
++
++public final class TestTLS12 extends SecmodTest {
++
++ private static final boolean enableDebug = true;
++
++ private static Provider sunPKCS11NSSProvider;
++ private static Provider sunJCEProvider;
++ private static com.sun.net.ssl.internal.ssl.Provider jsseProvider;
++ private static KeyStore ks;
++ private static KeyStore ts;
++ private static char[] passphrase = "JAHshj131@@".toCharArray();
++ private static RSAPrivateKey privateKey;
++ private static RSAPublicKey publicKey;
++
++ public static void main(String[] args) throws Exception {
++ try {
++ initialize();
++ } catch (Exception e) {
++ System.out.println("Test skipped: failure during" +
++ " initialization");
++ return;
++ }
++
++ if (shouldRun()) {
++ // Test against JCE
++ testTlsAuthenticationCodeGeneration();
++
++ // Self-integrity test (complete TLS 1.2 communication)
++ new testTLS12SunPKCS11Communication().run();
++
++ System.out.println("Test PASS - OK");
++ } else {
++ System.out.println("Test skipped: TLS 1.2 mechanisms" +
++ " not supported by current SunPKCS11 back-end");
++ }
++ }
++
++ private static boolean shouldRun() {
++ if (sunPKCS11NSSProvider == null) {
++ return false;
++ }
++ try {
++ KeyGenerator.getInstance("SunTls12MasterSecret",
++ sunPKCS11NSSProvider);
++ KeyGenerator.getInstance(
++ "SunTls12RsaPremasterSecret", sunPKCS11NSSProvider);
++ KeyGenerator.getInstance("SunTls12Prf", sunPKCS11NSSProvider);
++ } catch (NoSuchAlgorithmException e) {
++ return false;
++ }
++ return true;
++ }
++
++ private static void testTlsAuthenticationCodeGeneration()
++ throws Exception {
++ // Generate RSA Pre-Master Secret in SunPKCS11 provider
++ SecretKey rsaPreMasterSecret = null;
++ @SuppressWarnings("deprecation")
++ TlsRsaPremasterSecretParameterSpec rsaPreMasterSecretSpec =
++ new TlsRsaPremasterSecretParameterSpec(0x0303, 0x0303);
++ {
++ KeyGenerator rsaPreMasterSecretKG = KeyGenerator.getInstance(
++ "SunTls12RsaPremasterSecret", sunPKCS11NSSProvider);
++ rsaPreMasterSecretKG.init(rsaPreMasterSecretSpec, null);
++ rsaPreMasterSecret = rsaPreMasterSecretKG.generateKey();
++ }
++
++ // Get RSA Pre-Master Secret in plain (from SunPKCS11 provider)
++ byte[] rsaPlainPreMasterSecret = null;
++ {
++ Cipher rsaPreMasterSecretWrapperCipher =
++ Cipher.getInstance("RSA/ECB/PKCS1Padding",
++ sunPKCS11NSSProvider);
++ rsaPreMasterSecretWrapperCipher.init(Cipher.WRAP_MODE, publicKey,
++ new SecureRandom());
++ byte[] rsaEncryptedPreMasterSecret =
++ rsaPreMasterSecretWrapperCipher.wrap(rsaPreMasterSecret);
++ Cipher rsaPreMasterSecretUnwrapperCipher =
++ Cipher.getInstance("RSA/ECB/PKCS1Padding", sunJCEProvider);
++ rsaPreMasterSecretUnwrapperCipher.init(Cipher.UNWRAP_MODE,
++ privateKey, rsaPreMasterSecretSpec);
++ rsaPlainPreMasterSecret = rsaPreMasterSecretUnwrapperCipher.unwrap(
++ rsaEncryptedPreMasterSecret, "TlsRsaPremasterSecret",
++ Cipher.SECRET_KEY).getEncoded();
++
++ if (enableDebug) {
++ System.out.println("rsaPlainPreMasterSecret:");
++ for (byte b : rsaPlainPreMasterSecret) {
++ System.out.printf("%02X, ", b);
++ }
++ System.out.println("");
++ }
++ }
++
++ // Generate Master Secret
++ SecretKey sunPKCS11MasterSecret = null;
++ SecretKey jceMasterSecret = null;
++ {
++ KeyGenerator sunPKCS11MasterSecretGenerator =
++ KeyGenerator.getInstance("SunTls12MasterSecret",
++ sunPKCS11NSSProvider);
++ KeyGenerator jceMasterSecretGenerator = KeyGenerator.getInstance(
++ "SunTls12MasterSecret", sunJCEProvider);
++ @SuppressWarnings("deprecation")
++ TlsMasterSecretParameterSpec sunPKCS11MasterSecretSpec =
++ new TlsMasterSecretParameterSpec(rsaPreMasterSecret, 3, 3,
++ new byte[32], new byte[32], "SHA-256", 32, 64);
++ @SuppressWarnings("deprecation")
++ TlsMasterSecretParameterSpec jceMasterSecretSpec =
++ new TlsMasterSecretParameterSpec(
++ new SecretKeySpec(rsaPlainPreMasterSecret,
++ "Generic"), 3, 3, new byte[32],
++ new byte[32], "SHA-256", 32, 64);
++ sunPKCS11MasterSecretGenerator.init(sunPKCS11MasterSecretSpec,
++ null);
++ jceMasterSecretGenerator.init(jceMasterSecretSpec, null);
++ sunPKCS11MasterSecret =
++ sunPKCS11MasterSecretGenerator.generateKey();
++ jceMasterSecret = jceMasterSecretGenerator.generateKey();
++ if (enableDebug) {
++ System.out.println("Master Secret (SunJCE):");
++ if (jceMasterSecret != null) {
++ for (byte b : jceMasterSecret.getEncoded()) {
++ System.out.printf("%02X, ", b);
++ }
++ System.out.println("");
++ }
++ }
++ }
++
++ // Generate authentication codes
++ byte[] sunPKCS11AuthenticationCode = null;
++ byte[] jceAuthenticationCode = null;
++ {
++ // Generate SunPKCS11 authentication code
++ {
++ @SuppressWarnings("deprecation")
++ TlsPrfParameterSpec sunPKCS11AuthenticationCodeSpec =
++ new TlsPrfParameterSpec(sunPKCS11MasterSecret,
++ "client finished", "a".getBytes(), 12,
++ "SHA-256", 32, 64);
++ KeyGenerator sunPKCS11AuthCodeGenerator =
++ KeyGenerator.getInstance("SunTls12Prf",
++ sunPKCS11NSSProvider);
++ sunPKCS11AuthCodeGenerator.init(
++ sunPKCS11AuthenticationCodeSpec);
++ sunPKCS11AuthenticationCode =
++ sunPKCS11AuthCodeGenerator.generateKey().getEncoded();
++ }
++
++ // Generate SunJCE authentication code
++ {
++ @SuppressWarnings("deprecation")
++ TlsPrfParameterSpec jceAuthenticationCodeSpec =
++ new TlsPrfParameterSpec(jceMasterSecret,
++ "client finished", "a".getBytes(), 12,
++ "SHA-256", 32, 64);
++ KeyGenerator jceAuthCodeGenerator =
++ KeyGenerator.getInstance("SunTls12Prf",
++ sunJCEProvider);
++ jceAuthCodeGenerator.init(jceAuthenticationCodeSpec);
++ jceAuthenticationCode =
++ jceAuthCodeGenerator.generateKey().getEncoded();
++ }
++
++ if (enableDebug) {
++ System.out.println("SunPKCS11 Authentication Code: ");
++ for (byte b : sunPKCS11AuthenticationCode) {
++ System.out.printf("%02X, ", b);
++ }
++ System.out.println("");
++ System.out.println("SunJCE Authentication Code: ");
++ for (byte b : jceAuthenticationCode) {
++ System.out.printf("%02X, ", b);
++ }
++ System.out.println("");
++ }
++ }
++
++ if (sunPKCS11AuthenticationCode == null ||
++ jceAuthenticationCode == null ||
++ sunPKCS11AuthenticationCode.length == 0 ||
++ jceAuthenticationCode.length == 0 ||
++ !Arrays.equals(sunPKCS11AuthenticationCode,
++ jceAuthenticationCode)) {
++ throw new Exception("Authentication codes from JCE" +
++ " and SunPKCS11 differ.");
++ }
++ }
++
++ private static class testTLS12SunPKCS11Communication {
++ public static void run() throws Exception {
++ SSLEngine[][] enginesToTest = getSSLEnginesToTest();
++
++ for (SSLEngine[] engineToTest : enginesToTest) {
++
++ SSLEngine clientSSLEngine = engineToTest[0];
++ SSLEngine serverSSLEngine = engineToTest[1];
++
++ // SSLEngine code based on RedhandshakeFinished.java
++
++ boolean dataDone = false;
++
++ ByteBuffer clientOut = null;
++ ByteBuffer clientIn = null;
++ ByteBuffer serverOut = null;
++ ByteBuffer serverIn = null;
++ ByteBuffer cTOs;
++ ByteBuffer sTOc;
++
++ SSLSession session = clientSSLEngine.getSession();
++ int appBufferMax = session.getApplicationBufferSize();
++ int netBufferMax = session.getPacketBufferSize();
++
++ clientIn = ByteBuffer.allocate(appBufferMax + 50);
++ serverIn = ByteBuffer.allocate(appBufferMax + 50);
++
++ cTOs = ByteBuffer.allocateDirect(netBufferMax);
++ sTOc = ByteBuffer.allocateDirect(netBufferMax);
++
++ clientOut = ByteBuffer.wrap(
++ "Hi Server, I'm Client".getBytes());
++ serverOut = ByteBuffer.wrap(
++ "Hello Client, I'm Server".getBytes());
++
++ SSLEngineResult clientResult;
++ SSLEngineResult serverResult;
++
++ while (!dataDone) {
++ clientResult = clientSSLEngine.wrap(clientOut, cTOs);
++ runDelegatedTasks(clientResult, clientSSLEngine);
++ serverResult = serverSSLEngine.wrap(serverOut, sTOc);
++ runDelegatedTasks(serverResult, serverSSLEngine);
++ cTOs.flip();
++ sTOc.flip();
++
++ if (enableDebug) {
++ System.out.println("Client -> Network");
++ printTlsNetworkPacket("", cTOs);
++ System.out.println("");
++ System.out.println("Server -> Network");
++ printTlsNetworkPacket("", sTOc);
++ System.out.println("");
++ }
++
++ clientResult = clientSSLEngine.unwrap(sTOc, clientIn);
++ runDelegatedTasks(clientResult, clientSSLEngine);
++ serverResult = serverSSLEngine.unwrap(cTOs, serverIn);
++ runDelegatedTasks(serverResult, serverSSLEngine);
++
++ cTOs.compact();
++ sTOc.compact();
++
++ if (!dataDone &&
++ (clientOut.limit() == serverIn.position()) &&
++ (serverOut.limit() == clientIn.position())) {
++ checkTransfer(serverOut, clientIn);
++ checkTransfer(clientOut, serverIn);
++ dataDone = true;
++ }
++ }
++ }
++ }
++
++ static void printTlsNetworkPacket(String prefix, ByteBuffer bb) {
++ ByteBuffer slice = bb.slice();
++ byte[] buffer = new byte[slice.remaining()];
++ slice.get(buffer);
++ for (int i = 0; i < buffer.length; i++) {
++ System.out.printf("%02X, ", (byte)(buffer[i] & (byte)0xFF));
++ if (i % 8 == 0 && i % 16 != 0) {
++ System.out.print(" ");
++ }
++ if (i % 16 == 0) {
++ System.out.println("");
++ }
++ }
++ System.out.flush();
++ }
++
++ private static void checkTransfer(ByteBuffer a, ByteBuffer b)
++ throws Exception {
++ a.flip();
++ b.flip();
++ if (!a.equals(b)) {
++ throw new Exception("Data didn't transfer cleanly");
++ }
++ a.position(a.limit());
++ b.position(b.limit());
++ a.limit(a.capacity());
++ b.limit(b.capacity());
++ }
++
++ private static void runDelegatedTasks(SSLEngineResult result,
++ SSLEngine engine) throws Exception {
++
++ if (result.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
++ Runnable runnable;
++ while ((runnable = engine.getDelegatedTask()) != null) {
++ runnable.run();
++ }
++ HandshakeStatus hsStatus = engine.getHandshakeStatus();
++ if (hsStatus == HandshakeStatus.NEED_TASK) {
++ throw new Exception(
++ "handshake shouldn't need additional tasks");
++ }
++ }
++ }
++
++ private static SSLEngine[][] getSSLEnginesToTest() throws Exception {
++ SSLEngine[][] enginesToTest = new SSLEngine[2][2];
++ String[][] preferredSuites = new String[][]{ new String[] {
++ "TLS_RSA_WITH_AES_128_CBC_SHA256"
++ }, new String[] {
++ "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"
++ }};
++ for (int i = 0; i < enginesToTest.length; i++) {
++ enginesToTest[i][0] = createSSLEngine(true);
++ enginesToTest[i][1] = createSSLEngine(false);
++ enginesToTest[i][0].setEnabledCipherSuites(preferredSuites[i]);
++ enginesToTest[i][1].setEnabledCipherSuites(preferredSuites[i]);
++ }
++ return enginesToTest;
++ }
++
++ static private SSLEngine createSSLEngine(boolean client)
++ throws Exception {
++ SSLEngine ssle;
++ KeyManagerFactory kmf = KeyManagerFactory.getInstance("PKIX",
++ jsseProvider);
++ kmf.init(ks, passphrase);
++
++ TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX",
++ jsseProvider);
++ tmf.init(ts);
++
++ SSLContext sslCtx = SSLContext.getInstance("TLSv1.2",
++ jsseProvider);
++ sslCtx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
++ ssle = sslCtx.createSSLEngine("localhost", 443);
++ ssle.setUseClientMode(client);
++ SSLParameters sslParameters = ssle.getSSLParameters();
++ ssle.setSSLParameters(sslParameters);
++
++ return ssle;
++ }
++ }
++
++ private static void initialize() throws Exception {
++ if (initSecmod() == false) {
++ return;
++ }
++ String configName = BASE + SEP + "fips.cfg";
++ sunPKCS11NSSProvider = getSunPKCS11(configName);
++ System.out.println("SunPKCS11 provider: " + sunPKCS11NSSProvider);
++ Security.addProvider(sunPKCS11NSSProvider);
++
++ sunJCEProvider = new com.sun.crypto.provider.SunJCE();
++ Security.addProvider(sunJCEProvider);
++
++ Security.removeProvider("SunJSSE");
++ jsseProvider =new com.sun.net.ssl.internal.ssl.Provider(
++ sunPKCS11NSSProvider);
++ Security.addProvider(jsseProvider);
++ System.out.println(jsseProvider.getInfo());
++
++ ks = KeyStore.getInstance("PKCS11", sunPKCS11NSSProvider);
++ ks.load(null, "test12".toCharArray());
++ ts = ks;
++
++ KeyStore ksPlain = readTestKeyStore();
++ privateKey = (RSAPrivateKey)ksPlain.getKey("rh_rsa_sha256",
++ passphrase);
++ publicKey = (RSAPublicKey)ksPlain.getCertificate(
++ "rh_rsa_sha256").getPublicKey();
++ }
++
++ private static KeyStore readTestKeyStore() throws Exception {
++ File file = new File(System.getProperty("test.src", "."), "keystore");
++ InputStream in = new FileInputStream(file);
++ KeyStore ks = KeyStore.getInstance("JKS");
++ ks.load(in, "passphrase".toCharArray());
++ in.close();
++ return ks;
++ }
++}
+\ No newline at end of file
diff --git a/jdk8035341-allow_using_system_installed_libpng.patch b/jdk8035341-allow_using_system_installed_libpng.patch
new file mode 100644
index 0000000..53661d8
--- /dev/null
+++ b/jdk8035341-allow_using_system_installed_libpng.patch
@@ -0,0 +1,115 @@
+diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
+--- jdk8/common/autoconf/libraries.m4 2013-11-14 20:08:01.845065585 -0500
++++ jdk8/common/autoconf/libraries.m4 2013-11-14 20:10:56.186553066 -0500
+@@ -676,6 +676,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
+ #
+
+diff -ruN jdk8/common/autoconf/spec.gmk.in jdk8/common/autoconf/spec.gmk.in
+--- jdk8/common/autoconf/spec.gmk.in 2013-10-31 19:24:33.000000000 -0400
++++ jdk8/common/autoconf/spec.gmk.in 2013-11-14 21:10:56.365976518 -0500
+@@ -548,6 +548,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@
+diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.gmk
+--- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 20:08:01.845065585 -0500
++++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 20:14:10.791982343 -0500
+@@ -1183,7 +1183,6 @@
+
+ ifndef BUILD_HEADLESS_ONLY
+ LIBSPLASHSCREEN_DIRS := \
+- $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
+
+ ifeq ($(USE_EXTERNAL_LIBGIF), true)
+@@ -1200,6 +1199,13 @@
+ LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/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
+@@ -1263,12 +1269,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), \
++ $(LIBZ) $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(LIBPNG_LDFLAGS), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+diff -ruN jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
+--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2013-10-31 19:44:18.000000000 -0400
++++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2013-11-14 20:14:41.363892797 -0500
+@@ -25,8 +25,7 @@
+
+ #include "splashscreen_impl.h"
+
+-#include "../libpng/png.h"
+-
++#include <png.h>
+ #include <setjmp.h>
+
+ #define SIG_BYTES 8
diff --git a/jdk8042159-allow_using_system_installed_lcms2.patch b/jdk8042159-allow_using_system_installed_lcms2.patch
new file mode 100644
index 0000000..6f39b57
--- /dev/null
+++ b/jdk8042159-allow_using_system_installed_lcms2.patch
@@ -0,0 +1,118 @@
+diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
+--- openjdk/common/autoconf/libraries.m4 2013-11-14 22:04:38.039440136 -0500
++++ openjdk/common/autoconf/libraries.m4 2013-11-14 22:05:11.474356424 -0500
+@@ -676,6 +676,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
+ #
+
+diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.gmk
+--- openjdk/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 22:04:38.040440133 -0500
++++ openjdk/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 22:05:11.475356411 -0500
+@@ -666,18 +666,35 @@
+
+ ##########################################################################################
+
++LIBLCMS_DIR := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms
++
++ifeq ($(USE_EXTERNAL_LCMS), true)
++ # If we're using an external library, we'll just need the wrapper part.
++ # By including it explicitely, all other files will be excluded.
++ BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c
++ BUILD_LIBLCMS_HEADERS :=
++else
++ BUILD_LIBLCMS_INCLUDE_FILES :=
++ # If we're using the bundled library, we'll need to include it in the
++ # include path explicitly. Otherwise the system headers will be used.
++ BUILD_LIBLCMS_HEADERS := -I$(LIBLCMS_DIR)
++endif
++
+ # TODO: Update awt lib path when awt is converted
+ $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
+ LIBRARY := lcms, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+- SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
++ SRC := $(LIBLCMS_DIR), \
++ INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
+ LANG := C, \
+ OPTIMIZATION := HIGHEST, \
+ CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
+ -DCMS_DONT_USE_FAST_FLOOR \
+ $(SHARED_LIBRARY_FLAGS) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
+- -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
++ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
++ $(BUILD_LIBLCMS_HEADERS) \
++ $(LCMS_CFLAGS), \
+ CFLAGS_solaris := -xc99=no_lib, \
+ CFLAGS_windows := -DCMS_IS_WINDOWS_, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
+@@ -685,10 +702,10 @@
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
+ 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_aix := -lm -lawt -ljava -ljvm,\
++ LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc $(LCMS_LIBS), \
++ LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm $(LCMS_LIBS), \
++ LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm $(LCMS_LIBS), \
++ LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm $(LCMS_LIBS),\
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=lcms.dll" \
+diff -r 3d1c3b0b73a3 src/share/native/sun/java2d/cmm/lcms/LCMS.c
+--- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Tue Sep 08 22:31:26 2015 +0300
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Thu Oct 15 05:29:28 2015 +0100
+@@ -30,7 +30,7 @@
+ #include "jni_util.h"
+ #include "Trace.h"
+ #include "Disposer.h"
+-#include "lcms2.h"
++#include <lcms2.h>
+ #include "jlong.h"
+
+
diff --git a/jdk8043805-allow_using_system_installed_libjpeg.patch b/jdk8043805-allow_using_system_installed_libjpeg.patch
new file mode 100644
index 0000000..003f32b
--- /dev/null
+++ b/jdk8043805-allow_using_system_installed_libjpeg.patch
@@ -0,0 +1,228 @@
+diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
+--- jdk8/common/autoconf/libraries.m4 2013-10-31 19:24:33.000000000 -0400
++++ jdk8/common/autoconf/libraries.m4 2013-11-14 21:55:20.249903347 -0500
+@@ -601,12 +601,42 @@
+ #
+
+ 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])
+- ])
++ AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg],
++ [use libjpeg from build system or OpenJDK sources (system, bundled) @<:@bundled@:>@])])
++
++ AC_CHECK_LIB(jpeg, jpeg_destroy_compress,
++ [ LIBJPEG_FOUND=yes ],
++ [ LIBJPEG_FOUND=no ])
++
++ 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
++
++ if test "x${with_libjpeg}" = "xbundled"; then
++ USE_EXTERNAL_LIBJPEG=false
++ AC_MSG_RESULT([bundled])
++ elif test "x${with_libjpeg}" = "xsystem"; then
++ if test "x${LIBJPEG_FOUND}" = "xyes"; then
++ USE_EXTERNAL_LIBJPEG=true
++ AC_MSG_RESULT([system])
++ else
++ AC_MSG_RESULT([system not found])
++ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])
++ fi
++ else
++ AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled'])
++ fi
+ AC_SUBST(USE_EXTERNAL_LIBJPEG)
+
++
+ ###############################################################################
+ #
+ # Check for the gif library
+diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.gmk
+--- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-10-31 19:44:18.000000000 -0400
++++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 21:56:01.020796703 -0500
+@@ -693,17 +693,17 @@
+ ##########################################################################################
+
+ 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_LIBJPEG_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
+
+@@ -718,37 +718,38 @@
+ # $(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, \
++$(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \
++ LIBRARY := javajpeg, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+- SRC := $(BUILD_LIBJPEG_CLOSED_SRC) \
++ SRC := $(BUILD_LIBJAVAJPEG_CLOSED_SRC) \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
+ LANG := C, \
+ OPTIMIZATION := HIGHEST, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+- $(BUILD_LIBJPEG_CLOSED_INCLUDES) \
++ $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
+- MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \
+- LDFLAGS := $(LDFLAGS_JDKLIB) \
++ MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
++ LDFLAGS := $(subst -Xlinker --as-needed,, \
++ $(subst -Wl$(COMMA)--as-needed,, $(LDFLAGS_JDKLIB))) -ljpeg \
+ $(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), \
+- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \
++ REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
++ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavajpeg, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+-$(BUILD_LIBJPEG): $(BUILD_LIBJAVA)
++$(BUILD_LIBJAVAJPEG): $(BUILD_LIBJAVA)
+
+-BUILD_LIBRARIES += $(BUILD_LIBJPEG)
++BUILD_LIBRARIES += $(BUILD_LIBJAVAJPEG)
+
+ ##########################################################################################
+
+@@ -1127,7 +1128,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
+
+@@ -1138,6 +1138,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/jpeg
++ endif
++
+ ifneq ($(OPENJDK_TARGET_OS), macosx)
+ LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
+ else
+@@ -1193,11 +1200,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) \
+diff -ruN jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
+--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2013-10-31 19:44:18.000000000 -0400
++++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2013-11-14 21:55:20.250903340 -0500
+@@ -89,7 +89,7 @@
+ java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction<Void>() {
+ public Void run() {
+- System.loadLibrary("jpeg");
++ System.loadLibrary("javajpeg");
+ return null;
+ }
+ });
+diff -ruN jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
+--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2013-10-31 19:44:18.000000000 -0400
++++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2013-11-14 21:55:20.250903340 -0500
+@@ -179,7 +179,7 @@
+ java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction<Void>() {
+ public Void run() {
+- System.loadLibrary("jpeg");
++ System.loadLibrary("javajpeg");
+ return null;
+ }
+ });
+diff -ruN jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java
+--- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2013-10-31 19:44:18.000000000 -0400
++++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2013-11-14 21:55:20.251903376 -0500
+@@ -56,7 +56,7 @@
+ java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction<Void>() {
+ public Void run() {
+- System.loadLibrary("jpeg");
++ System.loadLibrary("javajpeg");
+ return null;
+ }
+ });
+diff -ruN jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
+--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-10-31 19:44:18.000000000 -0400
++++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-11-14 21:55:20.251903376 -0500
+@@ -25,7 +25,6 @@
+
+ #include "splashscreen_impl.h"
+
+-#include "jinclude.h"
+ #include "jpeglib.h"
+ #include "jerror.h"
+
+@@ -107,11 +106,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;
diff --git a/jdk8044235-src_zip_should_include_all_sources.patch b/jdk8044235-src_zip_should_include_all_sources.patch
new file mode 100644
index 0000000..1beda6d
--- /dev/null
+++ b/jdk8044235-src_zip_should_include_all_sources.patch
@@ -0,0 +1,109 @@
+# HG changeset patch
+# User omajid
+# Date 1401638044 14400
+# Sun Jun 01 11:54:04 2014 -0400
+# Node ID fd78f7e83f3f1ce7d363b681b97583138218afcb
+# Parent 8d0af21b5b9789f97b05edacc221a63f851d13b8
+8044235: src.zip should include all sources
+Reviewed-by: andrew, dholmes
+
+diff --git a/make/CreateJars.gmk b/make/CreateJars.gmk
+--- openjdk/jdk/make/CreateJars.gmk
++++ openjdk/jdk/make/CreateJars.gmk
+@@ -584,40 +584,53 @@
+
+ ##########################################################################################
+
+-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 \
+- 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 \
+- #
++ifdef OPENJDK
++ SRC_ZIP_INCLUDES = \
++ com \
++ java \
++ javax \
++ jdk \
++ org \
++ sun \
++ #
++ SRC_ZIP_EXCLUDES =
++else
++ 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 \
++ 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 \
++ #
++ SRC_ZIP_EXCLUDES = javax/swing/beaninfo
++endif
+
+ SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes
+ SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc
+@@ -648,7 +661,7 @@
+ $(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
+ SRC := $(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src, \
+ INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \
+- EXCLUDES := javax/swing/beaninfo, \
++ EXCLUDES := $(SRC_ZIP_EXCLUDES), \
+ SUFFIXES := .java .c .h, \
+ ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
+ EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))
diff --git a/jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch b/jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
new file mode 100644
index 0000000..e91abd3
--- /dev/null
+++ b/jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
@@ -0,0 +1,191 @@
+# HG changeset patch
+# User stefank
+# Date 1525453613 -3600
+# Fri May 04 18:06:53 2018 +0100
+# Node ID 07a1135a327362f157955d470fad5df07cc35164
+# Parent de79964656fc652f2085dac4fe99bcc128b5a3b1
+8062808, PR3548: Turn on the -Wreturn-type warning
+Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett
+
+diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
++++ openjdk/hotspot/make/linux/makefiles/gcc.make
+@@ -210,7 +210,7 @@
+ WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body
+ endif
+
+-WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value
++WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value -Wreturn-type
+
+ ifeq ($(USE_CLANG),)
+ # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
+diff --git openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
+--- openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad
++++ openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
+@@ -1250,6 +1250,7 @@
+
+
+ Unimplemented();
++ return 0; // Mute compiler
+ }
+
+ #ifndef PRODUCT
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+@@ -541,6 +541,7 @@
+ err.report_and_die();
+
+ ShouldNotReachHere();
++ return true; // Mute compiler
+ }
+
+ void os::Linux::init_thread_fpu_state(void) {
+diff --git openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
+--- openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp
++++ openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
+@@ -506,7 +506,7 @@
+ ss.write((const char*)name->bytes(), name->utf8_length());
+ ss.write((const char*)signature->bytes(), signature->utf8_length());
+ ss.print(" is abstract");
+- return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
++ return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
+ }
+
+ Symbol* MethodFamily::generate_conflicts_message(GrowableArray<Method*>* methods, TRAPS) const {
+@@ -521,7 +521,7 @@
+ ss.print(".");
+ ss.write((const char*)name->bytes(), name->utf8_length());
+ }
+- return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
++ return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
+ }
+
+
+diff --git openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
+--- openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp
++++ openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
+@@ -249,7 +249,7 @@
+ MutexLocker ml(SymbolTable_lock, THREAD);
+
+ // Otherwise, add to symbol to table
+- return the_table()->basic_add(index, (u1*)name, len, hashValue, true, CHECK_NULL);
++ return the_table()->basic_add(index, (u1*)name, len, hashValue, true, THREAD);
+ }
+
+ Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) {
+@@ -288,7 +288,7 @@
+ // Grab SymbolTable_lock first.
+ MutexLocker ml(SymbolTable_lock, THREAD);
+
+- return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, CHECK_NULL);
++ return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, THREAD);
+ }
+
+ Symbol* SymbolTable::lookup_only(const char* name, int len,
+diff --git openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
+--- openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp
++++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
+@@ -229,15 +229,15 @@
+ class_name->as_C_string(),
+ class_loader.is_null() ? "null" : class_loader->klass()->name()->as_C_string()));
+ if (FieldType::is_array(class_name)) {
+- return resolve_array_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
++ return resolve_array_class_or_null(class_name, class_loader, protection_domain, THREAD);
+ } else if (FieldType::is_obj(class_name)) {
+ ResourceMark rm(THREAD);
+ // Ignore wrapping L and ;.
+ TempNewSymbol name = SymbolTable::new_symbol(class_name->as_C_string() + 1,
+ class_name->utf8_length() - 2, CHECK_NULL);
+- return resolve_instance_class_or_null(name, class_loader, protection_domain, CHECK_NULL);
++ return resolve_instance_class_or_null(name, class_loader, protection_domain, THREAD);
+ } else {
+- return resolve_instance_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
++ return resolve_instance_class_or_null(class_name, class_loader, protection_domain, THREAD);
+ }
+ }
+
+diff --git openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
+--- openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp
++++ openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
+@@ -367,7 +367,7 @@
+ _csv_format(csv_format), _print_help(print_help),
+ _print_class_stats(print_class_stats), _columns(columns) {}
+ void heap_inspection(outputStream* st) NOT_SERVICES_RETURN;
+- size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN;
++ size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN_(0);
+ static void find_instances_at_safepoint(Klass* k, GrowableArray<oop>* result) NOT_SERVICES_RETURN;
+ private:
+ void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL);
+diff --git openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
+--- openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp
++++ openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
+@@ -93,7 +93,7 @@
+ static void preload_and_dump(TRAPS) NOT_CDS_RETURN;
+ static int preload_and_dump(const char * class_list_path,
+ GrowableArray<Klass*>* class_promote_order,
+- TRAPS) NOT_CDS_RETURN;
++ TRAPS) NOT_CDS_RETURN_(0);
+
+ static ReservedSpace* shared_rs() {
+ CDS_ONLY(return _shared_rs);
+diff --git openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp openjdk/hotspot/src/share/vm/oops/constantPool.hpp
+--- openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp
++++ openjdk/hotspot/src/share/vm/oops/constantPool.hpp
+@@ -352,7 +352,7 @@
+
+ Klass* klass_at(int which, TRAPS) {
+ constantPoolHandle h_this(THREAD, this);
+- return klass_at_impl(h_this, which, CHECK_NULL);
++ return klass_at_impl(h_this, which, THREAD);
+ }
+
+ Symbol* klass_name_at(int which); // Returns the name, w/o resolving.
+diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
+--- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
++++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
+@@ -4244,7 +4244,7 @@
+ JVM_DTraceProvider* providers))
+ JVMWrapper("JVM_DTraceActivate");
+ return DTraceJSDT::activate(
+- version, module_name, providers_count, providers, CHECK_0);
++ version, module_name, providers_count, providers, THREAD);
+ JVM_END
+
+ JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method))
+diff --git openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp openjdk/hotspot/src/share/vm/runtime/reflection.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp
++++ openjdk/hotspot/src/share/vm/runtime/reflection.cpp
+@@ -1093,7 +1093,7 @@
+ } else {
+ if (rtype == T_BOOLEAN || rtype == T_BYTE || rtype == T_CHAR || rtype == T_SHORT)
+ narrow((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
+- return box((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
++ return box((jvalue*) result.get_value_addr(), rtype, THREAD);
+ }
+ }
+
+diff --git openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp
++++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
+@@ -1046,7 +1046,7 @@
+ // last java frame on stack (which includes native call frames)
+ vframeStream vfst(thread, true); // Do not skip and javaCalls
+
+- return find_callee_info_helper(thread, vfst, bc, callinfo, CHECK_(Handle()));
++ return find_callee_info_helper(thread, vfst, bc, callinfo, THREAD);
+ }
+
+
+diff --git openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp openjdk/hotspot/src/share/vm/services/memTracker.hpp
+--- openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp
++++ openjdk/hotspot/src/share/vm/services/memTracker.hpp
+@@ -64,7 +64,7 @@
+ const NativeCallStack& stack, MEMFLAGS flag = mtNone) { }
+ static inline void record_virtual_memory_commit(void* addr, size_t size, const NativeCallStack& stack) { }
+ static inline Tracker get_virtual_memory_uncommit_tracker() { return Tracker(); }
+- static inline Tracker get_virtual_memory_release_tracker() { }
++ static inline Tracker get_virtual_memory_release_tracker() { return Tracker(); }
+ static inline void record_virtual_memory_type(void* addr, MEMFLAGS flag) { }
+ static inline void record_thread_stack(void* addr, size_t size) { }
+ static inline void release_thread_stack(void* addr, size_t size) { }
diff --git a/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch b/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch
new file mode 100644
index 0000000..790ee0d
--- /dev/null
+++ b/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch
@@ -0,0 +1,28 @@
+# HG changeset patch
+# User goetz
+# Date 1415873641 -3600
+# Thu Nov 13 11:14:01 2014 +0100
+# Node ID 1878c4c1d04e1f3c6f67a19d36c35863d6b5f906
+# Parent 533473c67de6ff767710594639033c8e83523fe5
+8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning
+Reviewed-by: stefank, tschatzl
+
+diff --git openjdk.orig/hotspot/src/share/vm/prims/jni.cpp openjdk/hotspot/src/share/vm/prims/jni.cpp
+--- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp
++++ openjdk/hotspot/src/share/vm/prims/jni.cpp
+@@ -708,6 +708,7 @@
+
+ THROW_OOP_(JNIHandles::resolve(obj), JNI_OK);
+ ShouldNotReachHere();
++ return 0; // Mute compiler.
+ JNI_END
+
+ #ifndef USDT2
+@@ -734,6 +735,7 @@
+ Handle protection_domain (THREAD, k->protection_domain());
+ THROW_MSG_LOADER_(name, (char *)message, class_loader, protection_domain, JNI_OK);
+ ShouldNotReachHere();
++ return 0; // Mute compiler.
+ JNI_END
+
+
diff --git a/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_jdk.patch b/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_jdk.patch
new file mode 100644
index 0000000..f79be53
--- /dev/null
+++ b/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_jdk.patch
@@ -0,0 +1,98 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1537884792 -7200
+# Tue Sep 25 16:13:12 2018 +0200
+# Node ID fd140d7550992267e3f0f08a20b461b2ce9fa740
+# Parent 21056af0d1eabbd04d7a223c01a28320c7010bfe
+8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling
+Reviewed-by: erikj, goetz, dholmes
+
+diff --git openjdk.orig/jdk/make/lib/SoundLibraries.gmk openjdk/jdk/make/lib/SoundLibraries.gmk
+--- openjdk/jdk/make/lib/SoundLibraries.gmk Tue Jan 12 21:01:12 2016 +0000
++++ openjdk/jdk/make/lib/SoundLibraries.gmk Wed Jan 13 00:18:02 2016 +0000
+@@ -140,6 +140,10 @@
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC64
+ endif
+
++ ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
++ LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC64LE
++ endif
++
+ ifeq ($(OPENJDK_TARGET_CPU), aarch64)
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_AARCH64
+ endif
+diff -r 1fe56343ecc8 openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
+--- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Tue Jan 12 21:01:12 2016 +0000
++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Wed Jan 13 00:18:02 2016 +0000
+@@ -44,6 +44,8 @@
+ #define X_ARM 7
+ #define X_PPC 8
+ #define X_AARCH64 9
++#define X_PPC64 10
++#define X_PPC64LE 11
+
+ // **********************************
+ // Make sure you set X_PLATFORM and X_ARCH defines correctly.
+diff --git openjdk.orig/jdk/src/solaris/bin/ppc64le/jvm.cfg openjdk/jdk/src/solaris/bin/ppc64le/jvm.cfg
+new file mode 100644
+--- /dev/null
++++ openjdk/jdk/src/solaris/bin/ppc64le/jvm.cfg
+@@ -0,0 +1,34 @@
++# 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
++-client IGNORE
+diff --git openjdk.orig/test/sun/security/pkcs11/PKCS11Test.java openjdk/test/sun/security/pkcs11/PKCS11Test.java
+--- openjdk.orig/jdk/test/sun/security/pkcs11/PKCS11Test.java
++++ openjdk/jdk/test/sun/security/pkcs11/PKCS11Test.java
+@@ -505,6 +505,8 @@
+ osMap.put("Linux-amd64-64", new String[]{
+ "/usr/lib/x86_64-linux-gnu/", "/usr/lib/x86_64-linux-gnu/nss/",
+ "/usr/lib64/"});
++ osMap.put("Linux-ppc64-64", new String[]{"/usr/lib64/"});
++ osMap.put("Linux-ppc64le-64", new String[]{"/usr/lib64/"});
+ osMap.put("Windows-x86-32", new String[]{
+ PKCS11_BASE + "/nss/lib/windows-i586/".replace('/', SEP)});
+ osMap.put("Windows-amd64-64", new String[]{
+diff --git openjdk.orig/jdk/test/tools/launcher/Settings.java openjdk/jdk/test/tools/launcher/Settings.java
+--- openjdk.orig/jdk/test/tools/launcher/Settings.java
++++ openjdk/jdk/test/tools/launcher/Settings.java
+@@ -74,7 +74,7 @@
+
+ static void runTestOptionDefault() throws IOException {
+ String stackSize = "256"; // in kb
+- if (getArch().equals("ppc64")) {
++ if (getArch().equals("ppc64") || getArch().equals("ppc64le")) {
+ stackSize = "800";
+ }
+ TestResult tr = null;
diff --git a/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch b/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch
new file mode 100644
index 0000000..67fc620
--- /dev/null
+++ b/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch
@@ -0,0 +1,47 @@
+# HG changeset patch
+# User asmundak
+# Date 1537883922 -7200
+# Tue Sep 25 15:58:42 2018 +0200
+# Node ID 2fabe07c0bd8bf21400313f3bb9b8e80fcb31724
+# Parent 91867683f73de3882ef88981a79995beeeb1e980
+8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling
+Reviewed-by: erikj, goetz, dholmes
+Contributed-by: Andrew Hughes <gnu.andrew(a)redhat.com>, Alexander Smundak <asmundak(a)google.com>
+
+diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/flags.m4
+--- openjdk.orig///common/autoconf/flags.m4
++++ openjdk///common/autoconf/flags.m4
+@@ -549,6 +549,9 @@
+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN"
+ fi
+ fi
++ if test "x$OPENJDK_TARGET_CPU" = xppc64le; then
++ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DABI_ELFv2"
++ fi
+
+ # Setup target OS define. Use OS target name but in upper case.
+ OPENJDK_TARGET_OS_UPPERCASE=`$ECHO $OPENJDK_TARGET_OS | $TR 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+diff --git openjdk.orig///common/autoconf/jdk-options.m4 openjdk///common/autoconf/jdk-options.m4
+--- openjdk.orig///common/autoconf/jdk-options.m4
++++ openjdk///common/autoconf/jdk-options.m4
+@@ -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
+ AC_SUBST(INCLUDE_SA)
+diff --git openjdk.orig///common/autoconf/platform.m4 openjdk///common/autoconf/platform.m4
+--- openjdk.orig///common/autoconf/platform.m4
++++ openjdk///common/autoconf/platform.m4
+@@ -67,7 +67,7 @@
+ VAR_CPU_ENDIAN=big
+ ;;
+ powerpc64le)
+- VAR_CPU=ppc64
++ VAR_CPU=ppc64le
+ VAR_CPU_ARCH=ppc
+ VAR_CPU_BITS=64
+ VAR_CPU_ENDIAN=little
diff --git a/jdk8073139-pr2236-rh1191652--use_ppc64le_as_the_arch_directory_on_that_platform_and_report_it_in_os_arch_aarch64_forest.patch b/jdk8073139-pr2236-rh1191652--use_ppc64le_as_the_arch_directory_on_that_platform_and_report_it_in_os_arch_aarch64_forest.patch
new file mode 100644
index 0000000..a5afea0
--- /dev/null
+++ b/jdk8073139-pr2236-rh1191652--use_ppc64le_as_the_arch_directory_on_that_platform_and_report_it_in_os_arch_aarch64_forest.patch
@@ -0,0 +1,130 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1537885415 -7200
+# Tue Sep 25 16:23:35 2018 +0200
+# Node ID 5044428520866481f438bfd1375da75adbc89243
+# Parent a3df1579a8647b06559f41d345da7bea162b26e9
+8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling
+Reviewed-by: erikj, goetz, dholmes
+
+diff --git a/make/defs.make b/make/defs.make
+--- openjdk/hotspot/make/defs.make
++++ openjdk/hotspot/make/defs.make
+@@ -285,7 +285,7 @@ ifneq ($(OSNAME),windows)
+
+ # Use uname output for SRCARCH, but deal with platform differences. If ARCH
+ # is not explicitly listed below, it is treated as x86.
+- SRCARCH ?= $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 ppc ppc64 zero aarch64,$(ARCH)))
++ SRCARCH ?= $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 ppc ppc64 ppc64le zero aarch64,$(ARCH)))
+ ARCH/ = x86
+ ARCH/sparc = sparc
+ ARCH/sparc64= sparc
+@@ -293,6 +293,7 @@ ifneq ($(OSNAME),windows)
+ ARCH/amd64 = x86
+ ARCH/x86_64 = x86
+ ARCH/ppc64 = ppc
++ ARCH/ppc64le= ppc
+ ARCH/ppc = ppc
+ ARCH/zero = zero
+ ARCH/aarch64 = aarch64
+@@ -316,7 +317,12 @@
+ endif
+ endif
+
+- # LIBARCH is 1:1 mapping from BUILDARCH
++ # LIBARCH is 1:1 mapping from BUILDARCH, except for ARCH=ppc64le
++ ifeq ($(ARCH),ppc64le)
++ LIBARCH ?= ppc64le
++ else
++ LIBARCH ?= $(LIBARCH/$(BUILDARCH))
++ endif
+ LIBARCH ?= $(LIBARCH/$(BUILDARCH))
+ LIBARCH/i486 = i386
+ LIBARCH/amd64 = amd64
+diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -1956,7 +1956,7 @@
+ {EM_SPARCV9, EM_SPARCV9, ELFCLASS64, ELFDATA2MSB, (char*)"Sparc v9 64"},
+ {EM_PPC, EM_PPC, ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"},
+ #if defined(VM_LITTLE_ENDIAN)
+- {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2LSB, (char*)"Power PC 64"},
++ {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2LSB, (char*)"Power PC 64 LE"},
+ #else
+ {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"},
+ #endif
+diff --git a/src/share/tools/hsdis/Makefile b/src/share/tools/hsdis/Makefile
+--- openjdk/hotspot/src/share/tools/hsdis/Makefile
++++ openjdk/hotspot/src/share/tools/hsdis/Makefile
+@@ -97,6 +97,7 @@
+ CFLAGS/sparcv9 += -m64
+ CFLAGS/amd64 += -m64
+ CFLAGS/ppc64 += -m64
++CFLAGS/ppc64le += -m64 -DABI_ELFv2
+ else
+ ARCH=$(ARCH1:amd64=i386)
+ CFLAGS/i386 += -m32
+diff --git a/src/share/tools/hsdis/hsdis-demo.c b/src/share/tools/hsdis/hsdis-demo.c
+--- openjdk/hotspot/src/share/tools/hsdis/hsdis-demo.c
++++ openjdk/hotspot/src/share/tools/hsdis/hsdis-demo.c
+@@ -88,7 +88,7 @@
+ printf("...And now for something completely different:\n");
+ void *start = (void*) &main;
+ void *end = (void*) &end_of_file;
+-#if defined(__ia64) || defined(__powerpc__)
++#if defined(__ia64) || (defined(__powerpc__) && !defined(ABI_ELFv2))
+ /* On IA64 and PPC function pointers are pointers to function descriptors */
+ start = *((void**)start);
+ end = *((void**)end);
+diff --git a/src/share/tools/hsdis/hsdis.c b/src/share/tools/hsdis/hsdis.c
+--- openjdk/hotspot/src/share/tools/hsdis/hsdis.c
++++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c
+@@ -461,7 +461,7 @@ static const char* native_arch_name() {
+ #ifdef LIBARCH_sparcv9
+ res = "sparc:v9b";
+ #endif
+-#ifdef LIBARCH_ppc64
++#if defined(LIBARCH_ppc64) || defined(LIBARCH_ppc64le)
+ res = "powerpc:common64";
+ #endif
+ #else
+diff --git a/src/share/vm/runtime/vm_version.cpp b/src/share/vm/runtime/vm_version.cpp
+--- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
+@@ -187,11 +187,16 @@ const char* Abstract_VM_Version::jre_release_version() {
+ #ifndef CPU
+ #ifdef ZERO
+ #define CPU ZERO_LIBARCH
++#elif defined(PPC64)
++#if defined(VM_LITTLE_ENDIAN)
++#define CPU "ppc64le"
++#else
++#define CPU "ppc64"
++#endif
+ #else
+ #define CPU IA32_ONLY("x86") \
+ IA64_ONLY("ia64") \
+ AMD64_ONLY("amd64") \
+- PPC64_ONLY("ppc64") \
+ AARCH64_ONLY("aarch64") \
+ SPARC_ONLY("sparc")
+ #endif // ZERO
+diff --git a/test/test_env.sh b/test/test_env.sh
+--- openjdk/hotspot/test/test_env.sh
++++ openjdk/hotspot/test/test_env.sh
+@@ -185,6 +185,15 @@
+ if [ $? = 0 ]
+ then
+ VM_CPU="ppc"
++ if [ $VM_BITS = "64" ]
++ then
++ VM_CPU="ppc64"
++ grep "ppc64le" vm_version.out > ${NULL}
++ if [ $? = 0 ]
++ then
++ VM_CPU="ppc64le"
++ fi
++ fi
+ fi
+ grep "ia64" vm_version.out > ${NULL}
+ if [ $? = 0 ]
diff --git a/jdk8131048-pr3574-rh1498936-ppc_crc32.patch b/jdk8131048-pr3574-rh1498936-ppc_crc32.patch
new file mode 100644
index 0000000..d7b94e6
--- /dev/null
+++ b/jdk8131048-pr3574-rh1498936-ppc_crc32.patch
@@ -0,0 +1,1417 @@
+# HG changeset patch
+# User gromero
+# Date 1537823918 14400
+# Mon Sep 24 17:18:38 2018 -0400
+# Node ID 567e95df42f866b890dc3f0670e086d266915112
+# Parent 678bb67e02aedd54e32819a9011962326164274e
+8131048, PR3574, RH1498936: ppc implement CRC32 intrinsic
+Reviewed-by: goetz
+
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp openjdk/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp
+@@ -33,5 +33,7 @@
+ address generate_abstract_entry(void);
+ address generate_accessor_entry(void);
+ address generate_Reference_get_entry(void);
++ address generate_CRC32_update_entry();
++ address generate_CRC32_updateBytes_entry(AbstractInterpreter::MethodKind kind);
+
+ #endif // CPU_PPC_VM_INTERPRETERGENERATOR_PPC_HPP
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
+@@ -49,6 +49,7 @@
+ #else
+ #define BLOCK_COMMENT(str) block_comment(str)
+ #endif
++#define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
+
+ #ifdef ASSERT
+ // On RISC, there's no benefit to verifying instruction boundaries.
+@@ -3022,6 +3023,418 @@
+ bind(Ldone_false);
+ }
+
++// Helpers for Intrinsic Emitters
++//
++// Revert the byte order of a 32bit value in a register
++// src: 0x44556677
++// dst: 0x77665544
++// Three steps to obtain the result:
++// 1) Rotate src (as doubleword) left 5 bytes. That puts the leftmost byte of the src word
++// into the rightmost byte position. Afterwards, everything left of the rightmost byte is cleared.
++// This value initializes dst.
++// 2) Rotate src (as word) left 3 bytes. That puts the rightmost byte of the src word into the leftmost
++// byte position. Furthermore, byte 5 is rotated into byte 6 position where it is supposed to go.
++// This value is mask inserted into dst with a [0..23] mask of 1s.
++// 3) Rotate src (as word) left 1 byte. That puts byte 6 into byte 5 position.
++// This value is mask inserted into dst with a [8..15] mask of 1s.
++void MacroAssembler::load_reverse_32(Register dst, Register src) {
++ assert_different_registers(dst, src);
++
++ rldicl(dst, src, (4+1)*8, 56); // Rotate byte 4 into position 7 (rightmost), clear all to the left.
++ rlwimi(dst, src, 3*8, 0, 23); // Insert byte 5 into position 6, 7 into 4, leave pos 7 alone.
++ rlwimi(dst, src, 1*8, 8, 15); // Insert byte 6 into position 5, leave the rest alone.
++}
++
++// Calculate the column addresses of the crc32 lookup table into distinct registers.
++// This loop-invariant calculation is moved out of the loop body, reducing the loop
++// body size from 20 to 16 instructions.
++// Returns the offset that was used to calculate the address of column tc3.
++// Due to register shortage, setting tc3 may overwrite table. With the return offset
++// at hand, the original table address can be easily reconstructed.
++int MacroAssembler::crc32_table_columns(Register table, Register tc0, Register tc1, Register tc2, Register tc3) {
++
++#ifdef VM_LITTLE_ENDIAN
++ // This is what we implement (the DOLIT4 part):
++ // ========================================================================= */
++ // #define DOLIT4 c ^= *buf4++; \
++ // c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
++ // crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
++ // #define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
++ // ========================================================================= */
++ const int ix0 = 3*(4*CRC32_COLUMN_SIZE);
++ const int ix1 = 2*(4*CRC32_COLUMN_SIZE);
++ const int ix2 = 1*(4*CRC32_COLUMN_SIZE);
++ const int ix3 = 0*(4*CRC32_COLUMN_SIZE);
++#else
++ // This is what we implement (the DOBIG4 part):
++ // =========================================================================
++ // #define DOBIG4 c ^= *++buf4; \
++ // c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
++ // crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
++ // #define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
++ // =========================================================================
++ const int ix0 = 4*(4*CRC32_COLUMN_SIZE);
++ const int ix1 = 5*(4*CRC32_COLUMN_SIZE);
++ const int ix2 = 6*(4*CRC32_COLUMN_SIZE);
++ const int ix3 = 7*(4*CRC32_COLUMN_SIZE);
++#endif
++ assert_different_registers(table, tc0, tc1, tc2);
++ assert(table == tc3, "must be!");
++
++ if (ix0 != 0) addi(tc0, table, ix0);
++ if (ix1 != 0) addi(tc1, table, ix1);
++ if (ix2 != 0) addi(tc2, table, ix2);
++ if (ix3 != 0) addi(tc3, table, ix3);
++
++ return ix3;
++}
++
++/**
++ * uint32_t crc;
++ * timesXtoThe32[crc & 0xFF] ^ (crc >> 8);
++ */
++void MacroAssembler::fold_byte_crc32(Register crc, Register val, Register table, Register tmp) {
++ assert_different_registers(crc, table, tmp);
++ assert_different_registers(val, table);
++
++ if (crc == val) { // Must rotate first to use the unmodified value.
++ rlwinm(tmp, val, 2, 24-2, 31-2); // Insert (rightmost) byte 7 of val, shifted left by 2, into byte 6..7 of tmp, clear the rest.
++ // As we use a word (4-byte) instruction, we have to adapt the mask bit positions.
++ srwi(crc, crc, 8); // Unsigned shift, clear leftmost 8 bits.
++ } else {
++ srwi(crc, crc, 8); // Unsigned shift, clear leftmost 8 bits.
++ rlwinm(tmp, val, 2, 24-2, 31-2); // Insert (rightmost) byte 7 of val, shifted left by 2, into byte 6..7 of tmp, clear the rest.
++ }
++ lwzx(tmp, table, tmp);
++ xorr(crc, crc, tmp);
++}
++
++/**
++ * uint32_t crc;
++ * timesXtoThe32[crc & 0xFF] ^ (crc >> 8);
++ */
++void MacroAssembler::fold_8bit_crc32(Register crc, Register table, Register tmp) {
++ fold_byte_crc32(crc, crc, table, tmp);
++}
++
++/**
++ * Emits code to update CRC-32 with a byte value according to constants in table.
++ *
++ * @param [in,out]crc Register containing the crc.
++ * @param [in]val Register containing the byte to fold into the CRC.
++ * @param [in]table Register containing the table of crc constants.
++ *
++ * uint32_t crc;
++ * val = crc_table[(val ^ crc) & 0xFF];
++ * crc = val ^ (crc >> 8);
++ */
++void MacroAssembler::update_byte_crc32(Register crc, Register val, Register table) {
++ BLOCK_COMMENT("update_byte_crc32:");
++ xorr(val, val, crc);
++ fold_byte_crc32(crc, val, table, val);
++}
++
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param table register pointing to CRC table
++ */
++void MacroAssembler::update_byteLoop_crc32(Register crc, Register buf, Register len, Register table,
++ Register data, bool loopAlignment, bool invertCRC) {
++ assert_different_registers(crc, buf, len, table, data);
++
++ Label L_mainLoop, L_done;
++ const int mainLoop_stepping = 1;
++ const int mainLoop_alignment = loopAlignment ? 32 : 4; // (InputForNewCode > 4 ? InputForNewCode : 32) : 4;
++
++ // Process all bytes in a single-byte loop.
++ cmpdi(CCR0, len, 0); // Anything to do?
++ mtctr(len);
++ beq(CCR0, L_done);
++
++ if (invertCRC) {
++ nand(crc, crc, crc); // ~c
++ }
++
++ align(mainLoop_alignment);
++ BIND(L_mainLoop);
++ lbz(data, 0, buf); // Byte from buffer, zero-extended.
++ addi(buf, buf, mainLoop_stepping); // Advance buffer position.
++ update_byte_crc32(crc, data, table);
++ bdnz(L_mainLoop); // Iterate.
++
++ if (invertCRC) {
++ nand(crc, crc, crc); // ~c
++ }
++
++ bind(L_done);
++}
++
++/**
++ * Emits code to update CRC-32 with a 4-byte value according to constants in table
++ * Implementation according to jdk/src/share/native/java/util/zip/zlib-1.2.8/crc32.c
++ */
++// A not on the lookup table address(es):
++// The lookup table consists of two sets of four columns each.
++// The columns {0..3} are used for little-endian machines.
++// The columns {4..7} are used for big-endian machines.
++// To save the effort of adding the column offset to the table address each time
++// a table element is looked up, it is possible to pass the pre-calculated
++// column addresses.
++// Uses R9..R12 as work register. Must be saved/restored by caller, if necessary.
++void MacroAssembler::update_1word_crc32(Register crc, Register buf, Register table, int bufDisp, int bufInc,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3) {
++ assert_different_registers(crc, t3);
++
++ // XOR crc with next four bytes of buffer.
++ lwz(t3, bufDisp, buf);
++ if (bufInc != 0) {
++ addi(buf, buf, bufInc);
++ }
++ xorr(t3, t3, crc);
++
++ // Chop crc into 4 single-byte pieces, shifted left 2 bits, to form the table indices.
++ rlwinm(t0, t3, 2, 24-2, 31-2); // ((t1 >> 0) & 0xff) << 2
++ rlwinm(t1, t3, 32+(2- 8), 24-2, 31-2); // ((t1 >> 8) & 0xff) << 2
++ rlwinm(t2, t3, 32+(2-16), 24-2, 31-2); // ((t1 >> 16) & 0xff) << 2
++ rlwinm(t3, t3, 32+(2-24), 24-2, 31-2); // ((t1 >> 24) & 0xff) << 2
++
++ // Use the pre-calculated column addresses.
++ // Load pre-calculated table values.
++ lwzx(t0, tc0, t0);
++ lwzx(t1, tc1, t1);
++ lwzx(t2, tc2, t2);
++ lwzx(t3, tc3, t3);
++
++ // Calculate new crc from table values.
++ xorr(t0, t0, t1);
++ xorr(t2, t2, t3);
++ xorr(crc, t0, t2); // Now crc contains the final checksum value.
++}
++
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param table register pointing to CRC table
++ *
++ * Uses R9..R12 as work register. Must be saved/restored by caller!
++ */
++void MacroAssembler::kernel_crc32_2word(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3) {
++ assert_different_registers(crc, buf, len, table);
++
++ Label L_mainLoop, L_tail;
++ Register tmp = t0;
++ Register data = t0;
++ Register tmp2 = t1;
++ const int mainLoop_stepping = 8;
++ const int tailLoop_stepping = 1;
++ const int log_stepping = exact_log2(mainLoop_stepping);
++ const int mainLoop_alignment = 32; // InputForNewCode > 4 ? InputForNewCode : 32;
++ const int complexThreshold = 2*mainLoop_stepping;
++
++ // Don't test for len <= 0 here. This pathological case should not occur anyway.
++ // Optimizing for it by adding a test and a branch seems to be a waste of CPU cycles.
++ // The situation itself is detected and handled correctly by the conditional branches
++ // following aghi(len, -stepping) and aghi(len, +stepping).
++ assert(tailLoop_stepping == 1, "check tailLoop_stepping!");
++
++ BLOCK_COMMENT("kernel_crc32_2word {");
++
++ nand(crc, crc, crc); // ~c
++
++ // Check for short (<mainLoop_stepping) buffer.
++ cmpdi(CCR0, len, complexThreshold);
++ blt(CCR0, L_tail);
++
++ // Pre-mainLoop alignment did show a slight (1%) positive effect on performance.
++ // We leave the code in for reference. Maybe we need alignment when we exploit vector instructions.
++ {
++ // Align buf addr to mainLoop_stepping boundary.
++ neg(tmp2, buf); // Calculate # preLoop iterations for alignment.
++ rldicl(tmp2, tmp2, 0, 64-log_stepping); // Rotate tmp2 0 bits, insert into tmp2, anding with mask with 1s from 62..63.
++
++ if (complexThreshold > mainLoop_stepping) {
++ sub(len, len, tmp2); // Remaining bytes for main loop (>=mainLoop_stepping is guaranteed).
++ } else {
++ sub(tmp, len, tmp2); // Remaining bytes for main loop.
++ cmpdi(CCR0, tmp, mainLoop_stepping);
++ blt(CCR0, L_tail); // For less than one mainloop_stepping left, do only tail processing
++ mr(len, tmp); // remaining bytes for main loop (>=mainLoop_stepping is guaranteed).
++ }
++ update_byteLoop_crc32(crc, buf, tmp2, table, data, false, false);
++ }
++
++ srdi(tmp2, len, log_stepping); // #iterations for mainLoop
++ andi(len, len, mainLoop_stepping-1); // remaining bytes for tailLoop
++ mtctr(tmp2);
++
++#ifdef VM_LITTLE_ENDIAN
++ Register crc_rv = crc;
++#else
++ Register crc_rv = tmp; // Load_reverse needs separate registers to work on.
++ // Occupies tmp, but frees up crc.
++ load_reverse_32(crc_rv, crc); // Revert byte order because we are dealing with big-endian data.
++ tmp = crc;
++#endif
++
++ int reconstructTableOffset = crc32_table_columns(table, tc0, tc1, tc2, tc3);
++
++ align(mainLoop_alignment); // Octoword-aligned loop address. Shows 2% improvement.
++ BIND(L_mainLoop);
++ update_1word_crc32(crc_rv, buf, table, 0, 0, crc_rv, t1, t2, t3, tc0, tc1, tc2, tc3);
++ update_1word_crc32(crc_rv, buf, table, 4, mainLoop_stepping, crc_rv, t1, t2, t3, tc0, tc1, tc2, tc3);
++ bdnz(L_mainLoop);
++
++#ifndef VM_LITTLE_ENDIAN
++ load_reverse_32(crc, crc_rv); // Revert byte order because we are dealing with big-endian data.
++ tmp = crc_rv; // Tmp uses it's original register again.
++#endif
++
++ // Restore original table address for tailLoop.
++ if (reconstructTableOffset != 0) {
++ addi(table, table, -reconstructTableOffset);
++ }
++
++ // Process last few (<complexThreshold) bytes of buffer.
++ BIND(L_tail);
++ update_byteLoop_crc32(crc, buf, len, table, data, false, false);
++
++ nand(crc, crc, crc); // ~c
++ BLOCK_COMMENT("} kernel_crc32_2word");
++}
++
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param table register pointing to CRC table
++ *
++ * uses R9..R12 as work register. Must be saved/restored by caller!
++ */
++void MacroAssembler::kernel_crc32_1word(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3) {
++ assert_different_registers(crc, buf, len, table);
++
++ Label L_mainLoop, L_tail;
++ Register tmp = t0;
++ Register data = t0;
++ Register tmp2 = t1;
++ const int mainLoop_stepping = 4;
++ const int tailLoop_stepping = 1;
++ const int log_stepping = exact_log2(mainLoop_stepping);
++ const int mainLoop_alignment = 32; // InputForNewCode > 4 ? InputForNewCode : 32;
++ const int complexThreshold = 2*mainLoop_stepping;
++
++ // Don't test for len <= 0 here. This pathological case should not occur anyway.
++ // Optimizing for it by adding a test and a branch seems to be a waste of CPU cycles.
++ // The situation itself is detected and handled correctly by the conditional branches
++ // following aghi(len, -stepping) and aghi(len, +stepping).
++ assert(tailLoop_stepping == 1, "check tailLoop_stepping!");
++
++ BLOCK_COMMENT("kernel_crc32_1word {");
++
++ nand(crc, crc, crc); // ~c
++
++ // Check for short (<mainLoop_stepping) buffer.
++ cmpdi(CCR0, len, complexThreshold);
++ blt(CCR0, L_tail);
++
++ // Pre-mainLoop alignment did show a slight (1%) positive effect on performance.
++ // We leave the code in for reference. Maybe we need alignment when we exploit vector instructions.
++ {
++ // Align buf addr to mainLoop_stepping boundary.
++ neg(tmp2, buf); // Calculate # preLoop iterations for alignment.
++ rldicl(tmp2, tmp2, 0, 64-log_stepping); // Rotate tmp2 0 bits, insert into tmp2, anding with mask with 1s from 62..63.
++
++ if (complexThreshold > mainLoop_stepping) {
++ sub(len, len, tmp2); // Remaining bytes for main loop (>=mainLoop_stepping is guaranteed).
++ } else {
++ sub(tmp, len, tmp2); // Remaining bytes for main loop.
++ cmpdi(CCR0, tmp, mainLoop_stepping);
++ blt(CCR0, L_tail); // For less than one mainloop_stepping left, do only tail processing
++ mr(len, tmp); // remaining bytes for main loop (>=mainLoop_stepping is guaranteed).
++ }
++ update_byteLoop_crc32(crc, buf, tmp2, table, data, false, false);
++ }
++
++ srdi(tmp2, len, log_stepping); // #iterations for mainLoop
++ andi(len, len, mainLoop_stepping-1); // remaining bytes for tailLoop
++ mtctr(tmp2);
++
++#ifdef VM_LITTLE_ENDIAN
++ Register crc_rv = crc;
++#else
++ Register crc_rv = tmp; // Load_reverse needs separate registers to work on.
++ // Occupies tmp, but frees up crc.
++ load_reverse_32(crc_rv, crc); // evert byte order because we are dealing with big-endian data.
++ tmp = crc;
++#endif
++
++ int reconstructTableOffset = crc32_table_columns(table, tc0, tc1, tc2, tc3);
++
++ align(mainLoop_alignment); // Octoword-aligned loop address. Shows 2% improvement.
++ BIND(L_mainLoop);
++ update_1word_crc32(crc_rv, buf, table, 0, mainLoop_stepping, crc_rv, t1, t2, t3, tc0, tc1, tc2, tc3);
++ bdnz(L_mainLoop);
++
++#ifndef VM_LITTLE_ENDIAN
++ load_reverse_32(crc, crc_rv); // Revert byte order because we are dealing with big-endian data.
++ tmp = crc_rv; // Tmp uses it's original register again.
++#endif
++
++ // Restore original table address for tailLoop.
++ if (reconstructTableOffset != 0) {
++ addi(table, table, -reconstructTableOffset);
++ }
++
++ // Process last few (<complexThreshold) bytes of buffer.
++ BIND(L_tail);
++ update_byteLoop_crc32(crc, buf, len, table, data, false, false);
++
++ nand(crc, crc, crc); // ~c
++ BLOCK_COMMENT("} kernel_crc32_1word");
++}
++
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param table register pointing to CRC table
++ *
++ * Uses R7_ARG5, R8_ARG6 as work registers.
++ */
++void MacroAssembler::kernel_crc32_1byte(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3) {
++ assert_different_registers(crc, buf, len, table);
++
++ Register data = t0; // Holds the current byte to be folded into crc.
++
++ BLOCK_COMMENT("kernel_crc32_1byte {");
++
++ // Process all bytes in a single-byte loop.
++ update_byteLoop_crc32(crc, buf, len, table, data, true, true);
++
++ BLOCK_COMMENT("} kernel_crc32_1byte");
++}
++
++void MacroAssembler::kernel_crc32_singleByte(Register crc, Register buf, Register len, Register table, Register tmp) {
++ assert_different_registers(crc, buf, /* len, not used!! */ table, tmp);
++
++ BLOCK_COMMENT("kernel_crc32_singleByte:");
++ nand(crc, crc, crc); // ~c
++
++ lbz(tmp, 0, buf); // Byte from buffer, zero-extended.
++ update_byte_crc32(crc, tmp, table);
++
++ nand(crc, crc, crc); // ~c
++}
++
+
+ void MacroAssembler::asm_assert(bool check_equal, const char *msg, int id) {
+ #ifdef ASSERT
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
+@@ -637,6 +637,27 @@
+ void char_arrays_equalsImm(Register str1_reg, Register str2_reg, int cntval, Register result_reg,
+ Register tmp1_reg, Register tmp2_reg);
+
++ // CRC32 Intrinsics.
++ void load_reverse_32(Register dst, Register src);
++ int crc32_table_columns(Register table, Register tc0, Register tc1, Register tc2, Register tc3);
++ void fold_byte_crc32(Register crc, Register val, Register table, Register tmp);
++ void fold_8bit_crc32(Register crc, Register table, Register tmp);
++ void update_byte_crc32(Register crc, Register val, Register table);
++ void update_byteLoop_crc32(Register crc, Register buf, Register len, Register table,
++ Register data, bool loopAlignment, bool invertCRC);
++ void update_1word_crc32(Register crc, Register buf, Register table, int bufDisp, int bufInc,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3);
++ void kernel_crc32_2word(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3);
++ void kernel_crc32_1word(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3);
++ void kernel_crc32_1byte(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3);
++ void kernel_crc32_singleByte(Register crc, Register buf, Register len, Register table, Register tmp);
++
+ //
+ // Debugging
+ //
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
+@@ -2473,6 +2473,54 @@
+ __ blr();
+ }
+
++ /**
++ * Arguments:
++ *
++ * Inputs:
++ * R3_ARG1 - int crc
++ * R4_ARG2 - byte* buf
++ * R5_ARG3 - int length (of buffer)
++ *
++ * scratch:
++ * R6_ARG4 - crc table address
++ * R7_ARG5 - tmp1
++ * R8_ARG6 - tmp2
++ *
++ * Ouput:
++ * R3_RET - int crc result
++ */
++ // Compute CRC32 function.
++ address generate_CRC32_updateBytes(const char* name) {
++ __ align(CodeEntryAlignment);
++ StubCodeMark mark(this, "StubRoutines", name);
++ address start = __ function_entry(); // Remember stub start address (is rtn value).
++
++ // arguments to kernel_crc32:
++ Register crc = R3_ARG1; // Current checksum, preset by caller or result from previous call.
++ Register data = R4_ARG2; // source byte array
++ Register dataLen = R5_ARG3; // #bytes to process
++ Register table = R6_ARG4; // crc table address
++
++ Register t0 = R9; // work reg for kernel* emitters
++ Register t1 = R10; // work reg for kernel* emitters
++ Register t2 = R11; // work reg for kernel* emitters
++ Register t3 = R12; // work reg for kernel* emitters
++
++ BLOCK_COMMENT("Stub body {");
++ assert_different_registers(crc, data, dataLen, table);
++
++ StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
++
++ __ kernel_crc32_1byte(crc, data, dataLen, table, t0, t1, t2, t3);
++
++ BLOCK_COMMENT("return");
++ __ mr_if_needed(R3_RET, crc); // Updated crc is function result. No copying required (R3_ARG1 == R3_RET).
++ __ blr();
++
++ BLOCK_COMMENT("} Stub body");
++ return start;
++ }
++
+ // Initialization
+ void generate_initial() {
+ // Generates all stubs and initializes the entry points
+@@ -2491,6 +2539,12 @@
+ StubRoutines::_throw_StackOverflowError_entry =
+ generate_throw_exception("StackOverflowError throw_exception",
+ CAST_FROM_FN_PTR(address, SharedRuntime::throw_StackOverflowError), false);
++
++ // CRC32 Intrinsics.
++ if (UseCRC32Intrinsics) {
++ StubRoutines::_crc_table_adr = (address)StubRoutines::ppc64::_crc_table;
++ StubRoutines::_updateBytesCRC32 = generate_CRC32_updateBytes("CRC32_updateBytes");
++ }
+ }
+
+ void generate_all() {
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
+@@ -1,6 +1,6 @@
+ /*
+- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+- * Copyright 2012, 2014 SAP AG. All rights reserved.
++ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 2018 SAP SE. 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
+@@ -23,7 +23,457 @@
+ *
+ */
+
++#include "asm/macroAssembler.inline.hpp"
++#include "runtime/stubRoutines.hpp"
++
+ // Implementation of the platform-specific part of StubRoutines - for
+ // a description of how to extend it, see the stubRoutines.hpp file.
+
+
++#define __ masm->
++
++// CRC32 Intrinsics.
++void StubRoutines::ppc64::generate_load_crc_table_addr(MacroAssembler* masm, Register table) {
++ __ load_const(table, StubRoutines::_crc_table_adr);
++}
++
++// CRC32 Intrinsics.
++/**
++ * crc_table[] from jdk/src/share/native/java/util/zip/zlib-1.2.8/crc32.h
++ */
++juint StubRoutines::ppc64::_crc_table[CRC32_TABLES][CRC32_COLUMN_SIZE] = {
++ {
++ 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
++ 0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
++ 0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
++ 0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
++ 0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
++ 0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
++ 0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
++ 0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
++ 0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
++ 0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
++ 0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
++ 0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
++ 0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
++ 0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
++ 0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
++ 0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
++ 0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
++ 0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
++ 0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
++ 0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
++ 0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
++ 0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
++ 0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
++ 0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
++ 0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
++ 0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
++ 0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
++ 0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
++ 0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
++ 0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
++ 0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
++ 0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
++ 0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
++ 0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
++ 0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
++ 0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
++ 0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
++ 0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
++ 0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
++ 0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
++ 0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
++ 0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
++ 0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
++ 0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
++ 0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
++ 0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
++ 0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
++ 0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
++ 0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
++ 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
++ 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
++ 0x2d02ef8dUL
++#ifdef CRC32_BYFOUR
++ },
++ {
++ 0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
++ 0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
++ 0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
++ 0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
++ 0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
++ 0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
++ 0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
++ 0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
++ 0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
++ 0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
++ 0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
++ 0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
++ 0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
++ 0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
++ 0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
++ 0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
++ 0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
++ 0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
++ 0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
++ 0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
++ 0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
++ 0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
++ 0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
++ 0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
++ 0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
++ 0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
++ 0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
++ 0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
++ 0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
++ 0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
++ 0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
++ 0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
++ 0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
++ 0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
++ 0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
++ 0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
++ 0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
++ 0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
++ 0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
++ 0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
++ 0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
++ 0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
++ 0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
++ 0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
++ 0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
++ 0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
++ 0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
++ 0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
++ 0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
++ 0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
++ 0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
++ 0x9324fd72UL
++ },
++ {
++ 0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
++ 0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
++ 0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
++ 0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
++ 0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
++ 0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
++ 0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
++ 0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
++ 0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
++ 0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
++ 0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
++ 0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
++ 0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
++ 0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
++ 0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
++ 0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
++ 0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
++ 0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
++ 0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
++ 0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
++ 0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
++ 0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
++ 0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
++ 0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
++ 0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
++ 0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
++ 0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
++ 0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
++ 0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
++ 0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
++ 0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
++ 0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
++ 0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
++ 0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
++ 0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
++ 0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
++ 0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
++ 0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
++ 0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
++ 0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
++ 0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
++ 0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
++ 0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
++ 0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
++ 0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
++ 0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
++ 0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
++ 0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
++ 0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
++ 0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
++ 0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
++ 0xbe9834edUL
++ },
++ {
++ 0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
++ 0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
++ 0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
++ 0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
++ 0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
++ 0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
++ 0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
++ 0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
++ 0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
++ 0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
++ 0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
++ 0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
++ 0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
++ 0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
++ 0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
++ 0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
++ 0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
++ 0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
++ 0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
++ 0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
++ 0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
++ 0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
++ 0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
++ 0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
++ 0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
++ 0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
++ 0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
++ 0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
++ 0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
++ 0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
++ 0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
++ 0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
++ 0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
++ 0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
++ 0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
++ 0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
++ 0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
++ 0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
++ 0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
++ 0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
++ 0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
++ 0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
++ 0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
++ 0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
++ 0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
++ 0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
++ 0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
++ 0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
++ 0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
++ 0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
++ 0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
++ 0xde0506f1UL
++ },
++ {
++ 0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
++ 0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
++ 0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
++ 0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
++ 0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
++ 0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
++ 0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
++ 0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
++ 0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
++ 0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
++ 0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
++ 0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
++ 0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
++ 0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
++ 0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
++ 0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
++ 0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
++ 0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
++ 0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
++ 0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
++ 0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
++ 0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
++ 0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
++ 0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
++ 0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
++ 0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
++ 0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
++ 0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
++ 0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
++ 0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
++ 0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
++ 0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
++ 0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
++ 0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
++ 0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
++ 0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
++ 0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
++ 0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
++ 0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
++ 0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
++ 0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
++ 0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
++ 0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
++ 0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
++ 0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
++ 0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
++ 0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
++ 0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
++ 0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
++ 0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
++ 0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
++ 0x8def022dUL
++ },
++ {
++ 0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
++ 0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
++ 0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
++ 0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
++ 0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
++ 0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
++ 0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
++ 0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
++ 0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
++ 0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
++ 0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
++ 0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
++ 0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
++ 0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
++ 0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
++ 0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
++ 0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
++ 0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
++ 0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
++ 0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
++ 0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
++ 0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
++ 0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
++ 0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
++ 0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
++ 0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
++ 0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
++ 0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
++ 0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
++ 0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
++ 0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
++ 0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
++ 0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
++ 0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
++ 0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
++ 0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
++ 0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
++ 0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
++ 0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
++ 0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
++ 0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
++ 0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
++ 0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
++ 0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
++ 0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
++ 0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
++ 0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
++ 0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
++ 0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
++ 0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
++ 0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
++ 0x72fd2493UL
++ },
++ {
++ 0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
++ 0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
++ 0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
++ 0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
++ 0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
++ 0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
++ 0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
++ 0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
++ 0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
++ 0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
++ 0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
++ 0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
++ 0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
++ 0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
++ 0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
++ 0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
++ 0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
++ 0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
++ 0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
++ 0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
++ 0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
++ 0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
++ 0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
++ 0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
++ 0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
++ 0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
++ 0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
++ 0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
++ 0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
++ 0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
++ 0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
++ 0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
++ 0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
++ 0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
++ 0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
++ 0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
++ 0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
++ 0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
++ 0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
++ 0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
++ 0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
++ 0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
++ 0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
++ 0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
++ 0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
++ 0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
++ 0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
++ 0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
++ 0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
++ 0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
++ 0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
++ 0xed3498beUL
++ },
++ {
++ 0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
++ 0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
++ 0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
++ 0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
++ 0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
++ 0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
++ 0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
++ 0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
++ 0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
++ 0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
++ 0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
++ 0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
++ 0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
++ 0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
++ 0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
++ 0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
++ 0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
++ 0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
++ 0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
++ 0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
++ 0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
++ 0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
++ 0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
++ 0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
++ 0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
++ 0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
++ 0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
++ 0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
++ 0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
++ 0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
++ 0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
++ 0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
++ 0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
++ 0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
++ 0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
++ 0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
++ 0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
++ 0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
++ 0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
++ 0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
++ 0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
++ 0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
++ 0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
++ 0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
++ 0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
++ 0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
++ 0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
++ 0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
++ 0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
++ 0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
++ 0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
++ 0xf10605deUL
++#endif
++ }
++};
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
+@@ -1,6 +1,6 @@
+ /*
+- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+- * Copyright 2012, 2013 SAP AG. All rights reserved.
++ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 2018 SAP SE. 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
+@@ -30,11 +30,35 @@
+ // definition. See stubRoutines.hpp for a description on how to
+ // extend it.
+
+-static bool returns_to_call_stub(address return_pc) { return return_pc == _call_stub_return_address; }
++static bool returns_to_call_stub(address return_pc) { return return_pc == _call_stub_return_address; }
+
+ enum platform_dependent_constants {
+ code_size1 = 20000, // simply increase if too small (assembler will crash if too small)
+ code_size2 = 20000 // simply increase if too small (assembler will crash if too small)
+ };
+
++// CRC32 Intrinsics.
++#define CRC32_COLUMN_SIZE 256
++#define CRC32_BYFOUR
++#ifdef CRC32_BYFOUR
++ #define CRC32_TABLES 8
++#else
++ #define CRC32_TABLES 1
++#endif
++
++class ppc64 {
++ friend class StubGenerator;
++
++ private:
++
++ // CRC32 Intrinsics.
++ static juint _crc_table[CRC32_TABLES][CRC32_COLUMN_SIZE];
++
++ public:
++
++ // CRC32 Intrinsics.
++ static void generate_load_crc_table_addr(MacroAssembler* masm, Register table);
++
++};
++
+ #endif // CPU_PPC_VM_STUBROUTINES_PPC_64_HPP
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp
+@@ -57,7 +57,7 @@
+ #define BLOCK_COMMENT(str) __ block_comment(str)
+ #endif
+
+-#define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
++#define BIND(label) __ bind(label); BLOCK_COMMENT(#label ":")
+
+ //-----------------------------------------------------------------------------
+
+@@ -783,7 +783,7 @@
+ }
+ generate_counter_incr(&invocation_counter_overflow, NULL, NULL);
+
+- __ BIND(continue_after_compile);
++ BIND(continue_after_compile);
+ // Reset the _do_not_unlock_if_synchronized flag.
+ if (synchronized) {
+ __ li(R0, 0);
+@@ -843,7 +843,7 @@
+ __ ld(signature_handler_fd, method_(signature_handler));
+ __ twi_0(signature_handler_fd); // Order wrt. load of klass mirror and entry point (isync is below).
+
+- __ BIND(call_signature_handler);
++ BIND(call_signature_handler);
+
+ // Before we call the signature handler we push a new frame to
+ // protect the interpreter frame volatile registers when we return
+@@ -913,7 +913,7 @@
+ __ std(R0/*mirror*/, _ijava_state_neg(oop_tmp), R11_scratch1);
+ // R4_ARG2 = &state->_oop_temp;
+ __ addi(R4_ARG2, R11_scratch1, _ijava_state_neg(oop_tmp));
+- __ BIND(method_is_not_static);
++ BIND(method_is_not_static);
+ }
+
+ // At this point, arguments have been copied off the stack into
+@@ -1126,14 +1126,14 @@
+ // interpreter will do the correct thing. If it isn't interpreted
+ // (call stub/compiled code) we will change our return and continue.
+
+- __ BIND(exception_return_sync_check);
++ BIND(exception_return_sync_check);
+
+ if (synchronized) {
+ // Don't check for exceptions since we're still in the i2n frame. Do that
+ // manually afterwards.
+ unlock_method(false);
+ }
+- __ BIND(exception_return_sync_check_already_unlocked);
++ BIND(exception_return_sync_check_already_unlocked);
+
+ const Register return_pc = R31;
+
+@@ -1327,6 +1327,12 @@
+ case Interpreter::java_lang_math_exp : entry_point = ((InterpreterGenerator*) this)->generate_math_entry(kind); break;
+ case Interpreter::java_lang_ref_reference_get
+ : entry_point = ((InterpreterGenerator*)this)->generate_Reference_get_entry(); break;
++ case Interpreter::java_util_zip_CRC32_update
++ : entry_point = ((InterpreterGenerator*)this)->generate_CRC32_update_entry(); break;
++ case Interpreter::java_util_zip_CRC32_updateBytes
++ : // fall thru
++ case Interpreter::java_util_zip_CRC32_updateByteBuffer
++ : entry_point = ((InterpreterGenerator*)this)->generate_CRC32_updateBytes_entry(kind); break;
+ default : ShouldNotReachHere(); break;
+ }
+
+@@ -1337,6 +1343,179 @@
+ return ((InterpreterGenerator*) this)->generate_normal_entry(synchronized);
+ }
+
++// CRC32 Intrinsics.
++//
++// Contract on scratch and work registers.
++// =======================================
++//
++// On ppc, the register set {R2..R12} is available in the interpreter as scratch/work registers.
++// You should, however, keep in mind that {R3_ARG1..R10_ARG8} is the C-ABI argument register set.
++// You can't rely on these registers across calls.
++//
++// The generators for CRC32_update and for CRC32_updateBytes use the
++// scratch/work register set internally, passing the work registers
++// as arguments to the MacroAssembler emitters as required.
++//
++// R3_ARG1..R6_ARG4 are preset to hold the incoming java arguments.
++// Their contents is not constant but may change according to the requirements
++// of the emitted code.
++//
++// All other registers from the scratch/work register set are used "internally"
++// and contain garbage (i.e. unpredictable values) once blr() is reached.
++// Basically, only R3_RET contains a defined value which is the function result.
++//
++/**
++ * Method entry for static native methods:
++ * int java.util.zip.CRC32.update(int crc, int b)
++ */
++address InterpreterGenerator::generate_CRC32_update_entry() {
++ address start = __ pc(); // Remember stub start address (is rtn value).
++
++ if (UseCRC32Intrinsics) {
++ Label slow_path;
++
++ // Safepoint check
++ const Register sync_state = R11_scratch1;
++ int sync_state_offs = __ load_const_optimized(sync_state, SafepointSynchronize::address_of_state(), /*temp*/R0, true);
++ __ lwz(sync_state, sync_state_offs, sync_state);
++ __ cmpwi(CCR0, sync_state, SafepointSynchronize::_not_synchronized);
++ __ bne(CCR0, slow_path);
++
++ // We don't generate local frame and don't align stack because
++ // we not even call stub code (we generate the code inline)
++ // and there is no safepoint on this path.
++
++ // Load java parameters.
++ // R15_esp is callers operand stack pointer, i.e. it points to the parameters.
++ const Register argP = R15_esp;
++ const Register crc = R3_ARG1; // crc value
++ const Register data = R4_ARG2; // address of java byte value (kernel_crc32 needs address)
++ const Register dataLen = R5_ARG3; // source data len (1 byte). Not used because calling the single-byte emitter.
++ const Register table = R6_ARG4; // address of crc32 table
++ const Register tmp = dataLen; // Reuse unused len register to show we don't actually need a separate tmp here.
++
++ BLOCK_COMMENT("CRC32_update {");
++
++ // Arguments are reversed on java expression stack
++#ifdef VM_LITTLE_ENDIAN
++ __ addi(data, argP, 0+1*wordSize); // (stack) address of byte value. Emitter expects address, not value.
++ // Being passed as an int, the single byte is at offset +0.
++#else
++ __ addi(data, argP, 3+1*wordSize); // (stack) address of byte value. Emitter expects address, not value.
++ // Being passed from java as an int, the single byte is at offset +3.
++#endif
++ __ lwz(crc, 2*wordSize, argP); // Current crc state, zero extend to 64 bit to have a clean register.
++
++ StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
++ __ kernel_crc32_singleByte(crc, data, dataLen, table, tmp);
++
++ // Restore caller sp for c2i case and return.
++ __ mr(R1_SP, R21_sender_SP); // Cut the stack back to where the caller started.
++ __ blr();
++
++ // Generate a vanilla native entry as the slow path.
++ BLOCK_COMMENT("} CRC32_update");
++ BIND(slow_path);
++ }
++
++ (void) generate_native_entry(false);
++
++ return start;
++}
++
++// CRC32 Intrinsics.
++/**
++ * Method entry for static native methods:
++ * int java.util.zip.CRC32.updateBytes( int crc, byte[] b, int off, int len)
++ * int java.util.zip.CRC32.updateByteBuffer(int crc, long* buf, int off, int len)
++ */
++address InterpreterGenerator::generate_CRC32_updateBytes_entry(AbstractInterpreter::MethodKind kind) {
++ address start = __ pc(); // Remember stub start address (is rtn value).
++
++ if (UseCRC32Intrinsics) {
++ Label slow_path;
++
++ // Safepoint check
++ const Register sync_state = R11_scratch1;
++ int sync_state_offs = __ load_const_optimized(sync_state, SafepointSynchronize::address_of_state(), /*temp*/R0, true);
++ __ lwz(sync_state, sync_state_offs, sync_state);
++ __ cmpwi(CCR0, sync_state, SafepointSynchronize::_not_synchronized);
++ __ bne(CCR0, slow_path);
++
++ // We don't generate local frame and don't align stack because
++ // we not even call stub code (we generate the code inline)
++ // and there is no safepoint on this path.
++
++ // Load parameters.
++ // Z_esp is callers operand stack pointer, i.e. it points to the parameters.
++ const Register argP = R15_esp;
++ const Register crc = R3_ARG1; // crc value
++ const Register data = R4_ARG2; // address of java byte array
++ const Register dataLen = R5_ARG3; // source data len
++ const Register table = R6_ARG4; // address of crc32 table
++
++ const Register t0 = R9; // scratch registers for crc calculation
++ const Register t1 = R10;
++ const Register t2 = R11;
++ const Register t3 = R12;
++
++ const Register tc0 = R2; // registers to hold pre-calculated column addresses
++ const Register tc1 = R7;
++ const Register tc2 = R8;
++ const Register tc3 = table; // table address is reconstructed at the end of kernel_crc32_* emitters
++
++ const Register tmp = t0; // Only used very locally to calculate byte buffer address.
++
++ // Arguments are reversed on java expression stack.
++ // Calculate address of start element.
++ if (kind == Interpreter::java_util_zip_CRC32_updateByteBuffer) { // Used for "updateByteBuffer direct".
++ BLOCK_COMMENT("CRC32_updateByteBuffer {");
++ // crc @ (SP + 5W) (32bit)
++ // buf @ (SP + 3W) (64bit ptr to long array)
++ // off @ (SP + 2W) (32bit)
++ // dataLen @ (SP + 1W) (32bit)
++ // data = buf + off
++ __ ld( data, 3*wordSize, argP); // start of byte buffer
++ __ lwa( tmp, 2*wordSize, argP); // byte buffer offset
++ __ lwa( dataLen, 1*wordSize, argP); // #bytes to process
++ __ lwz( crc, 5*wordSize, argP); // current crc state
++ __ add( data, data, tmp); // Add byte buffer offset.
++ } else { // Used for "updateBytes update".
++ BLOCK_COMMENT("CRC32_updateBytes {");
++ // crc @ (SP + 4W) (32bit)
++ // buf @ (SP + 3W) (64bit ptr to byte array)
++ // off @ (SP + 2W) (32bit)
++ // dataLen @ (SP + 1W) (32bit)
++ // data = buf + off + base_offset
++ __ ld( data, 3*wordSize, argP); // start of byte buffer
++ __ lwa( tmp, 2*wordSize, argP); // byte buffer offset
++ __ lwa( dataLen, 1*wordSize, argP); // #bytes to process
++ __ add( data, data, tmp); // add byte buffer offset
++ __ lwz( crc, 4*wordSize, argP); // current crc state
++ __ addi(data, data, arrayOopDesc::base_offset_in_bytes(T_BYTE));
++ }
++
++ StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
++
++ // Performance measurements show the 1word and 2word variants to be almost equivalent,
++ // with very light advantages for the 1word variant. We chose the 1word variant for
++ // code compactness.
++ __ kernel_crc32_1word(crc, data, dataLen, table, t0, t1, t2, t3, tc0, tc1, tc2, tc3);
++
++ // Restore caller sp for c2i case and return.
++ __ mr(R1_SP, R21_sender_SP); // Cut the stack back to where the caller started.
++ __ blr();
++
++ // Generate a vanilla native entry as the slow path.
++ BLOCK_COMMENT("} CRC32_updateBytes(Buffer)");
++ BIND(slow_path);
++ }
++
++ (void) generate_native_entry(false);
++
++ return start;
++}
++
+ // These should never be compiled since the interpreter will prefer
+ // the compiled version to the intrinsic version.
+ bool AbstractInterpreter::can_be_compiled(methodHandle m) {
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
+@@ -150,10 +150,12 @@
+
+ assert(AllocatePrefetchStyle >= 0, "AllocatePrefetchStyle should be positive");
+
+- if (UseCRC32Intrinsics) {
+- if (!FLAG_IS_DEFAULT(UseCRC32Intrinsics))
+- warning("CRC32 intrinsics are not available on this CPU");
+- FLAG_SET_DEFAULT(UseCRC32Intrinsics, false);
++ // Implementation does not use any of the vector instructions
++ // available with Power8. Their exploitation is still pending.
++ if (!UseCRC32Intrinsics) {
++ if (FLAG_IS_DEFAULT(UseCRC32Intrinsics)) {
++ FLAG_SET_DEFAULT(UseCRC32Intrinsics, true);
++ }
+ }
+
+ // The AES intrinsic stubs require AES instruction support.
+diff --git openjdk.orig/hotspot/src/share/vm/opto/library_call.cpp openjdk/hotspot/src/share/vm/opto/library_call.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/library_call.cpp
++++ openjdk/hotspot/src/share/vm/opto/library_call.cpp
+@@ -6225,10 +6225,16 @@
+ // Call the stub.
+ address stubAddr = StubRoutines::updateBytesCRC32();
+ const char *stubName = "updateBytesCRC32";
+-
+- Node* call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
+- stubAddr, stubName, TypePtr::BOTTOM,
+- crc, src_start, length);
++ Node* call;
++ if (CCallingConventionRequiresIntsAsLongs) {
++ call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
++ stubAddr, stubName, TypePtr::BOTTOM,
++ crc XTOP, src_start, length XTOP);
++ } else {
++ call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
++ stubAddr, stubName, TypePtr::BOTTOM,
++ crc, src_start, length);
++ }
+ Node* result = _gvn.transform(new (C) ProjNode(call, TypeFunc::Parms));
+ set_result(result);
+ return true;
+@@ -6257,10 +6263,16 @@
+ // Call the stub.
+ address stubAddr = StubRoutines::updateBytesCRC32();
+ const char *stubName = "updateBytesCRC32";
+-
+- Node* call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
+- stubAddr, stubName, TypePtr::BOTTOM,
+- crc, src_start, length);
++ Node* call;
++ if (CCallingConventionRequiresIntsAsLongs) {
++ call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
++ stubAddr, stubName, TypePtr::BOTTOM,
++ crc XTOP, src_start, length XTOP);
++ } else {
++ call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
++ stubAddr, stubName, TypePtr::BOTTOM,
++ crc, src_start, length);
++ }
+ Node* result = _gvn.transform(new (C) ProjNode(call, TypeFunc::Parms));
+ set_result(result);
+ return true;
+diff --git openjdk.orig/hotspot/src/share/vm/opto/runtime.cpp openjdk/hotspot/src/share/vm/opto/runtime.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/runtime.cpp
++++ openjdk/hotspot/src/share/vm/opto/runtime.cpp
+@@ -848,13 +848,24 @@
+ */
+ const TypeFunc* OptoRuntime::updateBytesCRC32_Type() {
+ // create input type (domain)
+- int num_args = 3;
++ int num_args = 3;
+ int argcnt = num_args;
++ if (CCallingConventionRequiresIntsAsLongs) {
++ argcnt += 2;
++ }
+ const Type** fields = TypeTuple::fields(argcnt);
+ int argp = TypeFunc::Parms;
+- fields[argp++] = TypeInt::INT; // crc
+- fields[argp++] = TypePtr::NOTNULL; // src
+- fields[argp++] = TypeInt::INT; // len
++ if (CCallingConventionRequiresIntsAsLongs) {
++ fields[argp++] = TypeLong::LONG; // crc
++ fields[argp++] = Type::HALF;
++ fields[argp++] = TypePtr::NOTNULL; // src
++ fields[argp++] = TypeLong::LONG; // len
++ fields[argp++] = Type::HALF;
++ } else {
++ fields[argp++] = TypeInt::INT; // crc
++ fields[argp++] = TypePtr::NOTNULL; // src
++ fields[argp++] = TypeInt::INT; // len
++ }
+ assert(argp == TypeFunc::Parms+argcnt, "correct decoding");
+ const TypeTuple* domain = TypeTuple::make(TypeFunc::Parms+argcnt, fields);
+
diff --git a/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch b/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch
new file mode 100644
index 0000000..f1e3215
--- /dev/null
+++ b/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch
@@ -0,0 +1,55 @@
+# HG changeset patch
+# User coleenp
+# Date 1525713256 -3600
+# Mon May 07 18:14:16 2018 +0100
+# Node ID bcbc64dfb629c5f188bbf59b8f986ad95963ed60
+# Parent 07a1135a327362f157955d470fad5df07cc35164
+8141570, PR3548: Fix Zero interpreter build for --disable-precompiled-headers
+Summary: change to include atomic.inline.hpp and allocation.inline.hpp only in .cpp files and some build fixes from Kim to build on ubuntu without devkits
+Reviewed-by: kbarrett, sgehwolf, erikj
+
+diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
+--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ # Copyright 2007, 2008 Red Hat, Inc.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+@@ -25,8 +25,15 @@
+
+ # Setup common to Zero (non-Shark) and Shark versions of VM
+
+-# override this from the main file because some version of llvm do not like -Wundef
+-WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wunused-function -Wunused-value
++# Some versions of llvm do not like -Wundef
++ifeq ($(USE_CLANG), true)
++ WARNING_FLAGS += -Wno-undef
++endif
++# Suppress some warning flags that are normally turned on for hotspot,
++# because some of the zero code has not been updated accordingly.
++WARNING_FLAGS += -Wno-return-type \
++ -Wno-format-nonliteral -Wno-format-security \
++ -Wno-maybe-uninitialized
+
+ # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+@@ -42,5 +49,3 @@
+ ifeq ($(ARCH_DATA_MODEL), 64)
+ CFLAGS += -D_LP64=1
+ endif
+-
+-OPT_CFLAGS/compactingPermGenGen.o = -O1
+diff --git openjdk.orig/hotspot/src/share/vm/runtime/java.cpp openjdk/hotspot/src/share/vm/runtime/java.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/java.cpp
++++ openjdk/hotspot/src/share/vm/runtime/java.cpp
+@@ -45,6 +45,7 @@
+ #include "runtime/arguments.hpp"
+ #include "runtime/biasedLocking.hpp"
+ #include "runtime/compilationPolicy.hpp"
++#include "runtime/deoptimization.hpp"
+ #include "runtime/fprofiler.hpp"
+ #include "runtime/init.hpp"
+ #include "runtime/interfaceSupport.hpp"
diff --git a/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch b/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
new file mode 100644
index 0000000..b0a88ea
--- /dev/null
+++ b/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
@@ -0,0 +1,146 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1525714161 -3600
+# Mon May 07 18:29:21 2018 +0100
+# Node ID afb31413c73cbc06420fdb447aa90a7a38258904
+# Parent bcbc64dfb629c5f188bbf59b8f986ad95963ed60
+8143245, PR3548: Zero build requires disabled warnings
+Reviewed-by: dholmes, coleenp
+
+diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
+--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ # Copyright 2007, 2008 Red Hat, Inc.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+@@ -29,11 +29,6 @@
+ ifeq ($(USE_CLANG), true)
+ WARNING_FLAGS += -Wno-undef
+ endif
+-# Suppress some warning flags that are normally turned on for hotspot,
+-# because some of the zero code has not been updated accordingly.
+-WARNING_FLAGS += -Wno-return-type \
+- -Wno-format-nonliteral -Wno-format-security \
+- -Wno-maybe-uninitialized
+
+ # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+diff --git openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+--- openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
++++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+@@ -100,7 +100,7 @@
+ case T_DOUBLE:
+ case T_VOID:
+ return result;
+- default : ShouldNotReachHere();
++ default : ShouldNotReachHere(); return NULL_WORD;
+ }
+ }
+
+diff --git openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
+--- openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
++++ openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2007, 2008, 2010 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+@@ -62,7 +62,7 @@
+ }
+
+ void InterpreterRuntime::SignatureHandlerGeneratorBase::push(BasicType type) {
+- ffi_type *ftype;
++ ffi_type *ftype = NULL;
+ switch (type) {
+ case T_VOID:
+ ftype = &ffi_type_void;
+diff --git a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+@@ -1,6 +1,6 @@
+ /*
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+- * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
++ * Copyright 2016 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
+@@ -61,6 +61,7 @@
+
+ frame os::get_sender_for_C_frame(frame* fr) {
+ ShouldNotCallThis();
++ return frame(NULL, NULL); // silence compile warning.
+ }
+
+ frame os::current_frame() {
+@@ -98,16 +99,19 @@
+
+ address os::Linux::ucontext_get_pc(ucontext_t* uc) {
+ ShouldNotCallThis();
++ return NULL; // silence compile warnings
+ }
+
+ ExtendedPC os::fetch_frame_from_context(void* ucVoid,
+ intptr_t** ret_sp,
+ intptr_t** ret_fp) {
+ ShouldNotCallThis();
++ return NULL; // silence compile warnings
+ }
+
+ frame os::fetch_frame_from_context(void* ucVoid) {
+ ShouldNotCallThis();
++ return frame(NULL, NULL); // silence compile warnings
+ }
+
+ extern "C" JNIEXPORT int
+@@ -247,11 +251,16 @@
+ }
+ #endif // !PRODUCT
+
+- const char *fmt = "caught unhandled signal %d";
+ char buf[64];
+
+- sprintf(buf, fmt, sig);
++ sprintf(buf, "caught unhandled signal %d", sig);
++
++// Silence -Wformat-security warning for fatal()
++PRAGMA_DIAG_PUSH
++PRAGMA_FORMAT_NONLITERAL_IGNORED
+ fatal(buf);
++PRAGMA_DIAG_POP
++ return true; // silence compiler warnings
+ }
+
+ void os::Linux::init_thread_fpu_state(void) {
+@@ -260,6 +269,7 @@
+
+ int os::Linux::get_fpu_control_word() {
+ ShouldNotCallThis();
++ return -1; // silence compile warnings
+ }
+
+ void os::Linux::set_fpu_control_word(int fpu) {
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+@@ -110,6 +110,7 @@
+ void* ucontext,
+ bool isInJava) {
+ ShouldNotCallThis();
++ return false; // silence compile warning
+ }
+
+ // These routines are only used on cpu architectures that
diff --git a/jdk8145096-pr3693-undefined_behaviour.patch b/jdk8145096-pr3693-undefined_behaviour.patch
new file mode 100644
index 0000000..51aed3c
--- /dev/null
+++ b/jdk8145096-pr3693-undefined_behaviour.patch
@@ -0,0 +1,280 @@
+# HG changeset patch
+# User aph
+# Date 1549014450 -3600
+# Fri Feb 01 10:47:30 2019 +0100
+# Node ID f43f77de876acfbf29c02803418d4d06d83e7dc3
+# Parent 28f68e5c6fb323c521a489cfc92e8a129379378f
+8145096: Undefined behaviour in HotSpot
+Summary: Fix some integer overflows
+Reviewed-by: jrose, kvn, kbarrett, adinn, iklam
+
+diff --git openjdk.orig/hotspot/src/os/posix/vm/os_posix.cpp openjdk/hotspot/src/os/posix/vm/os_posix.cpp
+--- openjdk.orig/hotspot/src/os/posix/vm/os_posix.cpp
++++ openjdk/hotspot/src/os/posix/vm/os_posix.cpp
+@@ -604,7 +604,11 @@
+ strncpy(buffer, "none", size);
+
+ const struct {
+- int i;
++ // NB: i is an unsigned int here because SA_RESETHAND is on some
++ // systems 0x80000000, which is implicitly unsigned. Assignining
++ // it to an int field would be an overflow in unsigned-to-signed
++ // conversion.
++ unsigned int i;
+ const char* s;
+ } flaginfo [] = {
+ { SA_NOCLDSTOP, "SA_NOCLDSTOP" },
+diff --git openjdk.orig/hotspot/src/share/vm/opto/addnode.cpp openjdk/hotspot/src/share/vm/opto/addnode.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/addnode.cpp
++++ openjdk/hotspot/src/share/vm/opto/addnode.cpp
+@@ -344,8 +344,8 @@
+ const Type *AddINode::add_ring( const Type *t0, const Type *t1 ) const {
+ const TypeInt *r0 = t0->is_int(); // Handy access
+ const TypeInt *r1 = t1->is_int();
+- int lo = r0->_lo + r1->_lo;
+- int hi = r0->_hi + r1->_hi;
++ int lo = java_add(r0->_lo, r1->_lo);
++ int hi = java_add(r0->_hi, r1->_hi);
+ if( !(r0->is_con() && r1->is_con()) ) {
+ // Not both constants, compute approximate result
+ if( (r0->_lo & r1->_lo) < 0 && lo >= 0 ) {
+@@ -462,8 +462,8 @@
+ const Type *AddLNode::add_ring( const Type *t0, const Type *t1 ) const {
+ const TypeLong *r0 = t0->is_long(); // Handy access
+ const TypeLong *r1 = t1->is_long();
+- jlong lo = r0->_lo + r1->_lo;
+- jlong hi = r0->_hi + r1->_hi;
++ jlong lo = java_add(r0->_lo, r1->_lo);
++ jlong hi = java_add(r0->_hi, r1->_hi);
+ if( !(r0->is_con() && r1->is_con()) ) {
+ // Not both constants, compute approximate result
+ if( (r0->_lo & r1->_lo) < 0 && lo >= 0 ) {
+diff --git openjdk.orig/hotspot/src/share/vm/opto/loopTransform.cpp openjdk/hotspot/src/share/vm/opto/loopTransform.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/loopTransform.cpp
++++ openjdk/hotspot/src/share/vm/opto/loopTransform.cpp
+@@ -1310,8 +1310,8 @@
+ limit = new (C) Opaque2Node( C, limit );
+ register_new_node( limit, opaq_ctrl );
+ }
+- if (stride_con > 0 && ((limit_type->_lo - stride_con) < limit_type->_lo) ||
+- stride_con < 0 && ((limit_type->_hi - stride_con) > limit_type->_hi)) {
++ if (stride_con > 0 && (java_subtract(limit_type->_lo, stride_con) < limit_type->_lo) ||
++ stride_con < 0 && (java_subtract(limit_type->_hi, stride_con) > limit_type->_hi)) {
+ // No underflow.
+ new_limit = new (C) SubINode(limit, stride);
+ } else {
+diff --git openjdk.orig/hotspot/src/share/vm/opto/mulnode.cpp openjdk/hotspot/src/share/vm/opto/mulnode.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/mulnode.cpp
++++ openjdk/hotspot/src/share/vm/opto/mulnode.cpp
+@@ -244,13 +244,13 @@
+ double d = (double)hi1;
+
+ // Compute all endpoints & check for overflow
+- int32 A = lo0*lo1;
++ int32 A = java_multiply(lo0, lo1);
+ if( (double)A != a*c ) return TypeInt::INT; // Overflow?
+- int32 B = lo0*hi1;
++ int32 B = java_multiply(lo0, hi1);
+ if( (double)B != a*d ) return TypeInt::INT; // Overflow?
+- int32 C = hi0*lo1;
++ int32 C = java_multiply(hi0, lo1);
+ if( (double)C != b*c ) return TypeInt::INT; // Overflow?
+- int32 D = hi0*hi1;
++ int32 D = java_multiply(hi0, hi1);
+ if( (double)D != b*d ) return TypeInt::INT; // Overflow?
+
+ if( A < B ) { lo0 = A; hi0 = B; } // Sort range endpoints
+@@ -340,13 +340,13 @@
+ double d = (double)hi1;
+
+ // Compute all endpoints & check for overflow
+- jlong A = lo0*lo1;
++ jlong A = java_multiply(lo0, lo1);
+ if( (double)A != a*c ) return TypeLong::LONG; // Overflow?
+- jlong B = lo0*hi1;
++ jlong B = java_multiply(lo0, hi1);
+ if( (double)B != a*d ) return TypeLong::LONG; // Overflow?
+- jlong C = hi0*lo1;
++ jlong C = java_multiply(hi0, lo1);
+ if( (double)C != b*c ) return TypeLong::LONG; // Overflow?
+- jlong D = hi0*hi1;
++ jlong D = java_multiply(hi0, hi1);
+ if( (double)D != b*d ) return TypeLong::LONG; // Overflow?
+
+ if( A < B ) { lo0 = A; hi0 = B; } // Sort range endpoints
+@@ -573,7 +573,8 @@
+ // Masking off high bits which are always zero is useless.
+ const TypeLong* t1 = phase->type( in(1) )->isa_long();
+ if (t1 != NULL && t1->_lo >= 0) {
+- jlong t1_support = ((jlong)1 << (1 + log2_long(t1->_hi))) - 1;
++ int bit_count = log2_long(t1->_hi) + 1;
++ jlong t1_support = jlong(max_julong >> (BitsPerJavaLong - bit_count));
+ if ((t1_support & con) == t1_support)
+ return usr;
+ }
+@@ -801,7 +802,7 @@
+
+ // Check for ((x & ((CONST64(1)<<(64-c0))-1)) << c0) which ANDs off high bits
+ // before shifting them away.
+- const jlong bits_mask = ((jlong)CONST64(1) << (jlong)(BitsPerJavaLong - con)) - CONST64(1);
++ const jlong bits_mask = jlong(max_julong >> con);
+ if( add1_op == Op_AndL &&
+ phase->type(add1->in(2)) == TypeLong::make( bits_mask ) )
+ return new (phase->C) LShiftLNode( add1->in(1), in(2) );
+@@ -1253,7 +1254,7 @@
+ if ( con == 0 ) return NULL; // let Identity() handle a 0 shift count
+ // note: mask computation below does not work for 0 shift count
+ // We'll be wanting the right-shift amount as a mask of that many bits
+- const jlong mask = (((jlong)CONST64(1) << (jlong)(BitsPerJavaLong - con)) -1);
++ const jlong mask = jlong(max_julong >> con);
+
+ // Check for ((x << z) + Y) >>> z. Replace with x + con>>>z
+ // The idiom for rounding to a power of 2 is "(Q+(2^z-1)) >>> z".
+diff --git openjdk.orig/hotspot/src/share/vm/opto/subnode.cpp openjdk/hotspot/src/share/vm/opto/subnode.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/subnode.cpp
++++ openjdk/hotspot/src/share/vm/opto/subnode.cpp
+@@ -252,8 +252,8 @@
+ const Type *SubINode::sub( const Type *t1, const Type *t2 ) const {
+ const TypeInt *r0 = t1->is_int(); // Handy access
+ const TypeInt *r1 = t2->is_int();
+- int32 lo = r0->_lo - r1->_hi;
+- int32 hi = r0->_hi - r1->_lo;
++ int32 lo = java_subtract(r0->_lo, r1->_hi);
++ int32 hi = java_subtract(r0->_hi, r1->_lo);
+
+ // We next check for 32-bit overflow.
+ // If that happens, we just assume all integers are possible.
+@@ -361,8 +361,8 @@
+ const Type *SubLNode::sub( const Type *t1, const Type *t2 ) const {
+ const TypeLong *r0 = t1->is_long(); // Handy access
+ const TypeLong *r1 = t2->is_long();
+- jlong lo = r0->_lo - r1->_hi;
+- jlong hi = r0->_hi - r1->_lo;
++ jlong lo = java_subtract(r0->_lo, r1->_hi);
++ jlong hi = java_subtract(r0->_hi, r1->_lo);
+
+ // We next check for 32-bit overflow.
+ // If that happens, we just assume all integers are possible.
+diff --git openjdk.orig/hotspot/src/share/vm/opto/type.cpp openjdk/hotspot/src/share/vm/opto/type.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/type.cpp
++++ openjdk/hotspot/src/share/vm/opto/type.cpp
+@@ -1329,8 +1329,8 @@
+
+ // The new type narrows the old type, so look for a "death march".
+ // See comments on PhaseTransform::saturate.
+- juint nrange = _hi - _lo;
+- juint orange = ohi - olo;
++ juint nrange = (juint)_hi - _lo;
++ juint orange = (juint)ohi - olo;
+ if (nrange < max_juint - 1 && nrange > (orange >> 1) + (SMALLINT*2)) {
+ // Use the new type only if the range shrinks a lot.
+ // We do not want the optimizer computing 2^31 point by point.
+@@ -1363,7 +1363,7 @@
+ //------------------------------hash-------------------------------------------
+ // Type-specific hashing function.
+ int TypeInt::hash(void) const {
+- return _lo+_hi+_widen+(int)Type::Int;
++ return java_add(java_add(_lo, _hi), java_add(_widen, (int)Type::Int));
+ }
+
+ //------------------------------is_finite--------------------------------------
+@@ -1544,7 +1544,7 @@
+ // If neither endpoint is extremal yet, push out the endpoint
+ // which is closer to its respective limit.
+ if (_lo >= 0 || // easy common case
+- (julong)(_lo - min) >= (julong)(max - _hi)) {
++ ((julong)_lo - min) >= ((julong)max - _hi)) {
+ // Try to widen to an unsigned range type of 32/63 bits:
+ if (max >= max_juint && _hi < max_juint)
+ return make(_lo, max_juint, WidenMax);
+@@ -2314,7 +2314,7 @@
+ //------------------------------hash-------------------------------------------
+ // Type-specific hashing function.
+ int TypePtr::hash(void) const {
+- return _ptr + _offset;
++ return java_add(_ptr, _offset);
+ }
+
+ //------------------------------dump2------------------------------------------
+@@ -2904,12 +2904,8 @@
+ // Type-specific hashing function.
+ int TypeOopPtr::hash(void) const {
+ return
+- (const_oop() ? const_oop()->hash() : 0) +
+- _klass_is_exact +
+- _instance_id +
+- hash_speculative() +
+- _inline_depth +
+- TypePtr::hash();
++ java_add(java_add(java_add(const_oop() ? const_oop()->hash() : 0, _klass_is_exact),
++ java_add(_instance_id , hash_speculative())), java_add(_inline_depth , TypePtr::hash()));
+ }
+
+ //------------------------------dump2------------------------------------------
+@@ -3635,7 +3631,7 @@
+ //------------------------------hash-------------------------------------------
+ // Type-specific hashing function.
+ int TypeInstPtr::hash(void) const {
+- int hash = klass()->hash() + TypeOopPtr::hash();
++ int hash = java_add(klass()->hash(), TypeOopPtr::hash());
+ return hash;
+ }
+
+@@ -4530,7 +4526,7 @@
+ //------------------------------hash-------------------------------------------
+ // Type-specific hashing function.
+ int TypeKlassPtr::hash(void) const {
+- return klass()->hash() + TypePtr::hash();
++ return java_add(klass()->hash(), TypePtr::hash());
+ }
+
+ //------------------------------singleton--------------------------------------
+diff --git openjdk.orig/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp openjdk/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
++++ openjdk/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
+@@ -131,7 +131,8 @@
+ }
+
+ double AdvancedThresholdPolicy::weight(Method* method) {
+- return (method->rate() + 1) * ((method->invocation_count() + 1) * (method->backedge_count() + 1));
++ return (double)(method->rate() + 1) *
++ (method->invocation_count() + 1) * (method->backedge_count() + 1);
+ }
+
+ // Apply heuristics and return true if x should be compiled before y
+diff --git openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp
++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+@@ -1403,6 +1403,32 @@
+
+ #define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0]))
+
++//----------------------------------------------------------------------------------------------------
++// Sum and product which can never overflow: they wrap, just like the
++// Java operations. Note that we don't intend these to be used for
++// general-purpose arithmetic: their purpose is to emulate Java
++// operations.
++
++// The goal of this code to avoid undefined or implementation-defined
++// behaviour. The use of an lvalue to reference cast is explicitly
++// permitted by Lvalues and rvalues [basic.lval]. [Section 3.10 Para
++// 15 in C++03]
++#define JAVA_INTEGER_OP(OP, NAME, TYPE, UNSIGNED_TYPE) \
++inline TYPE NAME (TYPE in1, TYPE in2) { \
++ UNSIGNED_TYPE ures = static_cast<UNSIGNED_TYPE>(in1); \
++ ures OP ## = static_cast<UNSIGNED_TYPE>(in2); \
++ return reinterpret_cast<TYPE&>(ures); \
++}
++
++JAVA_INTEGER_OP(+, java_add, jint, juint)
++JAVA_INTEGER_OP(-, java_subtract, jint, juint)
++JAVA_INTEGER_OP(*, java_multiply, jint, juint)
++JAVA_INTEGER_OP(+, java_add, jlong, julong)
++JAVA_INTEGER_OP(-, java_subtract, jlong, julong)
++JAVA_INTEGER_OP(*, java_multiply, jlong, julong)
++
++#undef JAVA_INTEGER_OP
++
+ // Dereference vptr
+ // All C++ compilers that we know of have the vtbl pointer in the first
+ // word. If there are exceptions, this function needs to be made compiler
diff --git a/jdk8154313-generated_javadoc_scattered_all_over_the_place.patch b/jdk8154313-generated_javadoc_scattered_all_over_the_place.patch
new file mode 100644
index 0000000..3a43c5f
--- /dev/null
+++ b/jdk8154313-generated_javadoc_scattered_all_over_the_place.patch
@@ -0,0 +1,68 @@
+--- jdk8/make/Javadoc.gmk 2016-04-01 16:53:41.069477682 +0200
++++ jdk8/make/Javadoc.gmk 2016-04-01 16:53:41.014477059 +0200
+@@ -220,6 +220,12 @@
+ JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
+ PLATFORM_DOCSDIR = $(DOCSDIR)/platform
+
++
++JAVADOC_ARCHIVE_NAME := jdk-$(FULL_VERSION)-docs.zip
++JAVADOC_ARCHIVE_ASSEMBLY_DIR := $(DOCSTMPDIR)/zip-docs
++JAVADOC_ARCHIVE_DIR := $(OUTPUT_ROOT)/bundles
++JAVADOC_ARCHIVE := $(JAVADOC_ARCHIVE_DIR)/$(JAVADOC_ARCHIVE_NAME)
++
+ # The non-core api javadocs need to be able to access the root of the core
+ # api directory, so for jdk/api or jre/api to get to the core api/
+ # directory we would use this:
+@@ -319,6 +325,37 @@
+ all: docs
+ docs: coredocs otherdocs
+
++#
++# Optional target which bundles all generated javadocs into a zip
++# archive. The dependency on docs is handled in Main.gmk. Incremental
++# building of docs is currently broken so if you invoke zip-docs after
++# docs, the docs are always rebuilt.
++#
++
++zip-docs: $(JAVADOC_ARCHIVE)
++
++#
++# Add the core docs as prerequisite to the archive to trigger a rebuild
++# if the core docs were rebuilt. Ideally any doc rebuild should trigger
++# this, but the way prerequisites are currently setup in this file, that
++# is hard to achieve.
++#
++
++$(JAVADOC_ARCHIVE): $(COREAPI_INDEX_FILE)
++ @$(ECHO) "Compressing javadoc to single $(JAVADOC_ARCHIVE_NAME)" ;
++ $(MKDIR) -p $(JAVADOC_ARCHIVE_DIR) ;
++ $(RM) -r $(JAVADOC_ARCHIVE_ASSEMBLY_DIR) ;
++ $(MKDIR) -p $(JAVADOC_ARCHIVE_ASSEMBLY_DIR);
++ all_roots=`$(FIND) $(DOCSDIR) | $(GREP) index.html `; \
++ pushd $(JAVADOC_ARCHIVE_ASSEMBLY_DIR); \
++ for index_file in $${all_roots} ; do \
++ target_dir=`dirname $${index_file}`; \
++ name=`$(ECHO) $${target_dir} | $(SED) "s;/spec;;" | $(SED) "s;.*/;;"`; \
++ $(LN) -s $${target_dir} $${name}; \
++ done; \
++ $(ZIP) -q -r $(JAVADOC_ARCHIVE) * ; \
++ popd ;
++
+ #################################################################
+ # Production Targets -- USE THESE TARGETS WHEN:
+ # a) You're generating docs outside of release engineering's
+--- jdk8/make/Main.gmk 2016-04-01 16:53:41.311480424 +0200
++++ jdk8/make/Main.gmk 2016-04-01 16:53:41.266479914 +0200
+@@ -165,6 +165,12 @@
+ @($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
+ @$(call TargetExit)
+
++zip-docs: docs zip-docs-only
++zip-docs-only: start-make
++ @$(call TargetEnter)
++ @($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk zip-docs)
++ @$(call TargetExit)
++
+ sign-jars: jdk sign-jars-only
+ sign-jars-only: start-make
+ @$(call TargetEnter)
diff --git a/jdk8160748-aarch64_ideal_reg.patch b/jdk8160748-aarch64_ideal_reg.patch
new file mode 100644
index 0000000..b3e6ea6
--- /dev/null
+++ b/jdk8160748-aarch64_ideal_reg.patch
@@ -0,0 +1,39 @@
+# HG changeset patch
+# User kbarrett
+# Date 1547614745 0
+# Wed Jan 16 04:59:05 2019 +0000
+# Node ID bca8195a3bc70df281a73d9a40032c673971676c
+# Parent 09abae195e9a7e134a1cfd9b375a6f4d95091de7
+8160748: [AArch64] Inconsistent types for ideal_reg
+Summary: Made ideal_reg consistently uint.
+Reviewed-by: kvn, iveresov
+
+diff --git openjdk.orig/hotspot/src/cpu/aarch64/vm/aarch64.ad openjdk/hotspot/src/cpu/aarch64/vm/aarch64.ad
+--- openjdk.orig/hotspot/src/cpu/aarch64/vm/aarch64.ad
++++ openjdk/hotspot/src/cpu/aarch64/vm/aarch64.ad
+@@ -1,6 +1,6 @@
+ //
++// Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ // Copyright (c) 2013, Red Hat Inc.
+-// Copyright (c) 2003, 2012, Oracle and/or its affiliates.
+ // All rights reserved.
+ // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ //
+@@ -3449,7 +3449,7 @@
+ }
+
+ // Vector ideal reg.
+-const int Matcher::vector_ideal_reg(int len) {
++const uint Matcher::vector_ideal_reg(int len) {
+ switch(len) {
+ case 8: return Op_VecD;
+ case 16: return Op_VecX;
+@@ -3458,7 +3458,7 @@
+ return 0;
+ }
+
+-const int Matcher::vector_shift_count_ideal_reg(int size) {
++const uint Matcher::vector_shift_count_ideal_reg(int size) {
+ return Op_VecX;
+ }
+
diff --git a/jdk8164920-pr3574-rh1498936-ppc_crc32_enhancement.patch b/jdk8164920-pr3574-rh1498936-ppc_crc32_enhancement.patch
new file mode 100644
index 0000000..27a2ed4
--- /dev/null
+++ b/jdk8164920-pr3574-rh1498936-ppc_crc32_enhancement.patch
@@ -0,0 +1,1152 @@
+# HG changeset patch
+# User mdoerr
+# Date 1474539444 -7200
+# Thu Sep 22 12:17:24 2016 +0200
+# Node ID de4f1f9fbcc5b7b30e1a796b7cf88a16943e785f
+# Parent 567e95df42f866b890dc3f0670e086d266915112
+8164920, PR3574, RH1498936: ppc: enhancement of CRC32 intrinsic
+Reviewed-by: goetz, mdoerr
+Contributed-by: Hiroshi H Horii <horii(a)jp.ibm.com>
+
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp openjdk/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
+@@ -468,6 +468,10 @@
+ LVSL_OPCODE = (31u << OPCODE_SHIFT | 6u << 1),
+ LVSR_OPCODE = (31u << OPCODE_SHIFT | 38u << 1),
+
++ // Vector-Scalar (VSX) instruction support.
++ MTVSRD_OPCODE = (31u << OPCODE_SHIFT | 179u << 1),
++ MFVSRD_OPCODE = (31u << OPCODE_SHIFT | 51u << 1),
++
+ // Vector Permute and Formatting
+ VPKPX_OPCODE = (4u << OPCODE_SHIFT | 782u ),
+ VPKSHSS_OPCODE = (4u << OPCODE_SHIFT | 398u ),
+@@ -1938,6 +1942,10 @@
+ inline void mtvscr( VectorRegister b);
+ inline void mfvscr( VectorRegister d);
+
++ // Vector-Scalar (VSX) instructions.
++ inline void mtvrd( VectorRegister d, Register a);
++ inline void mfvrd( Register a, VectorRegister d);
++
+ // AES (introduced with Power 8)
+ inline void vcipher( VectorRegister d, VectorRegister a, VectorRegister b);
+ inline void vcipherlast( VectorRegister d, VectorRegister a, VectorRegister b);
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp openjdk/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp
+@@ -623,6 +623,10 @@
+ inline void Assembler::lvsl( VectorRegister d, Register s1, Register s2) { emit_int32( LVSL_OPCODE | vrt(d) | ra0mem(s1) | rb(s2)); }
+ inline void Assembler::lvsr( VectorRegister d, Register s1, Register s2) { emit_int32( LVSR_OPCODE | vrt(d) | ra0mem(s1) | rb(s2)); }
+
++// Vector-Scalar (VSX) instructions.
++inline void Assembler::mtvrd( VectorRegister d, Register a) { emit_int32( MTVSRD_OPCODE | vrt(d) | ra(a) | 1u); } // 1u: d is treated as Vector (VMX/Altivec).
++inline void Assembler::mfvrd( Register a, VectorRegister d) { emit_int32( MFVSRD_OPCODE | vrt(d) | ra(a) | 1u); } // 1u: d is treated as Vector (VMX/Altivec).
++
+ inline void Assembler::vpkpx( VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VPKPX_OPCODE | vrt(d) | vra(a) | vrb(b)); }
+ inline void Assembler::vpkshss( VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VPKSHSS_OPCODE | vrt(d) | vra(a) | vrb(b)); }
+ inline void Assembler::vpkswss( VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VPKSWSS_OPCODE | vrt(d) | vra(a) | vrb(b)); }
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
+@@ -3423,6 +3423,565 @@
+ BLOCK_COMMENT("} kernel_crc32_1byte");
+ }
+
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param table register pointing to CRC table
++ * @param constants register pointing to CRC table for 128-bit aligned memory
++ * @param barretConstants register pointing to table for barrett reduction
++ * @param t0 volatile register
++ * @param t1 volatile register
++ * @param t2 volatile register
++ * @param t3 volatile register
++ */
++void MacroAssembler::kernel_crc32_1word_vpmsumd(Register crc, Register buf, Register len, Register table,
++ Register constants, Register barretConstants,
++ Register t0, Register t1, Register t2, Register t3, Register t4) {
++ assert_different_registers(crc, buf, len, table);
++
++ Label L_alignedHead, L_tail, L_alignTail, L_start, L_end;
++
++ Register prealign = t0;
++ Register postalign = t0;
++
++ BLOCK_COMMENT("kernel_crc32_1word_vpmsumb {");
++
++ // 1. use kernel_crc32_1word for shorter than 384bit
++ clrldi(len, len, 32);
++ cmpdi(CCR0, len, 384);
++ bge(CCR0, L_start);
++
++ Register tc0 = t4;
++ Register tc1 = constants;
++ Register tc2 = barretConstants;
++ kernel_crc32_1word(crc, buf, len, table,t0, t1, t2, t3, tc0, tc1, tc2, table);
++ b(L_end);
++
++ BIND(L_start);
++
++ // 2. ~c
++ nand(crc, crc, crc);
++
++ // 3. calculate from 0 to first 128bit-aligned address
++ clrldi_(prealign, buf, 57);
++ beq(CCR0, L_alignedHead);
++
++ subfic(prealign, prealign, 128);
++
++ subf(len, prealign, len);
++ update_byteLoop_crc32(crc, buf, prealign, table, t2, false, false);
++
++ // 4. calculate from first 128bit-aligned address to last 128bit-aligned address
++ BIND(L_alignedHead);
++
++ clrldi(postalign, len, 57);
++ subf(len, postalign, len);
++
++ // len must be more than 256bit
++ kernel_crc32_1word_aligned(crc, buf, len, constants, barretConstants, t1, t2, t3);
++
++ // 5. calculate remaining
++ cmpdi(CCR0, postalign, 0);
++ beq(CCR0, L_tail);
++
++ update_byteLoop_crc32(crc, buf, postalign, table, t2, false, false);
++
++ BIND(L_tail);
++
++ // 6. ~c
++ nand(crc, crc, crc);
++
++ BIND(L_end);
++
++ BLOCK_COMMENT("} kernel_crc32_1word_vpmsumb");
++}
++
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param constants register pointing to CRC table for 128-bit aligned memory
++ * @param barretConstants register pointing to table for barrett reduction
++ * @param t0 volatile register
++ * @param t1 volatile register
++ * @param t2 volatile register
++ */
++void MacroAssembler::kernel_crc32_1word_aligned(Register crc, Register buf, Register len,
++ Register constants, Register barretConstants, Register t0, Register t1, Register t2) {
++ Label L_mainLoop, L_tail, L_alignTail, L_barrett_reduction, L_end, L_first_warm_up_done, L_first_cool_down, L_second_cool_down, L_XOR, L_test;
++ Label L_lv0, L_lv1, L_lv2, L_lv3, L_lv4, L_lv5, L_lv6, L_lv7, L_lv8, L_lv9, L_lv10, L_lv11, L_lv12, L_lv13, L_lv14, L_lv15;
++ Label L_1, L_2, L_3, L_4;
++
++ Register rLoaded = t0;
++ Register rTmp1 = t1;
++ Register rTmp2 = t2;
++ Register off16 = R22;
++ Register off32 = R23;
++ Register off48 = R24;
++ Register off64 = R25;
++ Register off80 = R26;
++ Register off96 = R27;
++ Register off112 = R28;
++ Register rIdx = R29;
++ Register rMax = R30;
++ Register constantsPos = R31;
++
++ VectorRegister mask_32bit = VR24;
++ VectorRegister mask_64bit = VR25;
++ VectorRegister zeroes = VR26;
++ VectorRegister const1 = VR27;
++ VectorRegister const2 = VR28;
++
++ // Save non-volatile vector registers (frameless).
++ Register offset = t1; int offsetInt = 0;
++ offsetInt -= 16; li(offset, -16); stvx(VR20, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR21, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR22, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR23, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR24, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR25, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR26, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR27, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR28, offset, R1_SP);
++ offsetInt -= 8; std(R22, offsetInt, R1_SP);
++ offsetInt -= 8; std(R23, offsetInt, R1_SP);
++ offsetInt -= 8; std(R24, offsetInt, R1_SP);
++ offsetInt -= 8; std(R25, offsetInt, R1_SP);
++ offsetInt -= 8; std(R26, offsetInt, R1_SP);
++ offsetInt -= 8; std(R27, offsetInt, R1_SP);
++ offsetInt -= 8; std(R28, offsetInt, R1_SP);
++ offsetInt -= 8; std(R29, offsetInt, R1_SP);
++ offsetInt -= 8; std(R30, offsetInt, R1_SP);
++ offsetInt -= 8; std(R31, offsetInt, R1_SP);
++
++ // Set constants
++ li(off16, 16);
++ li(off32, 32);
++ li(off48, 48);
++ li(off64, 64);
++ li(off80, 80);
++ li(off96, 96);
++ li(off112, 112);
++
++ clrldi(crc, crc, 32);
++
++ vxor(zeroes, zeroes, zeroes);
++ vspltisw(VR0, -1);
++
++ vsldoi(mask_32bit, zeroes, VR0, 4);
++ vsldoi(mask_64bit, zeroes, VR0, -8);
++
++ // Get the initial value into v8
++ vxor(VR8, VR8, VR8);
++ mtvrd(VR8, crc);
++ vsldoi(VR8, zeroes, VR8, -8); // shift into bottom 32 bits
++
++ li (rLoaded, 0);
++
++ rldicr(rIdx, len, 0, 56);
++
++ {
++ BIND(L_1);
++ // Checksum in blocks of MAX_SIZE (32768)
++ lis(rMax, 0);
++ ori(rMax, rMax, 32768);
++ mr(rTmp2, rMax);
++ cmpd(CCR0, rIdx, rMax);
++ bgt(CCR0, L_2);
++ mr(rMax, rIdx);
++
++ BIND(L_2);
++ subf(rIdx, rMax, rIdx);
++
++ // our main loop does 128 bytes at a time
++ srdi(rMax, rMax, 7);
++
++ /*
++ * Work out the offset into the constants table to start at. Each
++ * constant is 16 bytes, and it is used against 128 bytes of input
++ * data - 128 / 16 = 8
++ */
++ sldi(rTmp1, rMax, 4);
++ srdi(rTmp2, rTmp2, 3);
++ subf(rTmp1, rTmp1, rTmp2);
++
++ // We reduce our final 128 bytes in a separate step
++ addi(rMax, rMax, -1);
++ mtctr(rMax);
++
++ // Find the start of our constants
++ add(constantsPos, constants, rTmp1);
++
++ // zero VR0-v7 which will contain our checksums
++ vxor(VR0, VR0, VR0);
++ vxor(VR1, VR1, VR1);
++ vxor(VR2, VR2, VR2);
++ vxor(VR3, VR3, VR3);
++ vxor(VR4, VR4, VR4);
++ vxor(VR5, VR5, VR5);
++ vxor(VR6, VR6, VR6);
++ vxor(VR7, VR7, VR7);
++
++ lvx(const1, constantsPos);
++
++ /*
++ * If we are looping back to consume more data we use the values
++ * already in VR16-v23.
++ */
++ cmpdi(CCR0, rLoaded, 1);
++ beq(CCR0, L_3);
++ {
++
++ // First warm up pass
++ lvx(VR16, buf);
++ lvx(VR17, off16, buf);
++ lvx(VR18, off32, buf);
++ lvx(VR19, off48, buf);
++ lvx(VR20, off64, buf);
++ lvx(VR21, off80, buf);
++ lvx(VR22, off96, buf);
++ lvx(VR23, off112, buf);
++ addi(buf, buf, 8*16);
++
++ // xor in initial value
++ vxor(VR16, VR16, VR8);
++ }
++
++ BIND(L_3);
++ bdz(L_first_warm_up_done);
++
++ addi(constantsPos, constantsPos, 16);
++ lvx(const2, constantsPos);
++
++ // Second warm up pass
++ vpmsumd(VR8, VR16, const1);
++ lvx(VR16, buf);
++
++ vpmsumd(VR9, VR17, const1);
++ lvx(VR17, off16, buf);
++
++ vpmsumd(VR10, VR18, const1);
++ lvx(VR18, off32, buf);
++
++ vpmsumd(VR11, VR19, const1);
++ lvx(VR19, off48, buf);
++
++ vpmsumd(VR12, VR20, const1);
++ lvx(VR20, off64, buf);
++
++ vpmsumd(VR13, VR21, const1);
++ lvx(VR21, off80, buf);
++
++ vpmsumd(VR14, VR22, const1);
++ lvx(VR22, off96, buf);
++
++ vpmsumd(VR15, VR23, const1);
++ lvx(VR23, off112, buf);
++
++ addi(buf, buf, 8 * 16);
++
++ bdz(L_first_cool_down);
++
++ /*
++ * main loop. We modulo schedule it such that it takes three iterations
++ * to complete - first iteration load, second iteration vpmsum, third
++ * iteration xor.
++ */
++ {
++ BIND(L_4);
++ lvx(const1, constantsPos); addi(constantsPos, constantsPos, 16);
++
++ vxor(VR0, VR0, VR8);
++ vpmsumd(VR8, VR16, const2);
++ lvx(VR16, buf);
++
++ vxor(VR1, VR1, VR9);
++ vpmsumd(VR9, VR17, const2);
++ lvx(VR17, off16, buf);
++
++ vxor(VR2, VR2, VR10);
++ vpmsumd(VR10, VR18, const2);
++ lvx(VR18, off32, buf);
++
++ vxor(VR3, VR3, VR11);
++ vpmsumd(VR11, VR19, const2);
++ lvx(VR19, off48, buf);
++ lvx(const2, constantsPos);
++
++ vxor(VR4, VR4, VR12);
++ vpmsumd(VR12, VR20, const1);
++ lvx(VR20, off64, buf);
++
++ vxor(VR5, VR5, VR13);
++ vpmsumd(VR13, VR21, const1);
++ lvx(VR21, off80, buf);
++
++ vxor(VR6, VR6, VR14);
++ vpmsumd(VR14, VR22, const1);
++ lvx(VR22, off96, buf);
++
++ vxor(VR7, VR7, VR15);
++ vpmsumd(VR15, VR23, const1);
++ lvx(VR23, off112, buf);
++
++ addi(buf, buf, 8 * 16);
++
++ bdnz(L_4);
++ }
++
++ BIND(L_first_cool_down);
++
++ // First cool down pass
++ lvx(const1, constantsPos);
++ addi(constantsPos, constantsPos, 16);
++
++ vxor(VR0, VR0, VR8);
++ vpmsumd(VR8, VR16, const1);
++
++ vxor(VR1, VR1, VR9);
++ vpmsumd(VR9, VR17, const1);
++
++ vxor(VR2, VR2, VR10);
++ vpmsumd(VR10, VR18, const1);
++
++ vxor(VR3, VR3, VR11);
++ vpmsumd(VR11, VR19, const1);
++
++ vxor(VR4, VR4, VR12);
++ vpmsumd(VR12, VR20, const1);
++
++ vxor(VR5, VR5, VR13);
++ vpmsumd(VR13, VR21, const1);
++
++ vxor(VR6, VR6, VR14);
++ vpmsumd(VR14, VR22, const1);
++
++ vxor(VR7, VR7, VR15);
++ vpmsumd(VR15, VR23, const1);
++
++ BIND(L_second_cool_down);
++ // Second cool down pass
++ vxor(VR0, VR0, VR8);
++ vxor(VR1, VR1, VR9);
++ vxor(VR2, VR2, VR10);
++ vxor(VR3, VR3, VR11);
++ vxor(VR4, VR4, VR12);
++ vxor(VR5, VR5, VR13);
++ vxor(VR6, VR6, VR14);
++ vxor(VR7, VR7, VR15);
++
++ /*
++ * vpmsumd produces a 96 bit result in the least significant bits
++ * of the register. Since we are bit reflected we have to shift it
++ * left 32 bits so it occupies the least significant bits in the
++ * bit reflected domain.
++ */
++ vsldoi(VR0, VR0, zeroes, 4);
++ vsldoi(VR1, VR1, zeroes, 4);
++ vsldoi(VR2, VR2, zeroes, 4);
++ vsldoi(VR3, VR3, zeroes, 4);
++ vsldoi(VR4, VR4, zeroes, 4);
++ vsldoi(VR5, VR5, zeroes, 4);
++ vsldoi(VR6, VR6, zeroes, 4);
++ vsldoi(VR7, VR7, zeroes, 4);
++
++ // xor with last 1024 bits
++ lvx(VR8, buf);
++ lvx(VR9, off16, buf);
++ lvx(VR10, off32, buf);
++ lvx(VR11, off48, buf);
++ lvx(VR12, off64, buf);
++ lvx(VR13, off80, buf);
++ lvx(VR14, off96, buf);
++ lvx(VR15, off112, buf);
++ addi(buf, buf, 8 * 16);
++
++ vxor(VR16, VR0, VR8);
++ vxor(VR17, VR1, VR9);
++ vxor(VR18, VR2, VR10);
++ vxor(VR19, VR3, VR11);
++ vxor(VR20, VR4, VR12);
++ vxor(VR21, VR5, VR13);
++ vxor(VR22, VR6, VR14);
++ vxor(VR23, VR7, VR15);
++
++ li(rLoaded, 1);
++ cmpdi(CCR0, rIdx, 0);
++ addi(rIdx, rIdx, 128);
++ bne(CCR0, L_1);
++ }
++
++ // Work out how many bytes we have left
++ andi_(len, len, 127);
++
++ // Calculate where in the constant table we need to start
++ subfic(rTmp1, len, 128);
++ add(constantsPos, constantsPos, rTmp1);
++
++ // How many 16 byte chunks are in the tail
++ srdi(rIdx, len, 4);
++ mtctr(rIdx);
++
++ /*
++ * Reduce the previously calculated 1024 bits to 64 bits, shifting
++ * 32 bits to include the trailing 32 bits of zeros
++ */
++ lvx(VR0, constantsPos);
++ lvx(VR1, off16, constantsPos);
++ lvx(VR2, off32, constantsPos);
++ lvx(VR3, off48, constantsPos);
++ lvx(VR4, off64, constantsPos);
++ lvx(VR5, off80, constantsPos);
++ lvx(VR6, off96, constantsPos);
++ lvx(VR7, off112, constantsPos);
++ addi(constantsPos, constantsPos, 8 * 16);
++
++ vpmsumw(VR0, VR16, VR0);
++ vpmsumw(VR1, VR17, VR1);
++ vpmsumw(VR2, VR18, VR2);
++ vpmsumw(VR3, VR19, VR3);
++ vpmsumw(VR4, VR20, VR4);
++ vpmsumw(VR5, VR21, VR5);
++ vpmsumw(VR6, VR22, VR6);
++ vpmsumw(VR7, VR23, VR7);
++
++ // Now reduce the tail (0 - 112 bytes)
++ cmpdi(CCR0, rIdx, 0);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off16, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off32, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off48,constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off64, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off80, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off96, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++
++ // Now xor all the parallel chunks together
++ BIND(L_XOR);
++ vxor(VR0, VR0, VR1);
++ vxor(VR2, VR2, VR3);
++ vxor(VR4, VR4, VR5);
++ vxor(VR6, VR6, VR7);
++
++ vxor(VR0, VR0, VR2);
++ vxor(VR4, VR4, VR6);
++
++ vxor(VR0, VR0, VR4);
++
++ b(L_barrett_reduction);
++
++ BIND(L_first_warm_up_done);
++ lvx(const1, constantsPos);
++ addi(constantsPos, constantsPos, 16);
++ vpmsumd(VR8, VR16, const1);
++ vpmsumd(VR9, VR17, const1);
++ vpmsumd(VR10, VR18, const1);
++ vpmsumd(VR11, VR19, const1);
++ vpmsumd(VR12, VR20, const1);
++ vpmsumd(VR13, VR21, const1);
++ vpmsumd(VR14, VR22, const1);
++ vpmsumd(VR15, VR23, const1);
++ b(L_second_cool_down);
++
++ BIND(L_barrett_reduction);
++
++ lvx(const1, barretConstants);
++ addi(barretConstants, barretConstants, 16);
++ lvx(const2, barretConstants);
++
++ vsldoi(VR1, VR0, VR0, -8);
++ vxor(VR0, VR0, VR1); // xor two 64 bit results together
++
++ // shift left one bit
++ vspltisb(VR1, 1);
++ vsl(VR0, VR0, VR1);
++
++ vand(VR0, VR0, mask_64bit);
++
++ /*
++ * The reflected version of Barrett reduction. Instead of bit
++ * reflecting our data (which is expensive to do), we bit reflect our
++ * constants and our algorithm, which means the intermediate data in
++ * our vector registers goes from 0-63 instead of 63-0. We can reflect
++ * the algorithm because we don't carry in mod 2 arithmetic.
++ */
++ vand(VR1, VR0, mask_32bit); // bottom 32 bits of a
++ vpmsumd(VR1, VR1, const1); // ma
++ vand(VR1, VR1, mask_32bit); // bottom 32bits of ma
++ vpmsumd(VR1, VR1, const2); // qn */
++ vxor(VR0, VR0, VR1); // a - qn, subtraction is xor in GF(2)
++
++ /*
++ * Since we are bit reflected, the result (ie the low 32 bits) is in
++ * the high 32 bits. We just need to shift it left 4 bytes
++ * V0 [ 0 1 X 3 ]
++ * V0 [ 0 X 2 3 ]
++ */
++ vsldoi(VR0, VR0, zeroes, 4); // shift result into top 64 bits of
++
++ // Get it into r3
++ mfvrd(crc, VR0);
++
++ BIND(L_end);
++
++ offsetInt = 0;
++ // Restore non-volatile Vector registers (frameless).
++ offsetInt -= 16; li(offset, -16); lvx(VR20, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR21, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR22, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR23, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR24, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR25, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR26, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR27, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR28, offset, R1_SP);
++ offsetInt -= 8; ld(R22, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R23, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R24, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R25, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R26, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R27, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R28, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R29, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R30, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R31, offsetInt, R1_SP);
++}
++
+ void MacroAssembler::kernel_crc32_singleByte(Register crc, Register buf, Register len, Register table, Register tmp) {
+ assert_different_registers(crc, buf, /* len, not used!! */ table, tmp);
+
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
+@@ -656,6 +656,13 @@
+ Register tc0, Register tc1, Register tc2, Register tc3);
+ void kernel_crc32_1byte(Register crc, Register buf, Register len, Register table,
+ Register t0, Register t1, Register t2, Register t3);
++ void kernel_crc32_1word_vpmsumd(Register crc, Register buf, Register len, Register table,
++ Register constants, Register barretConstants,
++ Register t0, Register t1, Register t2, Register t3, Register t4);
++ void kernel_crc32_1word_aligned(Register crc, Register buf, Register len,
++ Register constants, Register barretConstants,
++ Register t0, Register t1, Register t2);
++
+ void kernel_crc32_singleByte(Register crc, Register buf, Register len, Register table, Register tmp);
+
+ //
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
+@@ -2482,9 +2482,7 @@
+ * R5_ARG3 - int length (of buffer)
+ *
+ * scratch:
+- * R6_ARG4 - crc table address
+- * R7_ARG5 - tmp1
+- * R8_ARG6 - tmp2
++ * R2, R6-R12
+ *
+ * Ouput:
+ * R3_RET - int crc result
+@@ -2496,28 +2494,62 @@
+ address start = __ function_entry(); // Remember stub start address (is rtn value).
+
+ // arguments to kernel_crc32:
+- Register crc = R3_ARG1; // Current checksum, preset by caller or result from previous call.
+- Register data = R4_ARG2; // source byte array
+- Register dataLen = R5_ARG3; // #bytes to process
+- Register table = R6_ARG4; // crc table address
+-
+- Register t0 = R9; // work reg for kernel* emitters
+- Register t1 = R10; // work reg for kernel* emitters
+- Register t2 = R11; // work reg for kernel* emitters
+- Register t3 = R12; // work reg for kernel* emitters
+-
+- BLOCK_COMMENT("Stub body {");
+- assert_different_registers(crc, data, dataLen, table);
+-
+- StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
+-
+- __ kernel_crc32_1byte(crc, data, dataLen, table, t0, t1, t2, t3);
+-
+- BLOCK_COMMENT("return");
+- __ mr_if_needed(R3_RET, crc); // Updated crc is function result. No copying required (R3_ARG1 == R3_RET).
+- __ blr();
+-
+- BLOCK_COMMENT("} Stub body");
++ const Register crc = R3_ARG1; // Current checksum, preset by caller or result from previous call.
++ const Register data = R4_ARG2; // source byte array
++ const Register dataLen = R5_ARG3; // #bytes to process
++
++ const Register table = R6; // crc table address
++
++#ifdef VM_LITTLE_ENDIAN
++ if (VM_Version::has_vpmsumb()) {
++ const Register constants = R2; // constants address
++ const Register bconstants = R8; // barret table address
++
++ const Register t0 = R9;
++ const Register t1 = R10;
++ const Register t2 = R11;
++ const Register t3 = R12;
++ const Register t4 = R7;
++
++ BLOCK_COMMENT("Stub body {");
++ assert_different_registers(crc, data, dataLen, table);
++
++ StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
++ StubRoutines::ppc64::generate_load_crc_constants_addr(_masm, constants);
++ StubRoutines::ppc64::generate_load_crc_barret_constants_addr(_masm, bconstants);
++
++ __ kernel_crc32_1word_vpmsumd(crc, data, dataLen, table, constants, bconstants, t0, t1, t2, t3, t4);
++
++ BLOCK_COMMENT("return");
++ __ mr_if_needed(R3_RET, crc); // Updated crc is function result. No copying required (R3_ARG1 == R3_RET).
++ __ blr();
++
++ BLOCK_COMMENT("} Stub body");
++ } else
++#endif
++ {
++ const Register t0 = R2;
++ const Register t1 = R7;
++ const Register t2 = R8;
++ const Register t3 = R9;
++ const Register tc0 = R10;
++ const Register tc1 = R11;
++ const Register tc2 = R12;
++
++ BLOCK_COMMENT("Stub body {");
++ assert_different_registers(crc, data, dataLen, table);
++
++ StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
++
++ __ kernel_crc32_1word(crc, data, dataLen, table, t0, t1, t2, t3, tc0, tc1, tc2, table);
++
++ BLOCK_COMMENT("return");
++ __ mr_if_needed(R3_RET, crc); // Updated crc is function result. No copying required (R3_ARG1 == R3_RET).
++ __ blr();
++
++ BLOCK_COMMENT("} Stub body");
++ }
++
+ return start;
+ }
+
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
+@@ -37,6 +37,311 @@
+ __ load_const(table, StubRoutines::_crc_table_adr);
+ }
+
++void StubRoutines::ppc64::generate_load_crc_constants_addr(MacroAssembler* masm, Register table) {
++ __ load_const_optimized(table, (address)StubRoutines::ppc64::_constants, R0);
++}
++
++void StubRoutines::ppc64::generate_load_crc_barret_constants_addr(MacroAssembler* masm, Register table) {
++ __ load_const_optimized(table, (address)StubRoutines::ppc64::_barret_constants, R0);
++}
++
++juint* StubRoutines::ppc64::generate_crc_constants() {
++ juint constants[CRC32_CONSTANTS_SIZE] = {
++ // Reduce 262144 kbits to 1024 bits
++ 0x99ea94a8UL, 0x00000000UL, 0x651797d2UL, 0x00000001UL, // x^261120 mod p(x)` << 1, x^261184 mod p(x)` << 1
++ 0x945a8420UL, 0x00000000UL, 0x21e0d56cUL, 0x00000000UL, // x^260096 mod p(x)` << 1, x^260160 mod p(x)` << 1
++ 0x30762706UL, 0x00000000UL, 0x0f95ecaaUL, 0x00000000UL, // x^259072 mod p(x)` << 1, x^259136 mod p(x)` << 1
++ 0xa52fc582UL, 0x00000001UL, 0xebd224acUL, 0x00000001UL, // x^258048 mod p(x)` << 1, x^258112 mod p(x)` << 1
++ 0xa4a7167aUL, 0x00000001UL, 0x0ccb97caUL, 0x00000000UL, // x^257024 mod p(x)` << 1, x^257088 mod p(x)` << 1
++ 0x0c18249aUL, 0x00000000UL, 0x006ec8a8UL, 0x00000001UL, // x^256000 mod p(x)` << 1, x^256064 mod p(x)` << 1
++ 0xa924ae7cUL, 0x00000000UL, 0x4f58f196UL, 0x00000001UL, // x^254976 mod p(x)` << 1, x^255040 mod p(x)` << 1
++ 0xe12ccc12UL, 0x00000001UL, 0xa7192ca6UL, 0x00000001UL, // x^253952 mod p(x)` << 1, x^254016 mod p(x)` << 1
++ 0xa0b9d4acUL, 0x00000000UL, 0x9a64bab2UL, 0x00000001UL, // x^252928 mod p(x)` << 1, x^252992 mod p(x)` << 1
++ 0x95e8ddfeUL, 0x00000000UL, 0x14f4ed2eUL, 0x00000000UL, // x^251904 mod p(x)` << 1, x^251968 mod p(x)` << 1
++ 0x233fddc4UL, 0x00000000UL, 0x1092b6a2UL, 0x00000001UL, // x^250880 mod p(x)` << 1, x^250944 mod p(x)` << 1
++ 0xb4529b62UL, 0x00000001UL, 0xc8a1629cUL, 0x00000000UL, // x^249856 mod p(x)` << 1, x^249920 mod p(x)` << 1
++ 0xa7fa0e64UL, 0x00000001UL, 0x7bf32e8eUL, 0x00000001UL, // x^248832 mod p(x)` << 1, x^248896 mod p(x)` << 1
++ 0xb5334592UL, 0x00000001UL, 0xf8cc6582UL, 0x00000001UL, // x^247808 mod p(x)` << 1, x^247872 mod p(x)` << 1
++ 0x1f8ee1b4UL, 0x00000001UL, 0x8631ddf0UL, 0x00000000UL, // x^246784 mod p(x)` << 1, x^246848 mod p(x)` << 1
++ 0x6252e632UL, 0x00000000UL, 0x7e5a76d0UL, 0x00000000UL, // x^245760 mod p(x)` << 1, x^245824 mod p(x)` << 1
++ 0xab973e84UL, 0x00000000UL, 0x2b09b31cUL, 0x00000000UL, // x^244736 mod p(x)` << 1, x^244800 mod p(x)` << 1
++ 0x7734f5ecUL, 0x00000000UL, 0xb2df1f84UL, 0x00000001UL, // x^243712 mod p(x)` << 1, x^243776 mod p(x)` << 1
++ 0x7c547798UL, 0x00000000UL, 0xd6f56afcUL, 0x00000001UL, // x^242688 mod p(x)` << 1, x^242752 mod p(x)` << 1
++ 0x7ec40210UL, 0x00000000UL, 0xb9b5e70cUL, 0x00000001UL, // x^241664 mod p(x)` << 1, x^241728 mod p(x)` << 1
++ 0xab1695a8UL, 0x00000001UL, 0x34b626d2UL, 0x00000000UL, // x^240640 mod p(x)` << 1, x^240704 mod p(x)` << 1
++ 0x90494bbaUL, 0x00000000UL, 0x4c53479aUL, 0x00000001UL, // x^239616 mod p(x)` << 1, x^239680 mod p(x)` << 1
++ 0x123fb816UL, 0x00000001UL, 0xa6d179a4UL, 0x00000001UL, // x^238592 mod p(x)` << 1, x^238656 mod p(x)` << 1
++ 0xe188c74cUL, 0x00000001UL, 0x5abd16b4UL, 0x00000001UL, // x^237568 mod p(x)` << 1, x^237632 mod p(x)` << 1
++ 0xc2d3451cUL, 0x00000001UL, 0x018f9852UL, 0x00000000UL, // x^236544 mod p(x)` << 1, x^236608 mod p(x)` << 1
++ 0xf55cf1caUL, 0x00000000UL, 0x1fb3084aUL, 0x00000000UL, // x^235520 mod p(x)` << 1, x^235584 mod p(x)` << 1
++ 0xa0531540UL, 0x00000001UL, 0xc53dfb04UL, 0x00000000UL, // x^234496 mod p(x)` << 1, x^234560 mod p(x)` << 1
++ 0x32cd7ebcUL, 0x00000001UL, 0xe10c9ad6UL, 0x00000000UL, // x^233472 mod p(x)` << 1, x^233536 mod p(x)` << 1
++ 0x73ab7f36UL, 0x00000000UL, 0x25aa994aUL, 0x00000000UL, // x^232448 mod p(x)` << 1, x^232512 mod p(x)` << 1
++ 0x41aed1c2UL, 0x00000000UL, 0xfa3a74c4UL, 0x00000000UL, // x^231424 mod p(x)` << 1, x^231488 mod p(x)` << 1
++ 0x36c53800UL, 0x00000001UL, 0x33eb3f40UL, 0x00000000UL, // x^230400 mod p(x)` << 1, x^230464 mod p(x)` << 1
++ 0x26835a30UL, 0x00000001UL, 0x7193f296UL, 0x00000001UL, // x^229376 mod p(x)` << 1, x^229440 mod p(x)` << 1
++ 0x6241b502UL, 0x00000000UL, 0x43f6c86aUL, 0x00000000UL, // x^228352 mod p(x)` << 1, x^228416 mod p(x)` << 1
++ 0xd5196ad4UL, 0x00000000UL, 0x6b513ec6UL, 0x00000001UL, // x^227328 mod p(x)` << 1, x^227392 mod p(x)` << 1
++ 0x9cfa769aUL, 0x00000000UL, 0xc8f25b4eUL, 0x00000000UL, // x^226304 mod p(x)` << 1, x^226368 mod p(x)` << 1
++ 0x920e5df4UL, 0x00000000UL, 0xa45048ecUL, 0x00000001UL, // x^225280 mod p(x)` << 1, x^225344 mod p(x)` << 1
++ 0x69dc310eUL, 0x00000001UL, 0x0c441004UL, 0x00000000UL, // x^224256 mod p(x)` << 1, x^224320 mod p(x)` << 1
++ 0x09fc331cUL, 0x00000000UL, 0x0e17cad6UL, 0x00000000UL, // x^223232 mod p(x)` << 1, x^223296 mod p(x)` << 1
++ 0x0d94a81eUL, 0x00000001UL, 0x253ae964UL, 0x00000001UL, // x^222208 mod p(x)` << 1, x^222272 mod p(x)` << 1
++ 0x27a20ab2UL, 0x00000000UL, 0xd7c88ebcUL, 0x00000001UL, // x^221184 mod p(x)` << 1, x^221248 mod p(x)` << 1
++ 0x14f87504UL, 0x00000001UL, 0xe7ca913aUL, 0x00000001UL, // x^220160 mod p(x)` << 1, x^220224 mod p(x)` << 1
++ 0x4b076d96UL, 0x00000000UL, 0x33ed078aUL, 0x00000000UL, // x^219136 mod p(x)` << 1, x^219200 mod p(x)` << 1
++ 0xda4d1e74UL, 0x00000000UL, 0xe1839c78UL, 0x00000000UL, // x^218112 mod p(x)` << 1, x^218176 mod p(x)` << 1
++ 0x1b81f672UL, 0x00000000UL, 0x322b267eUL, 0x00000001UL, // x^217088 mod p(x)` << 1, x^217152 mod p(x)` << 1
++ 0x9367c988UL, 0x00000000UL, 0x638231b6UL, 0x00000000UL, // x^216064 mod p(x)` << 1, x^216128 mod p(x)` << 1
++ 0x717214caUL, 0x00000001UL, 0xee7f16f4UL, 0x00000001UL, // x^215040 mod p(x)` << 1, x^215104 mod p(x)` << 1
++ 0x9f47d820UL, 0x00000000UL, 0x17d9924aUL, 0x00000001UL, // x^214016 mod p(x)` << 1, x^214080 mod p(x)` << 1
++ 0x0d9a47d2UL, 0x00000001UL, 0xe1a9e0c4UL, 0x00000000UL, // x^212992 mod p(x)` << 1, x^213056 mod p(x)` << 1
++ 0xa696c58cUL, 0x00000000UL, 0x403731dcUL, 0x00000001UL, // x^211968 mod p(x)` << 1, x^212032 mod p(x)` << 1
++ 0x2aa28ec6UL, 0x00000000UL, 0xa5ea9682UL, 0x00000001UL, // x^210944 mod p(x)` << 1, x^211008 mod p(x)` << 1
++ 0xfe18fd9aUL, 0x00000001UL, 0x01c5c578UL, 0x00000001UL, // x^209920 mod p(x)` << 1, x^209984 mod p(x)` << 1
++ 0x9d4fc1aeUL, 0x00000001UL, 0xdddf6494UL, 0x00000000UL, // x^208896 mod p(x)` << 1, x^208960 mod p(x)` << 1
++ 0xba0e3deaUL, 0x00000001UL, 0xf1c3db28UL, 0x00000000UL, // x^207872 mod p(x)` << 1, x^207936 mod p(x)` << 1
++ 0x74b59a5eUL, 0x00000000UL, 0x3112fb9cUL, 0x00000001UL, // x^206848 mod p(x)` << 1, x^206912 mod p(x)` << 1
++ 0xf2b5ea98UL, 0x00000000UL, 0xb680b906UL, 0x00000000UL, // x^205824 mod p(x)` << 1, x^205888 mod p(x)` << 1
++ 0x87132676UL, 0x00000001UL, 0x1a282932UL, 0x00000000UL, // x^204800 mod p(x)` << 1, x^204864 mod p(x)` << 1
++ 0x0a8c6ad4UL, 0x00000001UL, 0x89406e7eUL, 0x00000000UL, // x^203776 mod p(x)` << 1, x^203840 mod p(x)` << 1
++ 0xe21dfe70UL, 0x00000001UL, 0xdef6be8cUL, 0x00000001UL, // x^202752 mod p(x)` << 1, x^202816 mod p(x)` << 1
++ 0xda0050e4UL, 0x00000001UL, 0x75258728UL, 0x00000000UL, // x^201728 mod p(x)` << 1, x^201792 mod p(x)` << 1
++ 0x772172aeUL, 0x00000000UL, 0x9536090aUL, 0x00000001UL, // x^200704 mod p(x)` << 1, x^200768 mod p(x)` << 1
++ 0xe47724aaUL, 0x00000000UL, 0xf2455bfcUL, 0x00000000UL, // x^199680 mod p(x)` << 1, x^199744 mod p(x)` << 1
++ 0x3cd63ac4UL, 0x00000000UL, 0x8c40baf4UL, 0x00000001UL, // x^198656 mod p(x)` << 1, x^198720 mod p(x)` << 1
++ 0xbf47d352UL, 0x00000001UL, 0x4cd390d4UL, 0x00000000UL, // x^197632 mod p(x)` << 1, x^197696 mod p(x)` << 1
++ 0x8dc1d708UL, 0x00000001UL, 0xe4ece95aUL, 0x00000001UL, // x^196608 mod p(x)` << 1, x^196672 mod p(x)` << 1
++ 0x2d4620a4UL, 0x00000000UL, 0x1a3ee918UL, 0x00000000UL, // x^195584 mod p(x)` << 1, x^195648 mod p(x)` << 1
++ 0x58fd1740UL, 0x00000000UL, 0x7c652fb8UL, 0x00000000UL, // x^194560 mod p(x)` << 1, x^194624 mod p(x)` << 1
++ 0xdadd9bfcUL, 0x00000000UL, 0x1c67842cUL, 0x00000001UL, // x^193536 mod p(x)` << 1, x^193600 mod p(x)` << 1
++ 0xea2140beUL, 0x00000001UL, 0x254f759cUL, 0x00000000UL, // x^192512 mod p(x)` << 1, x^192576 mod p(x)` << 1
++ 0x9de128baUL, 0x00000000UL, 0x7ece94caUL, 0x00000000UL, // x^191488 mod p(x)` << 1, x^191552 mod p(x)` << 1
++ 0x3ac3aa8eUL, 0x00000001UL, 0x38f258c2UL, 0x00000000UL, // x^190464 mod p(x)` << 1, x^190528 mod p(x)` << 1
++ 0x99980562UL, 0x00000000UL, 0xcdf17b00UL, 0x00000001UL, // x^189440 mod p(x)` << 1, x^189504 mod p(x)` << 1
++ 0xc1579c86UL, 0x00000001UL, 0x1f882c16UL, 0x00000001UL, // x^188416 mod p(x)` << 1, x^188480 mod p(x)` << 1
++ 0x68dbbf94UL, 0x00000000UL, 0x00093fc8UL, 0x00000001UL, // x^187392 mod p(x)` << 1, x^187456 mod p(x)` << 1
++ 0x4509fb04UL, 0x00000000UL, 0xcd684f16UL, 0x00000001UL, // x^186368 mod p(x)` << 1, x^186432 mod p(x)` << 1
++ 0x202f6398UL, 0x00000001UL, 0x4bc6a70aUL, 0x00000000UL, // x^185344 mod p(x)` << 1, x^185408 mod p(x)` << 1
++ 0x3aea243eUL, 0x00000001UL, 0x4fc7e8e4UL, 0x00000000UL, // x^184320 mod p(x)` << 1, x^184384 mod p(x)` << 1
++ 0xb4052ae6UL, 0x00000001UL, 0x30103f1cUL, 0x00000001UL, // x^183296 mod p(x)` << 1, x^183360 mod p(x)` << 1
++ 0xcd2a0ae8UL, 0x00000001UL, 0x11b0024cUL, 0x00000001UL, // x^182272 mod p(x)` << 1, x^182336 mod p(x)` << 1
++ 0xfe4aa8b4UL, 0x00000001UL, 0x0b3079daUL, 0x00000001UL, // x^181248 mod p(x)` << 1, x^181312 mod p(x)` << 1
++ 0xd1559a42UL, 0x00000001UL, 0x0192bcc2UL, 0x00000001UL, // x^180224 mod p(x)` << 1, x^180288 mod p(x)` << 1
++ 0xf3e05eccUL, 0x00000001UL, 0x74838d50UL, 0x00000000UL, // x^179200 mod p(x)` << 1, x^179264 mod p(x)` << 1
++ 0x04ddd2ccUL, 0x00000001UL, 0x1b20f520UL, 0x00000000UL, // x^178176 mod p(x)` << 1, x^178240 mod p(x)` << 1
++ 0x5393153cUL, 0x00000001UL, 0x50c3590aUL, 0x00000000UL, // x^177152 mod p(x)` << 1, x^177216 mod p(x)` << 1
++ 0x57e942c6UL, 0x00000000UL, 0xb41cac8eUL, 0x00000000UL, // x^176128 mod p(x)` << 1, x^176192 mod p(x)` << 1
++ 0x2c633850UL, 0x00000001UL, 0x0c72cc78UL, 0x00000000UL, // x^175104 mod p(x)` << 1, x^175168 mod p(x)` << 1
++ 0xebcaae4cUL, 0x00000000UL, 0x30cdb032UL, 0x00000000UL, // x^174080 mod p(x)` << 1, x^174144 mod p(x)` << 1
++ 0x3ee532a6UL, 0x00000001UL, 0x3e09fc32UL, 0x00000001UL, // x^173056 mod p(x)` << 1, x^173120 mod p(x)` << 1
++ 0xbf0cbc7eUL, 0x00000001UL, 0x1ed624d2UL, 0x00000000UL, // x^172032 mod p(x)` << 1, x^172096 mod p(x)` << 1
++ 0xd50b7a5aUL, 0x00000000UL, 0x781aee1aUL, 0x00000000UL, // x^171008 mod p(x)` << 1, x^171072 mod p(x)` << 1
++ 0x02fca6e8UL, 0x00000000UL, 0xc4d8348cUL, 0x00000001UL, // x^169984 mod p(x)` << 1, x^170048 mod p(x)` << 1
++ 0x7af40044UL, 0x00000000UL, 0x57a40336UL, 0x00000000UL, // x^168960 mod p(x)` << 1, x^169024 mod p(x)` << 1
++ 0x16178744UL, 0x00000000UL, 0x85544940UL, 0x00000000UL, // x^167936 mod p(x)` << 1, x^168000 mod p(x)` << 1
++ 0x4c177458UL, 0x00000001UL, 0x9cd21e80UL, 0x00000001UL, // x^166912 mod p(x)` << 1, x^166976 mod p(x)` << 1
++ 0x1b6ddf04UL, 0x00000001UL, 0x3eb95bc0UL, 0x00000001UL, // x^165888 mod p(x)` << 1, x^165952 mod p(x)` << 1
++ 0xf3e29cccUL, 0x00000001UL, 0xdfc9fdfcUL, 0x00000001UL, // x^164864 mod p(x)` << 1, x^164928 mod p(x)` << 1
++ 0x35ae7562UL, 0x00000001UL, 0xcd028bc2UL, 0x00000000UL, // x^163840 mod p(x)` << 1, x^163904 mod p(x)` << 1
++ 0x90ef812cUL, 0x00000001UL, 0x90db8c44UL, 0x00000000UL, // x^162816 mod p(x)` << 1, x^162880 mod p(x)` << 1
++ 0x67a2c786UL, 0x00000000UL, 0x0010a4ceUL, 0x00000001UL, // x^161792 mod p(x)` << 1, x^161856 mod p(x)` << 1
++ 0x48b9496cUL, 0x00000000UL, 0xc8f4c72cUL, 0x00000001UL, // x^160768 mod p(x)` << 1, x^160832 mod p(x)` << 1
++ 0x5a422de6UL, 0x00000001UL, 0x1c26170cUL, 0x00000000UL, // x^159744 mod p(x)` << 1, x^159808 mod p(x)` << 1
++ 0xef0e3640UL, 0x00000001UL, 0xe3fccf68UL, 0x00000000UL, // x^158720 mod p(x)` << 1, x^158784 mod p(x)` << 1
++ 0x006d2d26UL, 0x00000001UL, 0xd513ed24UL, 0x00000000UL, // x^157696 mod p(x)` << 1, x^157760 mod p(x)` << 1
++ 0x170d56d6UL, 0x00000001UL, 0x141beadaUL, 0x00000000UL, // x^156672 mod p(x)` << 1, x^156736 mod p(x)` << 1
++ 0xa5fb613cUL, 0x00000000UL, 0x1071aea0UL, 0x00000001UL, // x^155648 mod p(x)` << 1, x^155712 mod p(x)` << 1
++ 0x40bbf7fcUL, 0x00000000UL, 0x2e19080aUL, 0x00000001UL, // x^154624 mod p(x)` << 1, x^154688 mod p(x)` << 1
++ 0x6ac3a5b2UL, 0x00000001UL, 0x00ecf826UL, 0x00000001UL, // x^153600 mod p(x)` << 1, x^153664 mod p(x)` << 1
++ 0xabf16230UL, 0x00000000UL, 0x69b09412UL, 0x00000000UL, // x^152576 mod p(x)` << 1, x^152640 mod p(x)` << 1
++ 0xebe23facUL, 0x00000001UL, 0x22297bacUL, 0x00000001UL, // x^151552 mod p(x)` << 1, x^151616 mod p(x)` << 1
++ 0x8b6a0894UL, 0x00000000UL, 0xe9e4b068UL, 0x00000000UL, // x^150528 mod p(x)` << 1, x^150592 mod p(x)` << 1
++ 0x288ea478UL, 0x00000001UL, 0x4b38651aUL, 0x00000000UL, // x^149504 mod p(x)` << 1, x^149568 mod p(x)` << 1
++ 0x6619c442UL, 0x00000001UL, 0x468360e2UL, 0x00000001UL, // x^148480 mod p(x)` << 1, x^148544 mod p(x)` << 1
++ 0x86230038UL, 0x00000000UL, 0x121c2408UL, 0x00000000UL, // x^147456 mod p(x)` << 1, x^147520 mod p(x)` << 1
++ 0x7746a756UL, 0x00000001UL, 0xda7e7d08UL, 0x00000000UL, // x^146432 mod p(x)` << 1, x^146496 mod p(x)` << 1
++ 0x91b8f8f8UL, 0x00000001UL, 0x058d7652UL, 0x00000001UL, // x^145408 mod p(x)` << 1, x^145472 mod p(x)` << 1
++ 0x8e167708UL, 0x00000000UL, 0x4a098a90UL, 0x00000001UL, // x^144384 mod p(x)` << 1, x^144448 mod p(x)` << 1
++ 0x48b22d54UL, 0x00000001UL, 0x20dbe72eUL, 0x00000000UL, // x^143360 mod p(x)` << 1, x^143424 mod p(x)` << 1
++ 0x44ba2c3cUL, 0x00000000UL, 0x1e7323e8UL, 0x00000001UL, // x^142336 mod p(x)` << 1, x^142400 mod p(x)` << 1
++ 0xb54d2b52UL, 0x00000000UL, 0xd5d4bf94UL, 0x00000000UL, // x^141312 mod p(x)` << 1, x^141376 mod p(x)` << 1
++ 0x05a4fd8aUL, 0x00000000UL, 0x99d8746cUL, 0x00000001UL, // x^140288 mod p(x)` << 1, x^140352 mod p(x)` << 1
++ 0x39f9fc46UL, 0x00000001UL, 0xce9ca8a0UL, 0x00000000UL, // x^139264 mod p(x)` << 1, x^139328 mod p(x)` << 1
++ 0x5a1fa824UL, 0x00000001UL, 0x136edeceUL, 0x00000000UL, // x^138240 mod p(x)` << 1, x^138304 mod p(x)` << 1
++ 0x0a61ae4cUL, 0x00000000UL, 0x9b92a068UL, 0x00000001UL, // x^137216 mod p(x)` << 1, x^137280 mod p(x)` << 1
++ 0x45e9113eUL, 0x00000001UL, 0x71d62206UL, 0x00000000UL, // x^136192 mod p(x)` << 1, x^136256 mod p(x)` << 1
++ 0x6a348448UL, 0x00000000UL, 0xdfc50158UL, 0x00000000UL, // x^135168 mod p(x)` << 1, x^135232 mod p(x)` << 1
++ 0x4d80a08cUL, 0x00000000UL, 0x517626bcUL, 0x00000001UL, // x^134144 mod p(x)` << 1, x^134208 mod p(x)` << 1
++ 0x4b6837a0UL, 0x00000001UL, 0x48d1e4faUL, 0x00000001UL, // x^133120 mod p(x)` << 1, x^133184 mod p(x)` << 1
++ 0x6896a7fcUL, 0x00000001UL, 0x94d8266eUL, 0x00000000UL, // x^132096 mod p(x)` << 1, x^132160 mod p(x)` << 1
++ 0x4f187140UL, 0x00000001UL, 0x606c5e34UL, 0x00000000UL, // x^131072 mod p(x)` << 1, x^131136 mod p(x)` << 1
++ 0x9581b9daUL, 0x00000001UL, 0x9766beaaUL, 0x00000001UL, // x^130048 mod p(x)` << 1, x^130112 mod p(x)` << 1
++ 0x091bc984UL, 0x00000001UL, 0xd80c506cUL, 0x00000001UL, // x^129024 mod p(x)` << 1, x^129088 mod p(x)` << 1
++ 0x1067223cUL, 0x00000000UL, 0x1e73837cUL, 0x00000000UL, // x^128000 mod p(x)` << 1, x^128064 mod p(x)` << 1
++ 0xab16ea02UL, 0x00000001UL, 0x64d587deUL, 0x00000000UL, // x^126976 mod p(x)` << 1, x^127040 mod p(x)` << 1
++ 0x3c4598a8UL, 0x00000001UL, 0xf4a507b0UL, 0x00000000UL, // x^125952 mod p(x)` << 1, x^126016 mod p(x)` << 1
++ 0xb3735430UL, 0x00000000UL, 0x40e342fcUL, 0x00000000UL, // x^124928 mod p(x)` << 1, x^124992 mod p(x)` << 1
++ 0xbb3fc0c0UL, 0x00000001UL, 0xd5ad9c3aUL, 0x00000001UL, // x^123904 mod p(x)` << 1, x^123968 mod p(x)` << 1
++ 0x570ae19cUL, 0x00000001UL, 0x94a691a4UL, 0x00000000UL, // x^122880 mod p(x)` << 1, x^122944 mod p(x)` << 1
++ 0xea910712UL, 0x00000001UL, 0x271ecdfaUL, 0x00000001UL, // x^121856 mod p(x)` << 1, x^121920 mod p(x)` << 1
++ 0x67127128UL, 0x00000001UL, 0x9e54475aUL, 0x00000000UL, // x^120832 mod p(x)` << 1, x^120896 mod p(x)` << 1
++ 0x19e790a2UL, 0x00000000UL, 0xc9c099eeUL, 0x00000000UL, // x^119808 mod p(x)` << 1, x^119872 mod p(x)` << 1
++ 0x3788f710UL, 0x00000000UL, 0x9a2f736cUL, 0x00000000UL, // x^118784 mod p(x)` << 1, x^118848 mod p(x)` << 1
++ 0x682a160eUL, 0x00000001UL, 0xbb9f4996UL, 0x00000000UL, // x^117760 mod p(x)` << 1, x^117824 mod p(x)` << 1
++ 0x7f0ebd2eUL, 0x00000000UL, 0xdb688050UL, 0x00000001UL, // x^116736 mod p(x)` << 1, x^116800 mod p(x)` << 1
++ 0x2b032080UL, 0x00000000UL, 0xe9b10af4UL, 0x00000000UL, // x^115712 mod p(x)` << 1, x^115776 mod p(x)` << 1
++ 0xcfd1664aUL, 0x00000000UL, 0x2d4545e4UL, 0x00000001UL, // x^114688 mod p(x)` << 1, x^114752 mod p(x)` << 1
++ 0xaa1181c2UL, 0x00000000UL, 0x0361139cUL, 0x00000000UL, // x^113664 mod p(x)` << 1, x^113728 mod p(x)` << 1
++ 0xddd08002UL, 0x00000000UL, 0xa5a1a3a8UL, 0x00000001UL, // x^112640 mod p(x)` << 1, x^112704 mod p(x)` << 1
++ 0xe8dd0446UL, 0x00000000UL, 0x6844e0b0UL, 0x00000000UL, // x^111616 mod p(x)` << 1, x^111680 mod p(x)` << 1
++ 0xbbd94a00UL, 0x00000001UL, 0xc3762f28UL, 0x00000000UL, // x^110592 mod p(x)` << 1, x^110656 mod p(x)` << 1
++ 0xab6cd180UL, 0x00000000UL, 0xd26287a2UL, 0x00000001UL, // x^109568 mod p(x)` << 1, x^109632 mod p(x)` << 1
++ 0x31803ce2UL, 0x00000000UL, 0xf6f0bba8UL, 0x00000001UL, // x^108544 mod p(x)` << 1, x^108608 mod p(x)` << 1
++ 0x24f40b0cUL, 0x00000000UL, 0x2ffabd62UL, 0x00000000UL, // x^107520 mod p(x)` << 1, x^107584 mod p(x)` << 1
++ 0xba1d9834UL, 0x00000001UL, 0xfb4516b8UL, 0x00000000UL, // x^106496 mod p(x)` << 1, x^106560 mod p(x)` << 1
++ 0x04de61aaUL, 0x00000001UL, 0x8cfa961cUL, 0x00000001UL, // x^105472 mod p(x)` << 1, x^105536 mod p(x)` << 1
++ 0x13e40d46UL, 0x00000001UL, 0x9e588d52UL, 0x00000001UL, // x^104448 mod p(x)` << 1, x^104512 mod p(x)` << 1
++ 0x415598a0UL, 0x00000001UL, 0x180f0bbcUL, 0x00000001UL, // x^103424 mod p(x)` << 1, x^103488 mod p(x)` << 1
++ 0xbf6c8c90UL, 0x00000000UL, 0xe1d9177aUL, 0x00000000UL, // x^102400 mod p(x)` << 1, x^102464 mod p(x)` << 1
++ 0x788b0504UL, 0x00000001UL, 0x05abc27cUL, 0x00000001UL, // x^101376 mod p(x)` << 1, x^101440 mod p(x)` << 1
++ 0x38385d02UL, 0x00000000UL, 0x972e4a58UL, 0x00000000UL, // x^100352 mod p(x)` << 1, x^100416 mod p(x)` << 1
++ 0xb6c83844UL, 0x00000001UL, 0x83499a5eUL, 0x00000001UL, // x^99328 mod p(x)` << 1, x^99392 mod p(x)` << 1
++ 0x51061a8aUL, 0x00000000UL, 0xc96a8ccaUL, 0x00000001UL, // x^98304 mod p(x)` << 1, x^98368 mod p(x)` << 1
++ 0x7351388aUL, 0x00000001UL, 0xa1a5b60cUL, 0x00000001UL, // x^97280 mod p(x)` << 1, x^97344 mod p(x)` << 1
++ 0x32928f92UL, 0x00000001UL, 0xe4b6ac9cUL, 0x00000000UL, // x^96256 mod p(x)` << 1, x^96320 mod p(x)` << 1
++ 0xe6b4f48aUL, 0x00000000UL, 0x807e7f5aUL, 0x00000001UL, // x^95232 mod p(x)` << 1, x^95296 mod p(x)` << 1
++ 0x39d15e90UL, 0x00000000UL, 0x7a7e3bc8UL, 0x00000001UL, // x^94208 mod p(x)` << 1, x^94272 mod p(x)` << 1
++ 0x312d6074UL, 0x00000000UL, 0xd73975daUL, 0x00000000UL, // x^93184 mod p(x)` << 1, x^93248 mod p(x)` << 1
++ 0x7bbb2cc4UL, 0x00000001UL, 0x7375d038UL, 0x00000001UL, // x^92160 mod p(x)` << 1, x^92224 mod p(x)` << 1
++ 0x6ded3e18UL, 0x00000001UL, 0x193680bcUL, 0x00000000UL, // x^91136 mod p(x)` << 1, x^91200 mod p(x)` << 1
++ 0xf1638b16UL, 0x00000000UL, 0x999b06f6UL, 0x00000000UL, // x^90112 mod p(x)` << 1, x^90176 mod p(x)` << 1
++ 0xd38b9eccUL, 0x00000001UL, 0xf685d2b8UL, 0x00000001UL, // x^89088 mod p(x)` << 1, x^89152 mod p(x)` << 1
++ 0x8b8d09dcUL, 0x00000001UL, 0xf4ecbed2UL, 0x00000001UL, // x^88064 mod p(x)` << 1, x^88128 mod p(x)` << 1
++ 0xe7bc27d2UL, 0x00000000UL, 0xba16f1a0UL, 0x00000000UL, // x^87040 mod p(x)` << 1, x^87104 mod p(x)` << 1
++ 0x275e1e96UL, 0x00000000UL, 0x15aceac4UL, 0x00000001UL, // x^86016 mod p(x)` << 1, x^86080 mod p(x)` << 1
++ 0xe2e3031eUL, 0x00000000UL, 0xaeff6292UL, 0x00000001UL, // x^84992 mod p(x)` << 1, x^85056 mod p(x)` << 1
++ 0x041c84d8UL, 0x00000001UL, 0x9640124cUL, 0x00000000UL, // x^83968 mod p(x)` << 1, x^84032 mod p(x)` << 1
++ 0x706ce672UL, 0x00000000UL, 0x14f41f02UL, 0x00000001UL, // x^82944 mod p(x)` << 1, x^83008 mod p(x)` << 1
++ 0x5d5070daUL, 0x00000001UL, 0x9c5f3586UL, 0x00000000UL, // x^81920 mod p(x)` << 1, x^81984 mod p(x)` << 1
++ 0x38f9493aUL, 0x00000000UL, 0x878275faUL, 0x00000001UL, // x^80896 mod p(x)` << 1, x^80960 mod p(x)` << 1
++ 0xa3348a76UL, 0x00000000UL, 0xddc42ce8UL, 0x00000000UL, // x^79872 mod p(x)` << 1, x^79936 mod p(x)` << 1
++ 0xad0aab92UL, 0x00000001UL, 0x81d2c73aUL, 0x00000001UL, // x^78848 mod p(x)` << 1, x^78912 mod p(x)` << 1
++ 0x9e85f712UL, 0x00000001UL, 0x41c9320aUL, 0x00000001UL, // x^77824 mod p(x)` << 1, x^77888 mod p(x)` << 1
++ 0x5a871e76UL, 0x00000000UL, 0x5235719aUL, 0x00000001UL, // x^76800 mod p(x)` << 1, x^76864 mod p(x)` << 1
++ 0x7249c662UL, 0x00000001UL, 0xbe27d804UL, 0x00000000UL, // x^75776 mod p(x)` << 1, x^75840 mod p(x)` << 1
++ 0x3a084712UL, 0x00000000UL, 0x6242d45aUL, 0x00000000UL, // x^74752 mod p(x)` << 1, x^74816 mod p(x)` << 1
++ 0xed438478UL, 0x00000000UL, 0x9a53638eUL, 0x00000000UL, // x^73728 mod p(x)` << 1, x^73792 mod p(x)` << 1
++ 0xabac34ccUL, 0x00000000UL, 0x001ecfb6UL, 0x00000001UL, // x^72704 mod p(x)` << 1, x^72768 mod p(x)` << 1
++ 0x5f35ef3eUL, 0x00000000UL, 0x6d7c2d64UL, 0x00000001UL, // x^71680 mod p(x)` << 1, x^71744 mod p(x)` << 1
++ 0x47d6608cUL, 0x00000000UL, 0xd0ce46c0UL, 0x00000001UL, // x^70656 mod p(x)` << 1, x^70720 mod p(x)` << 1
++ 0x2d01470eUL, 0x00000000UL, 0x24c907b4UL, 0x00000001UL, // x^69632 mod p(x)` << 1, x^69696 mod p(x)` << 1
++ 0x58bbc7b0UL, 0x00000001UL, 0x18a555caUL, 0x00000000UL, // x^68608 mod p(x)` << 1, x^68672 mod p(x)` << 1
++ 0xc0a23e8eUL, 0x00000000UL, 0x6b0980bcUL, 0x00000000UL, // x^67584 mod p(x)` << 1, x^67648 mod p(x)` << 1
++ 0xebd85c88UL, 0x00000001UL, 0x8bbba964UL, 0x00000000UL, // x^66560 mod p(x)` << 1, x^66624 mod p(x)` << 1
++ 0x9ee20bb2UL, 0x00000001UL, 0x070a5a1eUL, 0x00000001UL, // x^65536 mod p(x)` << 1, x^65600 mod p(x)` << 1
++ 0xacabf2d6UL, 0x00000001UL, 0x2204322aUL, 0x00000000UL, // x^64512 mod p(x)` << 1, x^64576 mod p(x)` << 1
++ 0xb7963d56UL, 0x00000001UL, 0xa27524d0UL, 0x00000000UL, // x^63488 mod p(x)` << 1, x^63552 mod p(x)` << 1
++ 0x7bffa1feUL, 0x00000001UL, 0x20b1e4baUL, 0x00000000UL, // x^62464 mod p(x)` << 1, x^62528 mod p(x)` << 1
++ 0x1f15333eUL, 0x00000000UL, 0x32cc27fcUL, 0x00000000UL, // x^61440 mod p(x)` << 1, x^61504 mod p(x)` << 1
++ 0x8593129eUL, 0x00000001UL, 0x44dd22b8UL, 0x00000000UL, // x^60416 mod p(x)` << 1, x^60480 mod p(x)` << 1
++ 0x9cb32602UL, 0x00000001UL, 0xdffc9e0aUL, 0x00000000UL, // x^59392 mod p(x)` << 1, x^59456 mod p(x)` << 1
++ 0x42b05cc8UL, 0x00000001UL, 0xb7a0ed14UL, 0x00000001UL, // x^58368 mod p(x)` << 1, x^58432 mod p(x)` << 1
++ 0xbe49e7a4UL, 0x00000001UL, 0xc7842488UL, 0x00000000UL, // x^57344 mod p(x)` << 1, x^57408 mod p(x)` << 1
++ 0x08f69d6cUL, 0x00000001UL, 0xc02a4feeUL, 0x00000001UL, // x^56320 mod p(x)` << 1, x^56384 mod p(x)` << 1
++ 0x6c0971f0UL, 0x00000000UL, 0x3c273778UL, 0x00000000UL, // x^55296 mod p(x)` << 1, x^55360 mod p(x)` << 1
++ 0x5b16467aUL, 0x00000000UL, 0xd63f8894UL, 0x00000001UL, // x^54272 mod p(x)` << 1, x^54336 mod p(x)` << 1
++ 0x551a628eUL, 0x00000001UL, 0x6be557d6UL, 0x00000000UL, // x^53248 mod p(x)` << 1, x^53312 mod p(x)` << 1
++ 0x9e42ea92UL, 0x00000001UL, 0x6a7806eaUL, 0x00000000UL, // x^52224 mod p(x)` << 1, x^52288 mod p(x)` << 1
++ 0x2fa83ff2UL, 0x00000001UL, 0x6155aa0cUL, 0x00000001UL, // x^51200 mod p(x)` << 1, x^51264 mod p(x)` << 1
++ 0x1ca9cde0UL, 0x00000001UL, 0x908650acUL, 0x00000000UL, // x^50176 mod p(x)` << 1, x^50240 mod p(x)` << 1
++ 0xc8e5cd74UL, 0x00000000UL, 0xaa5a8084UL, 0x00000000UL, // x^49152 mod p(x)` << 1, x^49216 mod p(x)` << 1
++ 0x96c27f0cUL, 0x00000000UL, 0x91bb500aUL, 0x00000001UL, // x^48128 mod p(x)` << 1, x^48192 mod p(x)` << 1
++ 0x2baed926UL, 0x00000000UL, 0x64e9bed0UL, 0x00000000UL, // x^47104 mod p(x)` << 1, x^47168 mod p(x)` << 1
++ 0x7c8de8d2UL, 0x00000001UL, 0x9444f302UL, 0x00000000UL, // x^46080 mod p(x)` << 1, x^46144 mod p(x)` << 1
++ 0xd43d6068UL, 0x00000000UL, 0x9db07d3cUL, 0x00000001UL, // x^45056 mod p(x)` << 1, x^45120 mod p(x)` << 1
++ 0xcb2c4b26UL, 0x00000000UL, 0x359e3e6eUL, 0x00000001UL, // x^44032 mod p(x)` << 1, x^44096 mod p(x)` << 1
++ 0x45b8da26UL, 0x00000001UL, 0xe4f10dd2UL, 0x00000001UL, // x^43008 mod p(x)` << 1, x^43072 mod p(x)` << 1
++ 0x8fff4b08UL, 0x00000001UL, 0x24f5735eUL, 0x00000001UL, // x^41984 mod p(x)` << 1, x^42048 mod p(x)` << 1
++ 0x50b58ed0UL, 0x00000001UL, 0x24760a4cUL, 0x00000001UL, // x^40960 mod p(x)` << 1, x^41024 mod p(x)` << 1
++ 0x549f39bcUL, 0x00000001UL, 0x0f1fc186UL, 0x00000000UL, // x^39936 mod p(x)` << 1, x^40000 mod p(x)` << 1
++ 0xef4d2f42UL, 0x00000000UL, 0x150e4cc4UL, 0x00000000UL, // x^38912 mod p(x)` << 1, x^38976 mod p(x)` << 1
++ 0xb1468572UL, 0x00000001UL, 0x2a6204e8UL, 0x00000000UL, // x^37888 mod p(x)` << 1, x^37952 mod p(x)` << 1
++ 0x3d7403b2UL, 0x00000001UL, 0xbeb1d432UL, 0x00000000UL, // x^36864 mod p(x)` << 1, x^36928 mod p(x)` << 1
++ 0xa4681842UL, 0x00000001UL, 0x35f3f1f0UL, 0x00000001UL, // x^35840 mod p(x)` << 1, x^35904 mod p(x)` << 1
++ 0x67714492UL, 0x00000001UL, 0x74fe2232UL, 0x00000000UL, // x^34816 mod p(x)` << 1, x^34880 mod p(x)` << 1
++ 0xe599099aUL, 0x00000001UL, 0x1ac6e2baUL, 0x00000000UL, // x^33792 mod p(x)` << 1, x^33856 mod p(x)` << 1
++ 0xfe128194UL, 0x00000000UL, 0x13fca91eUL, 0x00000000UL, // x^32768 mod p(x)` << 1, x^32832 mod p(x)` << 1
++ 0x77e8b990UL, 0x00000000UL, 0x83f4931eUL, 0x00000001UL, // x^31744 mod p(x)` << 1, x^31808 mod p(x)` << 1
++ 0xa267f63aUL, 0x00000001UL, 0xb6d9b4e4UL, 0x00000000UL, // x^30720 mod p(x)` << 1, x^30784 mod p(x)` << 1
++ 0x945c245aUL, 0x00000001UL, 0xb5188656UL, 0x00000000UL, // x^29696 mod p(x)` << 1, x^29760 mod p(x)` << 1
++ 0x49002e76UL, 0x00000001UL, 0x27a81a84UL, 0x00000000UL, // x^28672 mod p(x)` << 1, x^28736 mod p(x)` << 1
++ 0xbb8310a4UL, 0x00000001UL, 0x25699258UL, 0x00000001UL, // x^27648 mod p(x)` << 1, x^27712 mod p(x)` << 1
++ 0x9ec60bccUL, 0x00000001UL, 0xb23de796UL, 0x00000001UL, // x^26624 mod p(x)` << 1, x^26688 mod p(x)` << 1
++ 0x2d8590aeUL, 0x00000001UL, 0xfe4365dcUL, 0x00000000UL, // x^25600 mod p(x)` << 1, x^25664 mod p(x)` << 1
++ 0x65b00684UL, 0x00000000UL, 0xc68f497aUL, 0x00000000UL, // x^24576 mod p(x)` << 1, x^24640 mod p(x)` << 1
++ 0x5e5aeadcUL, 0x00000001UL, 0xfbf521eeUL, 0x00000000UL, // x^23552 mod p(x)` << 1, x^23616 mod p(x)` << 1
++ 0xb77ff2b0UL, 0x00000000UL, 0x5eac3378UL, 0x00000001UL, // x^22528 mod p(x)` << 1, x^22592 mod p(x)` << 1
++ 0x88da2ff6UL, 0x00000001UL, 0x34914b90UL, 0x00000001UL, // x^21504 mod p(x)` << 1, x^21568 mod p(x)` << 1
++ 0x63da929aUL, 0x00000000UL, 0x16335cfeUL, 0x00000000UL, // x^20480 mod p(x)` << 1, x^20544 mod p(x)` << 1
++ 0x389caa80UL, 0x00000001UL, 0x0372d10cUL, 0x00000001UL, // x^19456 mod p(x)` << 1, x^19520 mod p(x)` << 1
++ 0x3db599d2UL, 0x00000001UL, 0x5097b908UL, 0x00000001UL, // x^18432 mod p(x)` << 1, x^18496 mod p(x)` << 1
++ 0x22505a86UL, 0x00000001UL, 0x227a7572UL, 0x00000001UL, // x^17408 mod p(x)` << 1, x^17472 mod p(x)` << 1
++ 0x6bd72746UL, 0x00000001UL, 0x9a8f75c0UL, 0x00000000UL, // x^16384 mod p(x)` << 1, x^16448 mod p(x)` << 1
++ 0xc3faf1d4UL, 0x00000001UL, 0x682c77a2UL, 0x00000000UL, // x^15360 mod p(x)` << 1, x^15424 mod p(x)` << 1
++ 0x111c826cUL, 0x00000001UL, 0x231f091cUL, 0x00000000UL, // x^14336 mod p(x)` << 1, x^14400 mod p(x)` << 1
++ 0x153e9fb2UL, 0x00000000UL, 0x7d4439f2UL, 0x00000000UL, // x^13312 mod p(x)` << 1, x^13376 mod p(x)` << 1
++ 0x2b1f7b60UL, 0x00000000UL, 0x7e221efcUL, 0x00000001UL, // x^12288 mod p(x)` << 1, x^12352 mod p(x)` << 1
++ 0xb1dba570UL, 0x00000000UL, 0x67457c38UL, 0x00000001UL, // x^11264 mod p(x)` << 1, x^11328 mod p(x)` << 1
++ 0xf6397b76UL, 0x00000001UL, 0xbdf081c4UL, 0x00000000UL, // x^10240 mod p(x)` << 1, x^10304 mod p(x)` << 1
++ 0x56335214UL, 0x00000001UL, 0x6286d6b0UL, 0x00000001UL, // x^9216 mod p(x)` << 1, x^9280 mod p(x)` << 1
++ 0xd70e3986UL, 0x00000001UL, 0xc84f001cUL, 0x00000000UL, // x^8192 mod p(x)` << 1, x^8256 mod p(x)` << 1
++ 0x3701a774UL, 0x00000000UL, 0x64efe7c0UL, 0x00000000UL, // x^7168 mod p(x)` << 1, x^7232 mod p(x)` << 1
++ 0xac81ef72UL, 0x00000000UL, 0x0ac2d904UL, 0x00000000UL, // x^6144 mod p(x)` << 1, x^6208 mod p(x)` << 1
++ 0x33212464UL, 0x00000001UL, 0xfd226d14UL, 0x00000000UL, // x^5120 mod p(x)` << 1, x^5184 mod p(x)` << 1
++ 0xe4e45610UL, 0x00000000UL, 0x1cfd42e0UL, 0x00000001UL, // x^4096 mod p(x)` << 1, x^4160 mod p(x)` << 1
++ 0x0c1bd370UL, 0x00000000UL, 0x6e5a5678UL, 0x00000001UL, // x^3072 mod p(x)` << 1, x^3136 mod p(x)` << 1
++ 0xa7b9e7a6UL, 0x00000001UL, 0xd888fe22UL, 0x00000001UL, // x^2048 mod p(x)` << 1, x^2112 mod p(x)` << 1
++ 0x7d657a10UL, 0x00000000UL, 0xaf77fcd4UL, 0x00000001UL, // x^1024 mod p(x)` << 1, x^1088 mod p(x)` << 1
++
++ // Reduce final 1024-2048 bits to 64 bits, shifting 32 bits to include the trailing 32 bits of zeros
++ 0xec447f11UL, 0x99168a18UL, 0x13e8221eUL, 0xed837b26UL, // x^2048 mod p(x)`, x^2016 mod p(x)`, x^1984 mod p(x)`, x^1952 mod p(x)`
++ 0x8fd2cd3cUL, 0xe23e954eUL, 0x47b9ce5aUL, 0xc8acdd81UL, // x^1920 mod p(x)`, x^1888 mod p(x)`, x^1856 mod p(x)`, x^1824 mod p(x)`
++ 0x6b1d2b53UL, 0x92f8befeUL, 0xd4277e25UL, 0xd9ad6d87UL, // x^1792 mod p(x)`, x^1760 mod p(x)`, x^1728 mod p(x)`, x^1696 mod p(x)`
++ 0x291ea462UL, 0xf38a3556UL, 0x33fbca3bUL, 0xc10ec5e0UL, // x^1664 mod p(x)`, x^1632 mod p(x)`, x^1600 mod p(x)`, x^1568 mod p(x)`
++ 0x62b6ca4bUL, 0x974ac562UL, 0x82e02e2fUL, 0xc0b55b0eUL, // x^1536 mod p(x)`, x^1504 mod p(x)`, x^1472 mod p(x)`, x^1440 mod p(x)`
++ 0x784d2a56UL, 0x855712b3UL, 0xe172334dUL, 0x71aa1df0UL, // x^1408 mod p(x)`, x^1376 mod p(x)`, x^1344 mod p(x)`, x^1312 mod p(x)`
++ 0x0eaee722UL, 0xa5abe9f8UL, 0x3969324dUL, 0xfee3053eUL, // x^1280 mod p(x)`, x^1248 mod p(x)`, x^1216 mod p(x)`, x^1184 mod p(x)`
++ 0xdb54814cUL, 0x1fa0943dUL, 0x3eb2bd08UL, 0xf44779b9UL, // x^1152 mod p(x)`, x^1120 mod p(x)`, x^1088 mod p(x)`, x^1056 mod p(x)`
++ 0xd7bbfe6aUL, 0xa53ff440UL, 0x00cc3374UL, 0xf5449b3fUL, // x^1024 mod p(x)`, x^992 mod p(x)`, x^960 mod p(x)`, x^928 mod p(x)`
++ 0x6325605cUL, 0xebe7e356UL, 0xd777606eUL, 0x6f8346e1UL, // x^896 mod p(x)`, x^864 mod p(x)`, x^832 mod p(x)`, x^800 mod p(x)`
++ 0xe5b592b8UL, 0xc65a272cUL, 0xc0b95347UL, 0xe3ab4f2aUL, // x^768 mod p(x)`, x^736 mod p(x)`, x^704 mod p(x)`, x^672 mod p(x)`
++ 0x4721589fUL, 0x5705a9caUL, 0x329ecc11UL, 0xaa2215eaUL, // x^640 mod p(x)`, x^608 mod p(x)`, x^576 mod p(x)`, x^544 mod p(x)`
++ 0x88d14467UL, 0xe3720acbUL, 0xd95efd26UL, 0x1ed8f66eUL, // x^512 mod p(x)`, x^480 mod p(x)`, x^448 mod p(x)`, x^416 mod p(x)`
++ 0x15141c31UL, 0xba1aca03UL, 0xa700e96aUL, 0x78ed02d5UL, // x^384 mod p(x)`, x^352 mod p(x)`, x^320 mod p(x)`, x^288 mod p(x)`
++ 0xed627daeUL, 0xad2a31b3UL, 0x32b39da3UL, 0xba8ccbe8UL, // x^256 mod p(x)`, x^224 mod p(x)`, x^192 mod p(x)`, x^160 mod p(x)`
++ 0xa06a2517UL, 0x6655004fUL, 0xb1e6b092UL, 0xedb88320UL // x^128 mod p(x)`, x^96 mod p(x)`, x^64 mod p(x)`, x^32 mod p(x)`
++ };
++
++ juint* ptr = (juint*) malloc(sizeof(juint) * CRC32_CONSTANTS_SIZE);
++ guarantee(((intptr_t)ptr & 0xF) == 0, "16-byte alignment needed");
++ guarantee(ptr != NULL, "allocation error of a crc table");
++ memcpy((void*)ptr, constants, sizeof(juint) * CRC32_CONSTANTS_SIZE);
++ return ptr;
++}
++
++juint* StubRoutines::ppc64::generate_crc_barret_constants() {
++ juint barret_constants[CRC32_BARRET_CONSTANTS] = {
++ 0xf7011641UL, 0x00000001UL, 0x00000000UL, 0x00000000UL,
++ 0xdb710641UL, 0x00000001UL, 0x00000000UL, 0x00000000UL
++ };
++ juint* ptr = (juint*) malloc(sizeof(juint) * CRC32_CONSTANTS_SIZE);
++ guarantee(((intptr_t)ptr & 0xF) == 0, "16-byte alignment needed");
++ guarantee(ptr != NULL, "allocation error of a crc table");
++ memcpy((void*) ptr, barret_constants, sizeof(juint) * CRC32_BARRET_CONSTANTS);
++ return ptr;
++}
++
+ // CRC32 Intrinsics.
+ /**
+ * crc_table[] from jdk/src/share/native/java/util/zip/zlib-1.2.8/crc32.h
+@@ -477,3 +782,7 @@
+ #endif
+ }
+ };
++
++juint* StubRoutines::ppc64::_constants = StubRoutines::ppc64::generate_crc_constants();
++
++juint* StubRoutines::ppc64::_barret_constants = StubRoutines::ppc64::generate_crc_barret_constants();
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
+@@ -45,6 +45,8 @@
+ #else
+ #define CRC32_TABLES 1
+ #endif
++#define CRC32_CONSTANTS_SIZE 1084
++#define CRC32_BARRET_CONSTANTS 10
+
+ class ppc64 {
+ friend class StubGenerator;
+@@ -53,11 +55,17 @@
+
+ // CRC32 Intrinsics.
+ static juint _crc_table[CRC32_TABLES][CRC32_COLUMN_SIZE];
++ static juint* _constants;
++ static juint* _barret_constants;
+
+ public:
+
+ // CRC32 Intrinsics.
+ static void generate_load_crc_table_addr(MacroAssembler* masm, Register table);
++ static void generate_load_crc_constants_addr(MacroAssembler* masm, Register table);
++ static void generate_load_crc_barret_constants_addr(MacroAssembler* masm, Register table);
++ static juint* generate_crc_constants();
++ static juint* generate_crc_barret_constants();
+
+ };
+
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
+@@ -102,7 +102,7 @@
+ // Create and print feature-string.
+ char buf[(num_features+1) * 16]; // Max 16 chars per feature.
+ jio_snprintf(buf, sizeof(buf),
+- "ppc64%s%s%s%s%s%s%s%s%s",
++ "ppc64%s%s%s%s%s%s%s%s%s%s",
+ (has_fsqrt() ? " fsqrt" : ""),
+ (has_isel() ? " isel" : ""),
+ (has_lxarxeh() ? " lxarxeh" : ""),
+@@ -112,7 +112,8 @@
+ (has_popcntw() ? " popcntw" : ""),
+ (has_fcfids() ? " fcfids" : ""),
+ (has_vand() ? " vand" : ""),
+- (has_vcipher() ? " aes" : "")
++ (has_vcipher() ? " aes" : ""),
++ (has_vpmsumb() ? " vpmsumb" : "")
+ // Make sure number of %s matches num_features!
+ );
+ _features_str = strdup(buf);
+@@ -490,6 +491,7 @@
+ a->fcfids(F3, F4); // code[8] -> fcfids
+ a->vand(VR0, VR0, VR0); // code[9] -> vand
+ a->vcipher(VR0, VR1, VR2); // code[10] -> vcipher
++ a->vpmsumb(VR0, VR1, VR2); // code[11] -> vpmsumb
+ a->blr();
+
+ // Emit function to set one cache line to zero. Emit function descriptor and get pointer to it.
+@@ -534,6 +536,7 @@
+ if (code[feature_cntr++]) features |= fcfids_m;
+ if (code[feature_cntr++]) features |= vand_m;
+ if (code[feature_cntr++]) features |= vcipher_m;
++ if (code[feature_cntr++]) features |= vpmsumb_m;
+
+ // Print the detection code.
+ if (PrintAssembly) {
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp
+@@ -43,6 +43,7 @@
+ vand,
+ dcba,
+ vcipher,
++ vpmsumb,
+ num_features // last entry to count features
+ };
+ enum Feature_Flag_Set {
+@@ -58,6 +59,7 @@
+ vand_m = (1 << vand ),
+ dcba_m = (1 << dcba ),
+ vcipher_m = (1 << vcipher),
++ vpmsumb_m = (1 << vpmsumb),
+ all_features_m = -1
+ };
+ static int _features;
+@@ -86,6 +88,7 @@
+ static bool has_vand() { return (_features & vand_m) != 0; }
+ static bool has_dcba() { return (_features & dcba_m) != 0; }
+ static bool has_vcipher() { return (_features & vcipher_m) != 0; }
++ static bool has_vpmsumb() { return (_features & vpmsumb_m) != 0; }
+
+ static const char* cpu_features() { return _features_str; }
+
diff --git a/jdk8165852-pr3468-mount_point_not_found_for_a_file_which_is_present_in_overlayfs.patch b/jdk8165852-pr3468-mount_point_not_found_for_a_file_which_is_present_in_overlayfs.patch
new file mode 100644
index 0000000..6be87a7
--- /dev/null
+++ b/jdk8165852-pr3468-mount_point_not_found_for_a_file_which_is_present_in_overlayfs.patch
@@ -0,0 +1,87 @@
+
+# HG changeset patch
+# User bpb
+# Date 1515783982 28800
+# Node ID b8843bca95b5e0eed5bbb4dc195c89c727c7aede
+# Parent 61d7ce442d95f5f30c84037a50cf6361bf7c37e1
+8165852: (fs) Mount point not found for a file which is present in overlayfs
+Summary: Check /proc/mounts when the device ID boundary is reached
+Reviewed-by: alanb
+
+diff -r 61d7ce442d95 -r b8843bca95b5 src/solaris/classes/sun/nio/fs/LinuxFileStore.java
+--- openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java Tue Jul 24 05:10:45 2018 -0400
++++ openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java Fri Jan 12 11:06:22 2018 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2008, 2018, 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
+@@ -66,6 +66,8 @@
+ }
+
+ // step 2: find mount point
++ List<UnixMountEntry> procMountsEntries =
++ fs.getMountEntries("/proc/mounts");
+ UnixPath parent = path.getParent();
+ while (parent != null) {
+ UnixFileAttributes attrs = null;
+@@ -74,16 +76,23 @@
+ } catch (UnixException x) {
+ x.rethrowAsIOException(parent);
+ }
+- if (attrs.dev() != dev())
+- break;
++ if (attrs.dev() != dev()) {
++ // step 3: lookup mounted file systems (use /proc/mounts to
++ // ensure we find the file system even when not in /etc/mtab)
++ byte[] dir = path.asByteArray();
++ for (UnixMountEntry entry : procMountsEntries) {
++ if (Arrays.equals(dir, entry.dir()))
++ return entry;
++ }
++ }
+ path = parent;
+ parent = parent.getParent();
+ }
+
+- // step 3: lookup mounted file systems (use /proc/mounts to ensure we
+- // find the file system even when not in /etc/mtab)
++ // step 3: lookup mounted file systems (use /proc/mounts to
++ // ensure we find the file system even when not in /etc/mtab)
+ byte[] dir = path.asByteArray();
+- for (UnixMountEntry entry: fs.getMountEntries("/proc/mounts")) {
++ for (UnixMountEntry entry : procMountsEntries) {
+ if (Arrays.equals(dir, entry.dir()))
+ return entry;
+ }
+diff -r 61d7ce442d95 -r b8843bca95b5 src/solaris/classes/sun/nio/fs/LinuxFileSystem.java
+--- openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java Tue Jul 24 05:10:45 2018 -0400
++++ openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java Fri Jan 12 11:06:22 2018 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2008, 2018, 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
+@@ -75,7 +75,7 @@
+ /**
+ * Returns object to iterate over the mount entries in the given fstab file.
+ */
+- Iterable<UnixMountEntry> getMountEntries(String fstab) {
++ List<UnixMountEntry> getMountEntries(String fstab) {
+ ArrayList<UnixMountEntry> entries = new ArrayList<>();
+ try {
+ long fp = setmntent(Util.toBytes(fstab), Util.toBytes("r"));
+@@ -101,7 +101,7 @@
+ * Returns object to iterate over the mount entries in /etc/mtab
+ */
+ @Override
+- Iterable<UnixMountEntry> getMountEntries() {
++ List<UnixMountEntry> getMountEntries() {
+ return getMountEntries("/etc/mtab");
+ }
+
+
diff --git a/jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch b/jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch
new file mode 100644
index 0000000..d831aa9
--- /dev/null
+++ b/jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch
@@ -0,0 +1,121 @@
+# HG changeset patch
+# User kaddepalli
+# Date 1517818481 -19800
+# Mon Feb 05 13:44:41 2018 +0530
+# Node ID b77308735540644d4710244e3c88865067f2905a
+# Parent 39bfc94b1f4265b645c2970a58389acc779dafe9
+8171000, PR3542, RH1402819: Robot.createScreenCapture() crashes in wayland mode
+Reviewed-by: serb, mhalder
+
+diff --git openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
+--- openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c
++++ openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
+@@ -394,77 +394,48 @@
+ XRectangle bbox; /* bounding box of grabbed area */
+ list_ptr regions;/* list of regions to read from */
+ {
+- image_region_type *reg;
+- int32_t dst_x, dst_y; /* where in pixmap to write (UL) */
+- int32_t diff;
+-
+- XImage *reg_image,*ximage ;
+- int32_t srcRect_x,srcRect_y,srcRect_width,srcRect_height ;
+- int32_t rem ;
+- int32_t bytes_per_line;
+- int32_t bitmap_unit;
+-
+- bitmap_unit = sizeof (long);
+- if (format == ZPixmap)
+- bytes_per_line = width*depth/8;
+- else
+- bytes_per_line = width/8;
+-
+-
+- /* Find out how many more bytes are required for padding so that
+- ** bytes per scan line will be multiples of bitmap_unit bits */
+- if (format == ZPixmap) {
+- rem = (bytes_per_line*8)%bitmap_unit;
+- if (rem)
+- bytes_per_line += (rem/8 + 1);
+- }
++ XImage *ximage ;
+
+ ximage = XCreateImage(disp,fakeVis,(uint32_t) depth,format,0,NULL,
+ (uint32_t)width,(uint32_t)height,8,0);
+
+- bytes_per_line = ximage->bytes_per_line;
+-
+- if (format == ZPixmap)
+- ximage->data = malloc(height*bytes_per_line);
+- else
+- ximage->data = malloc(height*bytes_per_line*depth);
+-
++ ximage->data = calloc(ximage->bytes_per_line*height*((format==ZPixmap)? 1 : depth), sizeof(char));
+ ximage->bits_per_pixel = depth; /** Valid only if format is ZPixmap ***/
+
+- for (reg = (image_region_type *) first_in_list( regions); reg;
++ for (image_region_type* reg = (image_region_type *) first_in_list( regions); reg;
+ reg = (image_region_type *) next_in_list( regions))
+ {
+- int32_t rect;
+- struct my_XRegion *vis_reg;
+- vis_reg = (struct my_XRegion *)(reg->visible_region);
+- for (rect = 0;
+- rect < vis_reg->numRects;
+- rect++)
++ struct my_XRegion *vis_reg = (struct my_XRegion *)(reg->visible_region);
++ for (int32_t rect = 0; rect < vis_reg->numRects; rect++)
+ {
+- /** ------------------------------------------------------------------------
+- Intersect bbox with visible part of region giving src rect & output
+- location. Width is the min right side minus the max left side.
+- Similar for height. Offset src rect so x,y are relative to
+- origin of win, not the root-relative visible rect of win.
+- ------------------------------------------------------------------------ **/
+- srcRect_width = MIN( vis_reg->rects[rect].x2, bbox.width + bbox.x)
+- - MAX( vis_reg->rects[rect].x1, bbox.x);
++ /** ------------------------------------------------------------------------
++ Intersect bbox with visible part of region giving src rect & output
++ location. Width is the min right side minus the max left side.
++ Similar for height. Offset src rect so x,y are relative to
++ origin of win, not the root-relative visible rect of win.
++ ------------------------------------------------------------------------ **/
++ int32_t srcRect_width = MIN( vis_reg->rects[rect].x2, bbox.width + bbox.x)
++ - MAX( vis_reg->rects[rect].x1, bbox.x);
++
++ int32_t srcRect_height = MIN( vis_reg->rects[rect].y2, bbox.height + bbox.y)
++ - MAX( vis_reg->rects[rect].y1, bbox.y);
+
+- srcRect_height = MIN( vis_reg->rects[rect].y2, bbox.height + bbox.y)
+- - MAX( vis_reg->rects[rect].y1, bbox.y);
++ int32_t diff = bbox.x - vis_reg->rects[rect].x1;
++ int32_t srcRect_x = MAX( 0, diff) + (vis_reg->rects[rect].x1 - reg->x_rootrel - reg->border);
++ int32_t dst_x = MAX( 0, -diff) ;
+
+- diff = bbox.x - vis_reg->rects[rect].x1;
+- srcRect_x = MAX( 0, diff) + (vis_reg->rects[rect].x1 - reg->x_rootrel - reg->border);
+- dst_x = MAX( 0, -diff) ;
+- diff = bbox.y - vis_reg->rects[rect].y1;
+- srcRect_y = MAX( 0, diff) + (vis_reg->rects[rect].y1 - reg->y_rootrel - reg->border);
+- dst_y = MAX( 0, -diff) ;
+- reg_image = XGetImage(disp,reg->win,srcRect_x,srcRect_y,
+- (uint32_t) srcRect_width, (uint32_t) srcRect_height,AllPlanes,format) ;
+- TransferImage(disp,reg_image,srcRect_width,
+- srcRect_height,reg,ximage,dst_x,dst_y) ;
+- XDestroyImage(reg_image);
+- }
++ diff = bbox.y - vis_reg->rects[rect].y1;
++ int32_t srcRect_y = MAX( 0, diff) + (vis_reg->rects[rect].y1 - reg->y_rootrel - reg->border);
++ int32_t dst_y = MAX( 0, -diff) ;
++ XImage* reg_image = XGetImage(disp,reg->win,srcRect_x,srcRect_y,
++ (uint32_t) srcRect_width, (uint32_t) srcRect_height,AllPlanes,format) ;
++
++ if (reg_image) {
++ TransferImage(disp,reg_image,srcRect_width,
++ srcRect_height,reg,ximage,dst_x,dst_y) ;
++ XDestroyImage(reg_image);
++ }
++ }
+ }
+ return ximage ;
+ }
diff --git a/jdk8172850-rh1640127-01-register_allocator_crash.patch b/jdk8172850-rh1640127-01-register_allocator_crash.patch
new file mode 100644
index 0000000..294e313
--- /dev/null
+++ b/jdk8172850-rh1640127-01-register_allocator_crash.patch
@@ -0,0 +1,213 @@
+
+# HG changeset patch
+# User thartmann
+# Date 1539594027 -7200
+# Node ID e044997c2edaeae97866394a7f8e2ddebbd41392
+# Parent 99212080341058548d449a22d1381e79353ec5b5
+8172850: Anti-dependency on membar causes crash in register allocator due to invalid instruction scheduling
+Summary: Regression test and additional asserts. The problem is fixed by 8087341.
+Reviewed-by: kvn
+
+diff -r 992120803410 -r e044997c2eda src/share/vm/opto/cfgnode.cpp
+--- openjdk/hotspot/src/share/vm/opto/cfgnode.cpp Mon Oct 22 05:26:38 2018 -0400
++++ openjdk/hotspot/src/share/vm/opto/cfgnode.cpp Mon Oct 15 11:00:27 2018 +0200
+@@ -2016,6 +2016,7 @@
+ uint ideal_reg = _type->ideal_reg();
+ assert( ideal_reg != Node::NotAMachineReg, "invalid type at Phi" );
+ if( ideal_reg == 0 ) return RegMask::Empty;
++ assert(ideal_reg != Op_RegFlags, "flags register is not spillable");
+ return *(Compile::current()->matcher()->idealreg2spillmask[ideal_reg]);
+ }
+
+diff -r 992120803410 -r e044997c2eda src/share/vm/opto/coalesce.cpp
+--- openjdk/hotspot/src/share/vm/opto/coalesce.cpp Mon Oct 22 05:26:38 2018 -0400
++++ openjdk/hotspot/src/share/vm/opto/coalesce.cpp Mon Oct 15 11:00:27 2018 +0200
+@@ -292,7 +292,14 @@
+ // Copy any flags as well
+ _phc.clone_projs(pred, pred->end_idx(), m, copy, _phc._lrg_map);
+ } else {
+- const RegMask *rm = C->matcher()->idealreg2spillmask[m->ideal_reg()];
++ int ireg = m->ideal_reg();
++ if (ireg == 0 || ireg == Op_RegFlags) {
++ assert(false, err_msg("attempted to spill a non-spillable item: %d: %s, ireg = %d",
++ m->_idx, m->Name(), ireg));
++ C->record_method_not_compilable("attempted to spill a non-spillable item");
++ return;
++ }
++ const RegMask *rm = C->matcher()->idealreg2spillmask[ireg];
+ copy = new (C) MachSpillCopyNode(m, *rm, *rm);
+ // Find a good place to insert. Kinda tricky, use a subroutine
+ insert_copy_with_overlap(pred,copy,phi_name,src_name);
+@@ -326,7 +333,14 @@
+ b->insert_node(copy, l++);
+ l += _phc.clone_projs(b, l, m, copy, _phc._lrg_map);
+ } else {
+- const RegMask *rm = C->matcher()->idealreg2spillmask[m->ideal_reg()];
++ int ireg = m->ideal_reg();
++ if (ireg == 0 || ireg == Op_RegFlags) {
++ assert(false, err_msg("attempted to spill a non-spillable item: %d: %s, ireg = %d",
++ m->_idx, m->Name(), ireg));
++ C->record_method_not_compilable("attempted to spill a non-spillable item");
++ return;
++ }
++ const RegMask *rm = C->matcher()->idealreg2spillmask[ireg];
+ copy = new (C) MachSpillCopyNode(m, *rm, *rm);
+ // Insert the copy in the basic block, just before us
+ b->insert_node(copy, l++);
+@@ -373,7 +387,14 @@
+ if( k < b->_num_succs )
+ continue; // Live out; do not pre-split
+ // Split the lrg at this use
+- const RegMask *rm = C->matcher()->idealreg2spillmask[inp->ideal_reg()];
++ int ireg = inp->ideal_reg();
++ if (ireg == 0 || ireg == Op_RegFlags) {
++ assert(false, err_msg("attempted to spill a non-spillable item: %d: %s, ireg = %d",
++ inp->_idx, inp->Name(), ireg));
++ C->record_method_not_compilable("attempted to spill a non-spillable item");
++ return;
++ }
++ const RegMask *rm = C->matcher()->idealreg2spillmask[ireg];
+ Node *copy = new (C) MachSpillCopyNode( inp, *rm, *rm );
+ // Insert the copy in the use-def chain
+ n->set_req(inpidx, copy );
+diff -r 992120803410 -r e044997c2eda src/share/vm/opto/machnode.cpp
+--- openjdk/hotspot/src/share/vm/opto/machnode.cpp Mon Oct 22 05:26:38 2018 -0400
++++ openjdk/hotspot/src/share/vm/opto/machnode.cpp Mon Oct 15 11:00:27 2018 +0200
+@@ -619,6 +619,7 @@
+ }
+
+ // Values outside the domain represent debug info
++ assert(in(idx)->ideal_reg() != Op_RegFlags, "flags register is not spillable");
+ return *Compile::current()->matcher()->idealreg2spillmask[in(idx)->ideal_reg()];
+ }
+
+diff -r 992120803410 -r e044997c2eda src/share/vm/opto/matcher.cpp
+--- openjdk/hotspot/src/share/vm/opto/matcher.cpp Mon Oct 22 05:26:38 2018 -0400
++++ openjdk/hotspot/src/share/vm/opto/matcher.cpp Mon Oct 15 11:00:27 2018 +0200
+@@ -95,6 +95,7 @@
+ idealreg2spillmask [Op_VecD] = NULL;
+ idealreg2spillmask [Op_VecX] = NULL;
+ idealreg2spillmask [Op_VecY] = NULL;
++ idealreg2spillmask [Op_RegFlags] = NULL;
+
+ idealreg2debugmask [Op_RegI] = NULL;
+ idealreg2debugmask [Op_RegN] = NULL;
+@@ -106,6 +107,7 @@
+ idealreg2debugmask [Op_VecD] = NULL;
+ idealreg2debugmask [Op_VecX] = NULL;
+ idealreg2debugmask [Op_VecY] = NULL;
++ idealreg2debugmask [Op_RegFlags] = NULL;
+
+ idealreg2mhdebugmask[Op_RegI] = NULL;
+ idealreg2mhdebugmask[Op_RegN] = NULL;
+@@ -117,6 +119,7 @@
+ idealreg2mhdebugmask[Op_VecD] = NULL;
+ idealreg2mhdebugmask[Op_VecX] = NULL;
+ idealreg2mhdebugmask[Op_VecY] = NULL;
++ idealreg2mhdebugmask[Op_RegFlags] = NULL;
+
+ debug_only(_mem_node = NULL;) // Ideal memory node consumed by mach node
+ }
+diff -r 992120803410 -r e044997c2eda test/compiler/gcbarriers/TestMembarDependencies.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/hotspot/test/compiler/gcbarriers/TestMembarDependencies.java Mon Oct 15 11:00:27 2018 +0200
+@@ -0,0 +1,98 @@
++/*
++ * Copyright (c) 2017, 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.
++ *
++ * 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.
++ */
++
++/*
++ * @test TestMembarDependencies
++ * @bug 8172850
++ * @summary Tests correct scheduling of memory loads around MembarVolatile emitted by GC barriers.
++ * @library /testlibrary
++ * @run driver compiler.membars.TestMembarDependencies
++ */
++
++package compiler.membars;
++
++import com.oracle.java.testlibrary.*;
++
++public class TestMembarDependencies {
++ private static TestMembarDependencies f1;
++ private static TestMembarDependencies f2;
++
++ public static void main(String args[]) throws Throwable {
++ if (args.length == 0) {
++ // For debugging, add "-XX:+TraceOptoPipelining"
++ OutputAnalyzer oa = ProcessTools.executeTestJvm("-XX:+IgnoreUnrecognizedVMOptions",
++ "-XX:-TieredCompilation", "-XX:-BackgroundCompilation", "-XX:+PrintOpto",
++ "-XX:CompileCommand=compileonly,compiler.membars.TestMembarDependencies::test*",
++ "-XX:CompileCommand=dontinline,compiler.membars.TestMembarDependencies::test_m1",
++ TestMembarDependencies.class.getName(), "run");
++ // C2 should not crash or bail out from compilation
++ oa.shouldHaveExitValue(0);
++ oa.shouldNotMatch("Bailout: Recompile without subsuming loads");
++ System.out.println(oa.getOutput());
++ } else {
++ f2 = new TestMembarDependencies();
++ // Trigger compilation of test1 and test2
++ for (int i = 0; i < 10_000; ++i) {
++ f2.test1(f2);
++ f2.test2(f2);
++ }
++ }
++ }
++
++ public void test_m1() { }
++ public void test_m2() { }
++
++ public void test1(TestMembarDependencies obj) {
++ // Try/catch/finally is used to create a CFG block without a test + jmpCon
++ // allowing GCM to schedule the testN_mem_reg0 instruction into that block.
++ try {
++ // Method call defines memory state that is then
++ // used by subsequent instructions/blocks (see below).
++ test_m1();
++ } catch (Exception e) {
++
++ } finally {
++ // Oop write to field emits a GC post-barrier with a MembarVolatile
++ // which has a wide memory effect (kills all memory). This creates an
++ // anti-dependency on all surrounding memory loads.
++ f1 = obj;
++ }
++ // The empty method m2 is inlined but the null check of f2 remains. It is encoded
++ // as CmpN(LoadN(MEM), NULL) where MEM is the memory after the call to test_m1().
++ // This is matched to testN_mem_reg0 on x86 which is scheduled before the barrier
++ // in the try/catch block due to the anti-dependency on the MembarVolatile.
++ // C2 crashes in the register allocator when trying to spill the flag register
++ // to keep the result of the testN instruction live from the try/catch block
++ // until it is here.
++ f2.test_m2();
++ }
++
++ public void test2(TestMembarDependencies obj) {
++ // Same as test1 but without try/catch/finally.
++ // This causes C2 to bail out in block local scheduling because testN_mem_reg0 is
++ // scheduled into a block that already contains another test + jmpCon instruction.
++ test_m1();
++ f1 = obj;
++ f2.test_m2();
++ }
++}
+
diff --git a/jdk8184309-pr3596-build_warnings_from_gcc_7_1_on_fedora_26.patch b/jdk8184309-pr3596-build_warnings_from_gcc_7_1_on_fedora_26.patch
new file mode 100644
index 0000000..00b6125
--- /dev/null
+++ b/jdk8184309-pr3596-build_warnings_from_gcc_7_1_on_fedora_26.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User ysuenaga
+# Date 1527498573 -3600
+# Mon May 28 10:09:33 2018 +0100
+# Node ID ef176cb429c49d1c330d9575938f66b04e3fb730
+# Parent 6915dc9ae18cce5625d3a3fc74b37da70a5b4215
+8184309, PR3596: Build warnings from GCC 7.1 on Fedora 26
+Reviewed-by: kbarrett, vlivanov
+
+diff --git openjdk.orig/hotspot/src/share/vm/code/dependencies.cpp openjdk/hotspot/src/share/vm/code/dependencies.cpp
+--- openjdk.orig/hotspot/src/share/vm/code/dependencies.cpp
++++ openjdk/hotspot/src/share/vm/code/dependencies.cpp
+@@ -525,7 +525,7 @@
+ xtty->object("x", arg.metadata_value());
+ }
+ } else {
+- char xn[10]; sprintf(xn, "x%d", j);
++ char xn[12]; sprintf(xn, "x%d", j);
+ if (arg.is_oop()) {
+ xtty->object(xn, arg.oop_value());
+ } else {
diff --git a/jdk8189170-aarch64_primordial_thread.patch b/jdk8189170-aarch64_primordial_thread.patch
new file mode 100644
index 0000000..876cfdf
--- /dev/null
+++ b/jdk8189170-aarch64_primordial_thread.patch
@@ -0,0 +1,30 @@
+# HG changeset patch
+# User dbuck
+# Date 1547622839 0
+# Wed Jan 16 07:13:59 2019 +0000
+# Node ID 34c6b4b813caf9b3a6fd1859596a87a24a49c423
+# Parent bca8195a3bc70df281a73d9a40032c673971676c
+8189170: [AArch64] Add option to disable stack overflow checking in primordial thread for use with JNI_CreateJavaJVM
+Reviewed-by: dcubed
+
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
++++ openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 2018, 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
+@@ -550,8 +550,8 @@
+ // pthread_attr_getstack()
+
+ static void current_stack_region(address * bottom, size_t * size) {
+- if (os::Linux::is_initial_thread()) {
+- // initial thread needs special handling because pthread_getattr_np()
++ if (os::is_primordial_thread()) {
++ // primordial thread needs special handling because pthread_getattr_np()
+ // may return bogus value.
+ *bottom = os::Linux::initial_thread_stack_bottom();
+ *size = os::Linux::initial_thread_stack_size();
diff --git a/jdk8197429-pr3546-rh1536622-increased_stack_guard_causes_segfaults_on_x86_32.patch b/jdk8197429-pr3546-rh1536622-increased_stack_guard_causes_segfaults_on_x86_32.patch
new file mode 100644
index 0000000..6d7f743
--- /dev/null
+++ b/jdk8197429-pr3546-rh1536622-increased_stack_guard_causes_segfaults_on_x86_32.patch
@@ -0,0 +1,286 @@
+# HG changeset patch
+# User aph
+# Date 1530894306 -3600
+# Fri Jul 06 17:25:06 2018 +0100
+# Node ID 1485461a0fd1ff977a6acb8f2ed1069aaaf3b07e
+# Parent d7bcbcfde5057ad066ad2fb55a87d19a5827ddee
+8197429: Increased stack guard causes segfaults on x86-32
+Reviewed-by: dholmes
+
+diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -724,6 +724,10 @@
+ }
+ }
+
++void os::Linux::expand_stack_to(address bottom) {
++ _expand_stack_to(bottom);
++}
++
+ bool os::Linux::manually_expand_stack(JavaThread * t, address addr) {
+ assert(t!=NULL, "just checking");
+ assert(t->osthread()->expanding_stack(), "expand should be set");
+diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.hpp openjdk/hotspot/src/os/linux/vm/os_linux.hpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.hpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.hpp
+@@ -249,6 +249,8 @@
+ static int safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime);
+
+ private:
++ static void expand_stack_to(address bottom);
++
+ typedef int (*sched_getcpu_func_t)(void);
+ typedef int (*numa_node_to_cpus_func_t)(int node, unsigned long *buffer, int bufferlen);
+ typedef int (*numa_max_node_func_t)(void);
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+@@ -892,6 +892,27 @@
+ void os::workaround_expand_exec_shield_cs_limit() {
+ #if defined(IA32)
+ size_t page_size = os::vm_page_size();
++
++ /*
++ * JDK-8197429
++ *
++ * Expand the stack mapping to the end of the initial stack before
++ * attempting to install the codebuf. This is needed because newer
++ * Linux kernels impose a distance of a megabyte between stack
++ * memory and other memory regions. If we try to install the
++ * codebuf before expanding the stack the installation will appear
++ * to succeed but we'll get a segfault later if we expand the stack
++ * in Java code.
++ *
++ */
++ if (os::is_primordial_thread()) {
++ address limit = Linux::initial_thread_stack_bottom();
++ if (! DisablePrimordialThreadGuardPages) {
++ limit += (StackYellowPages + StackRedPages) * page_size;
++ }
++ os::Linux::expand_stack_to(limit);
++ }
++
+ /*
+ * Take the highest VA the OS will give us and exec
+ *
+@@ -910,6 +931,16 @@
+ char* hint = (char*) (Linux::initial_thread_stack_bottom() -
+ ((StackYellowPages + StackRedPages + 1) * page_size));
+ char* codebuf = os::attempt_reserve_memory_at(page_size, hint);
++
++ if (codebuf == NULL) {
++ // JDK-8197429: There may be a stack gap of one megabyte between
++ // the limit of the stack and the nearest memory region: this is a
++ // Linux kernel workaround for CVE-2017-1000364. If we failed to
++ // map our codebuf, try again at an address one megabyte lower.
++ hint -= 1 * M;
++ codebuf = os::attempt_reserve_memory_at(page_size, hint);
++ }
++
+ if ( (codebuf == NULL) || (!os::commit_memory(codebuf, page_size, true)) ) {
+ return; // No matter, we tried, best effort.
+ }
+diff --git openjdk.orig/hotspot/test/runtime/StackGap/T.java openjdk/hotspot/test/runtime/StackGap/T.java
+new file mode 100644
+--- /dev/null
++++ openjdk/hotspot/test/runtime/StackGap/T.java
+@@ -0,0 +1,33 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ *
++ * 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.
++ */
++
++public class T {
++
++ public static void test(int n) {
++ if (n == 0) return;
++ System.out.println (n);
++ test (n - 1);
++
++ }
++
++}
+diff --git openjdk.orig/hotspot/test/runtime/StackGap/exestack-gap.c openjdk/hotspot/test/runtime/StackGap/exestack-gap.c
+new file mode 100644
+--- /dev/null
++++ openjdk/hotspot/test/runtime/StackGap/exestack-gap.c
+@@ -0,0 +1,82 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ *
++ * 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.
++ */
++
++#include <jni.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++JNIEnv* create_vm(JavaVM **jvm, char *extra_option)
++{
++ JNIEnv* env;
++ JavaVMInitArgs args;
++ JavaVMOption options[4];
++ args.version = JNI_VERSION_1_8;
++ args.nOptions = 3 + (extra_option != NULL);
++ options[0].optionString = "-Xss2048k";
++ char classpath[4096];
++ snprintf(classpath, sizeof classpath,
++ "-Djava.class.path=%s", getenv("CLASSPATH"));
++ options[1].optionString = classpath;
++ options[2].optionString = "-XX:+UnlockExperimentalVMOptions";
++ if (extra_option) {
++ options[3].optionString = extra_option;
++ }
++ args.options = &options[0];
++ args.ignoreUnrecognized = 0;
++ int rv;
++ rv = JNI_CreateJavaVM(jvm, (void**)&env, &args);
++ if (rv < 0) return NULL;
++ return env;
++}
++
++void run(char *extra_arg) {
++ JavaVM *jvm;
++ jclass T_class;
++ jmethodID test_method;
++ JNIEnv *env = create_vm(&jvm, extra_arg);
++ if (env == NULL)
++ exit(1);
++ T_class = (*env)->FindClass(env, "T");
++ if ((*env)->ExceptionCheck(env) == JNI_TRUE) {
++ (*env)->ExceptionDescribe(env);
++ exit(1);
++ }
++ test_method = (*env)->GetStaticMethodID(env, T_class, "test", "(I)V");
++ if ((*env)->ExceptionCheck(env) == JNI_TRUE) {
++ (*env)->ExceptionDescribe(env);
++ exit(1);
++ }
++ (*env)->CallStaticVoidMethod(env, T_class, test_method, 1000);
++}
++
++
++int main(int argc, char **argv)
++{
++ if (argc > 1) {
++ run(argv[1]);
++ } else {
++ run(NULL);
++ }
++
++ return 0;
++}
+diff --git openjdk.orig/hotspot/test/runtime/StackGap/testme.sh openjdk/hotspot/test/runtime/StackGap/testme.sh
+new file mode 100644
+--- /dev/null
++++ openjdk/hotspot/test/runtime/StackGap/testme.sh
+@@ -0,0 +1,73 @@
++# Copyright (c) 2014, 2018, 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.
++#
++# 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.
++#!/bin/sh
++
++#
++# @test testme.sh
++# @bug 8197429
++# @summary Linux kernel stack guard should not cause segfaults on x86-32
++# @compile T.java
++# @run shell testme.sh
++#
++
++if [ "${TESTSRC}" = "" ]
++then
++ TESTSRC=${PWD}
++ echo "TESTSRC not set. Using "${TESTSRC}" as default"
++fi
++echo "TESTSRC=${TESTSRC}"
++## Adding common setup Variables for running shell tests.
++. ${TESTSRC}/../../test_env.sh
++
++if [ "${VM_OS}" != "linux" ]
++then
++ echo "Test only valid for Linux"
++ exit 0
++fi
++
++gcc_cmd=`which gcc`
++if [ "x$gcc_cmd" = "x" ]; then
++ echo "WARNING: gcc not found. Cannot execute test." 2>&1
++ exit 0;
++fi
++
++CFLAGS="-m${VM_BITS}"
++
++LD_LIBRARY_PATH=.:${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE}:/usr/lib:$LD_LIBRARY_PATH
++export LD_LIBRARY_PATH
++
++cp ${TESTSRC}${FS}exestack-gap.c .
++
++# Copy the result of our @compile action:
++cp ${TESTCLASSES}${FS}T.class .
++
++echo "Compilation flag: ${COMP_FLAG}"
++# Note pthread may not be found thus invoke creation will fail to be created.
++# Check to ensure you have a /usr/lib/libpthread.so if you don't please look
++# for /usr/lib/`uname -m`-linux-gnu version ensure to add that path to below compilation.
++
++$gcc_cmd -DLINUX ${CFLAGS} -o stack-gap \
++ -I${COMPILEJAVA}/include -I${COMPILEJAVA}/include/linux \
++ -L${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE} \
++ -ljvm -lpthread exestack-gap.c
++
++./stack-gap || exit $?
++./stack-gap -XX:+DisablePrimordialThreadGuardPages || exit $?
diff --git a/jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch b/jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch
new file mode 100644
index 0000000..ba712ad
--- /dev/null
+++ b/jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch
@@ -0,0 +1,35 @@
+# HG changeset patch
+# User prr
+# Date 1518454604 28800
+# Mon Feb 12 08:56:44 2018 -0800
+# Node ID 556adf3a76aa81bf3918d7d46554dae7cc1d5c5c
+# Parent b77308735540644d4710244e3c88865067f2905a
+8197546: Fix for 8171000 breaks Solaris + Linux builds
+Reviewed-by: serb, jdv
+
+diff --git openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
+--- openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c
++++ openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
+@@ -395,6 +395,8 @@
+ list_ptr regions;/* list of regions to read from */
+ {
+ XImage *ximage ;
++ image_region_type* reg;
++ int32_t rect;
+
+ ximage = XCreateImage(disp,fakeVis,(uint32_t) depth,format,0,NULL,
+ (uint32_t)width,(uint32_t)height,8,0);
+@@ -402,11 +404,11 @@
+ ximage->data = calloc(ximage->bytes_per_line*height*((format==ZPixmap)? 1 : depth), sizeof(char));
+ ximage->bits_per_pixel = depth; /** Valid only if format is ZPixmap ***/
+
+- for (image_region_type* reg = (image_region_type *) first_in_list( regions); reg;
++ for (reg = (image_region_type *) first_in_list( regions); reg;
+ reg = (image_region_type *) next_in_list( regions))
+ {
+ struct my_XRegion *vis_reg = (struct my_XRegion *)(reg->visible_region);
+- for (int32_t rect = 0; rect < vis_reg->numRects; rect++)
++ for (rect = 0; rect < vis_reg->numRects; rect++)
+ {
+ /** ------------------------------------------------------------------------
+ Intersect bbox with visible part of region giving src rect & output
diff --git a/jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch b/jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
new file mode 100644
index 0000000..5f6d9ce
--- /dev/null
+++ b/jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
@@ -0,0 +1,32 @@
+# HG changeset patch
+# User andrew
+# Date 1518667645 0
+# Thu Feb 15 04:07:25 2018 +0000
+# Node ID 1d35411eb7bdf16191e220ffe3b1dc4d5d0c6041
+# Parent 999983606f5c61b093c6f6316a7b26c4cd4ca79e
+8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
+Summary: Fix issue discovered by -Wreturn-type on systems without LP64.
+Reviewed-by: aph
+
+diff --git openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
+--- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
++++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
+@@ -457,6 +457,7 @@
+ long long unsigned int oldval,
+ long long unsigned int newval) {
+ ShouldNotCallThis();
++ return 0;
+ }
+ };
+ #endif // !_LP64
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+@@ -498,6 +498,7 @@
+ long long unsigned int oldval,
+ long long unsigned int newval) {
+ ShouldNotCallThis();
++ return 0;
+ }
+ };
+ #endif // !_LP64
diff --git a/jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch b/jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch
new file mode 100644
index 0000000..533ea2d
--- /dev/null
+++ b/jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch
@@ -0,0 +1,58 @@
+# HG changeset patch
+# User andrew
+# Date 1526122977 -3600
+# Sat May 12 12:02:57 2018 +0100
+# Node ID 00ccc73498628a51a45301322e64ce2ad06e49be
+# Parent aecf9f48f7b5c6148b62713a6b746301435b57cc
+PR3533: HotSpot generates code with unaligned stack, crashes on SSE operations
+Summary: Enable -mstackrealign on x86 Linux as well as x86 Mac OS X
+
+diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/flags.m4
+--- openjdk.orig///common/autoconf/flags.m4
++++ openjdk///common/autoconf/flags.m4
+@@ -389,6 +389,21 @@
+ AC_SUBST($2CXXSTD_CXXFLAG)
+ fi
+
++ #
++ # NOTE: check for -mstackrealign needs to be below potential addition of -m32
++ #
++ if test "x$OPENJDK_TARGET_CPU" = xx86 && test "x$OPENJDK_TARGET_OS" = xmacosx -o \
++ "x$OPENJDK_TARGET_OS" = xlinux; then
++ # On 32-bit MacOSX the OS requires C-entry points to be 16 byte aligned.
++ # While waiting for a better solution, the current workaround is to use -mstackrealign
++ # This is also required on Linux systems which use libraries compiled with SSE instructions
++ REALIGN_CFLAG="-mstackrealign"
++ FLAGS_COMPILER_CHECK_ARGUMENTS([$REALIGN_CFLAG -Werror], [],
++ AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.])
++ )
++ AC_SUBST([REALIGN_CFLAG])
++ fi
++
+ if test "x$CFLAGS" != "x${ADDED_CFLAGS}"; then
+ AC_MSG_WARN([Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags])
+ fi
+diff --git openjdk.orig///common/autoconf/hotspot-spec.gmk.in openjdk///common/autoconf/hotspot-spec.gmk.in
+--- openjdk.orig///common/autoconf/hotspot-spec.gmk.in
++++ openjdk///common/autoconf/hotspot-spec.gmk.in
+@@ -112,7 +112,8 @@
+ RC:=@HOTSPOT_RC@
+
+ EXTRA_CFLAGS=@LEGACY_EXTRA_CFLAGS@ $(NO_DELETE_NULL_POINTER_CHECKS_CFLAG) \
+- $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG)
++ $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG) \
++ $(REALIGN_CFLAG)
+ EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@
+ EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@
+
+diff --git openjdk.orig///common/autoconf/spec.gmk.in openjdk///common/autoconf/spec.gmk.in
+--- openjdk.orig///common/autoconf/spec.gmk.in
++++ openjdk///common/autoconf/spec.gmk.in
+@@ -334,6 +334,7 @@
+
+ NO_DELETE_NULL_POINTER_CHECKS_CFLAG=@NO_DELETE_NULL_POINTER_CHECKS_CFLAG@
+ NO_LIFETIME_DSE_CFLAG=@NO_LIFETIME_DSE_CFLAG@
++REALIGN_CFLAG=@REALIGN_CFLAG@
+ CXXSTD_CXXFLAG=@CXXSTD_CXXFLAG@
+
+ CXX:=@FIXPATH@ @CCACHE@ @CXX@
diff --git a/jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch b/jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch
new file mode 100644
index 0000000..7ac077b
--- /dev/null
+++ b/jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User andrew
+# Date 1526489197 -3600
+# Wed May 16 17:46:37 2018 +0100
+# Node ID 64e87a408afd2b56d59dad73dee28d4b99463810
+# Parent 00ccc73498628a51a45301322e64ce2ad06e49be
+PR3591: Fix for bug 3533 doesn't add -mstackrealign to JDK code
+
+diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/flags.m4
+--- openjdk.orig///common/autoconf/flags.m4
++++ openjdk///common/autoconf/flags.m4
+@@ -401,6 +401,8 @@
+ FLAGS_COMPILER_CHECK_ARGUMENTS([$REALIGN_CFLAG -Werror], [],
+ AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.])
+ )
++ CFLAGS_JDK="${CFLAGS_JDK} ${REALIGN_CFLAG}"
++ CXXFLAGS_JDK="${CXXFLAGS_JDK} ${REALIGN_CFLAG}"
+ AC_SUBST([REALIGN_CFLAG])
+ fi
+
diff --git a/jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch b/jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch
new file mode 100644
index 0000000..6e0d762
--- /dev/null
+++ b/jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch
@@ -0,0 +1,321 @@
+diff --git a/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp b/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
+@@ -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);
+diff --git a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
+@@ -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(
+diff --git a/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+@@ -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;
+ }
+@@ -4707,7 +4707,7 @@
+ // The > 0 check is to deal with the prev and next live bytes which
+ // could be 0.
+ if (*hum_bytes > 0) {
+- bytes = MIN2(HeapRegion::GrainBytes, *hum_bytes);
++ bytes = MIN2(HeapRegion::GrainBytes, (size_t)*hum_bytes);
+ *hum_bytes -= bytes;
+ }
+ return bytes;
+diff --git a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+@@ -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")
+diff --git a/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp b/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp
+@@ -117,7 +117,7 @@
+ return reserved_size() - committed_size();
+ }
+
+-size_t G1PageBasedVirtualSpace::addr_to_page_index(char* addr) const {
++uintptr_t G1PageBasedVirtualSpace::addr_to_page_index(char* addr) const {
+ return (addr - _low_boundary) / _page_size;
+ }
+
+diff --git a/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp b/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
+@@ -38,7 +38,7 @@
+ _cancel(false),
+ _empty(true),
+ _dropped(0) {
+- _nqueues = MAX2(ParallelGCThreads, (size_t)1);
++ _nqueues = MAX2(ParallelGCThreads, (uintx)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);
+diff --git a/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp b/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
+@@ -120,7 +120,7 @@
+ };
+
+ G1StringDedupEntryCache::G1StringDedupEntryCache(size_t max_size) :
+- _nlists(MAX2(ParallelGCThreads, (size_t)1)),
++ _nlists(MAX2(ParallelGCThreads, (uintx)1)),
+ _max_list_length(0),
+ _cached(PaddedArray<G1StringDedupEntryList, mtGC>::create_unfreeable((uint)_nlists)),
+ _overflowed(PaddedArray<G1StringDedupEntryList, mtGC>::create_unfreeable((uint)_nlists)) {
+diff --git a/src/share/vm/gc_implementation/g1/heapRegion.cpp b/src/share/vm/gc_implementation/g1/heapRegion.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
+@@ -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());
++ HeapRegionBounds::min_size());
+ }
+
+ int region_size_log = log2_long((jlong) region_size);
+diff --git a/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp b/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
+@@ -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.
+diff --git a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
+@@ -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);
+diff --git a/src/share/vm/memory/collectorPolicy.cpp b/src/share/vm/memory/collectorPolicy.cpp
+--- openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
++++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
+@@ -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,24 +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");
+ _initial_gen0_size = desired_new_size;
+@@ -573,7 +572,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
+diff --git a/src/share/vm/memory/metaspace.cpp b/src/share/vm/memory/metaspace.cpp
+--- openjdk/hotspot/src/share/vm/memory/metaspace.cpp
++++ openjdk/hotspot/src/share/vm/memory/metaspace.cpp
+@@ -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"
+@@ -3285,7 +3285,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.
+diff --git a/src/share/vm/memory/threadLocalAllocBuffer.cpp b/src/share/vm/memory/threadLocalAllocBuffer.cpp
+--- openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
++++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
+@@ -238,13 +238,13 @@
+ size_t init_sz = 0;
+
+ if (TLABSize > 0) {
+- init_sz = TLABSize / HeapWordSize;
++ init_sz = (size_t)(TLABSize / HeapWordSize);
+ } else if (global_stats() != NULL) {
+ // Initial size is a function of the average number of allocating threads.
+ unsigned nof_threads = global_stats()->allocating_threads_avg();
+
+- init_sz = (Universe::heap()->tlab_capacity(myThread()) / HeapWordSize) /
+- (nof_threads * target_refills());
++ init_sz = (size_t)((Universe::heap()->tlab_capacity(myThread()) / HeapWordSize) /
++ (nof_threads * target_refills()));
+ init_sz = align_object_size(init_sz);
+ }
+ init_sz = MIN2(MAX2(init_sz, min_size()), max_size());
+diff --git a/src/share/vm/oops/objArrayKlass.inline.hpp b/src/share/vm/oops/objArrayKlass.inline.hpp
+--- openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp
++++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp
+@@ -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;
+diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp
+--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+@@ -1283,7 +1283,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);
+ }
+@@ -1308,8 +1308,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);
+@@ -1319,7 +1319,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((size_t)(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);
diff --git a/jdk8207057-pr3613-no_debug_info_for_assembler_files_hotspot.patch b/jdk8207057-pr3613-no_debug_info_for_assembler_files_hotspot.patch
new file mode 100644
index 0000000..c61d972
--- /dev/null
+++ b/jdk8207057-pr3613-no_debug_info_for_assembler_files_hotspot.patch
@@ -0,0 +1,13 @@
+--- openjdk/hotspot/make/linux/makefiles/gcc.make 2018-09-17 15:40:56.933127667 +0200
++++ openjdk/hotspot/make/linux/makefiles/gcc.make 2018-09-17 15:40:56.831127850 +0200
+@@ -184,6 +184,10 @@
+ LFLAGS += $(ARCHFLAG)
+ ASFLAGS += $(ARCHFLAG)
+
++ifeq ($(DEBUG_BINARIES), true)
++ ASFLAGS += $(ASFLAGS_DEBUG_SYMBOLS)
++endif
++
+ # Use C++ Interpreter
+ ifdef CC_INTERP
+ CFLAGS += -DCC_INTERP
diff --git a/jdk8207057-pr3613-no_debug_info_for_assembler_files_root.patch b/jdk8207057-pr3613-no_debug_info_for_assembler_files_root.patch
new file mode 100644
index 0000000..e4a007c
--- /dev/null
+++ b/jdk8207057-pr3613-no_debug_info_for_assembler_files_root.patch
@@ -0,0 +1,52 @@
+diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/flags.m4
+--- openjdk.orig///common/autoconf/flags.m4
++++ openjdk///common/autoconf/flags.m4
+@@ -282,9 +282,11 @@
+ if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
+ CFLAGS_DEBUG_SYMBOLS="-g1"
+ CXXFLAGS_DEBUG_SYMBOLS="-g1"
++ ASFLAGS_DEBUG_SYMBOLS="-g1"
+ else
+ CFLAGS_DEBUG_SYMBOLS="-g"
+ CXXFLAGS_DEBUG_SYMBOLS="-g"
++ ASFLAGS_DEBUG_SYMBOLS="-g"
+ fi
+ elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
+ CFLAGS_DEBUG_SYMBOLS="-g -xs"
+@@ -295,6 +297,7 @@
+ fi
+ AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
+ AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
++ AC_SUBST(ASFLAGS_DEBUG_SYMBOLS)
+
+ # Optimization levels
+ if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
+diff --git openjdk.orig///common/autoconf/spec.gmk.in openjdk///common/autoconf/spec.gmk.in
+--- openjdk.orig///common/autoconf/spec.gmk.in
++++ openjdk///common/autoconf/spec.gmk.in
+@@ -414,6 +414,7 @@
+ # Options for generating debug symbols
+ ENABLE_DEBUG_SYMBOLS:=@ENABLE_DEBUG_SYMBOLS@
+ CFLAGS_DEBUG_SYMBOLS:=@CFLAGS_DEBUG_SYMBOLS@
++ASFLAGS_DEBUG_SYMBOLS:=@ASFLAGS_DEBUG_SYMBOLS@
+ CXXFLAGS_DEBUG_SYMBOLS:=@CXXFLAGS_DEBUG_SYMBOLS@
+ ZIP_DEBUGINFO_FILES:=@ZIP_DEBUGINFO_FILES@
+ STRIP_POLICY:=@STRIP_POLICY@
+diff --git openjdk.orig///make/common/NativeCompilation.gmk openjdk///make/common/NativeCompilation.gmk
+--- openjdk.orig///make/common/NativeCompilation.gmk
++++ openjdk///make/common/NativeCompilation.gmk
+@@ -351,12 +351,14 @@
+ # Always add debug symbols
+ $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
+ $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
++ $1_EXTRA_ASFLAGS+=$(ASFLAGS_DEBUG_SYMBOLS)
+ else
+ # Programs don't get the debug symbols added in the old build. It's not clear if
+ # this is intentional.
+ ifeq ($$($1_PROGRAM),)
+ $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
+ $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
++ $1_EXTRA_ASFLAGS+=$(ASFLAGS_DEBUG_SYMBOLS)
+ endif
+ endif
+ endif
diff --git a/jdk8209639-rh1640127-02-coalesce_attempted_spill_non_spillable.patch b/jdk8209639-rh1640127-02-coalesce_attempted_spill_non_spillable.patch
new file mode 100644
index 0000000..63c9cba
--- /dev/null
+++ b/jdk8209639-rh1640127-02-coalesce_attempted_spill_non_spillable.patch
@@ -0,0 +1,114 @@
+
+# HG changeset patch
+# User roland
+# Date 1540370574 -7200
+# Node ID d853bac073f8a4851e313ba8fa9768b38396a204
+# Parent e044997c2edaeae97866394a7f8e2ddebbd41392
+8209639: assert failure in coalesce.cpp: attempted to spill a non-spillable item
+Reviewed-by: neliasso, kvn
+
+diff -r e044997c2eda -r d853bac073f8 src/share/vm/opto/coalesce.cpp
+--- openjdk/hotspot/src/share/vm/opto/coalesce.cpp Mon Oct 15 11:00:27 2018 +0200
++++ openjdk/hotspot/src/share/vm/opto/coalesce.cpp Wed Oct 24 10:42:54 2018 +0200
+@@ -25,6 +25,7 @@
+ #include "precompiled.hpp"
+ #include "memory/allocation.inline.hpp"
+ #include "opto/block.hpp"
++#include "opto/c2compiler.hpp"
+ #include "opto/cfgnode.hpp"
+ #include "opto/chaitin.hpp"
+ #include "opto/coalesce.hpp"
+@@ -294,9 +295,13 @@
+ } else {
+ int ireg = m->ideal_reg();
+ if (ireg == 0 || ireg == Op_RegFlags) {
+- assert(false, err_msg("attempted to spill a non-spillable item: %d: %s, ireg = %d",
+- m->_idx, m->Name(), ireg));
+- C->record_method_not_compilable("attempted to spill a non-spillable item");
++ if (C->subsume_loads()) {
++ C->record_failure(C2Compiler::retry_no_subsuming_loads());
++ } else {
++ assert(false, err_msg("attempted to spill a non-spillable item: %d: %s, ireg = %d",
++ m->_idx, m->Name(), ireg));
++ C->record_method_not_compilable("attempted to spill a non-spillable item");
++ }
+ return;
+ }
+ const RegMask *rm = C->matcher()->idealreg2spillmask[ireg];
+diff -r e044997c2eda -r d853bac073f8 test/compiler/c2/SubsumingLoadsCauseFlagSpill.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/hotspot/test/compiler/c2/SubsumingLoadsCauseFlagSpill.java Wed Oct 24 10:42:54 2018 +0200
+@@ -0,0 +1,72 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ *
++ * 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.
++ */
++
++/**
++ * @test
++ * @bug 8209639
++ * @summary assert failure in coalesce.cpp: attempted to spill a non-spillable item
++ *
++ * @run main/othervm -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,SubsumingLoadsCauseFlagSpill::not_inlined -Xmx1024m SubsumingLoadsCauseFlagSpill
++ *
++ */
++
++public class SubsumingLoadsCauseFlagSpill {
++ private static Object field;
++ private static boolean do_throw;
++ private static volatile boolean barrier;
++
++ public static void main(String[] args) {
++ for (int i = 0; i < 20_000; i++) {
++ do_throw = true;
++ field = null;
++ test(0);
++ do_throw = false;
++ field = new Object();
++ test(0);
++ }
++ }
++
++ private static float test(float f) {
++ Object v = null;
++ try {
++ not_inlined();
++ v = field;
++ } catch (MyException me) {
++ v = field;
++ barrier = true;
++ }
++ if (v == null) {
++ return f * f;
++ }
++ return f;
++ }
++
++ private static void not_inlined() throws MyException{
++ if (do_throw) {
++ throw new MyException();
++ }
++ }
++
++ private static class MyException extends Throwable {
++ }
++}
+
diff --git a/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch b/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch
new file mode 100644
index 0000000..98bbad0
--- /dev/null
+++ b/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch
@@ -0,0 +1,57 @@
+diff --git openjdk.orig/jdk/make/lib/CoreLibraries.gmk openjdk/jdk/make/lib/CoreLibraries.gmk
+--- openjdk.orig/jdk/make/lib/CoreLibraries.gmk
++++ openjdk/jdk/make/lib/CoreLibraries.gmk
+@@ -37,21 +37,32 @@ ifeq ($(OPENJDK_TARGET_OS), solaris)
+ endif
+
+ ifeq ($(OPENJDK_TARGET_OS), linux)
+- ifeq ($(OPENJDK_TARGET_CPU), ppc64)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- else ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- else ifeq ($(OPENJDK_TARGET_CPU), aarch64)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- endif
+-endif
+-
+-ifneq ($(OPENJDK_TARGET_OS), macosx)
++ BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
++ LIBFDLIBM_CFLAGS_LINUX := -ffp-contract=off
+ # Unfortunately, '-ffp-contract' is only available since gcc 4.6. For ppc64le
+ # that's no problem since ppc64le support only appeared in gcc 4.8.3. But on
+ # ppc64 (big endian) we traditionally compiled with gcc 4.3 which only knows
+ # '-mno-fused-madd'. However, that's still not enough to get the float
+ # computations right - we additionally have to supply '-fno-strict-aliasing'.
++ #
++ #
++ ifeq ($(TOOLCHAIN_TYPE), gcc)
++ CC_VER_MAJOR := $(shell $(CC) -dumpversion | cut -d'.' -f1)
++ CC_VER_MINOR := $(shell $(CC) -dumpversion | cut -d'.' -f2)
++ endif
++ # Only GCC 4.6 and better have machine independent -ffp-contract=off.
++ # For other versions we need to explicitly set arch specific machine
++ # flags or keep optimization off.
++ ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 6 \) \))" "0"
++ ifeq ($(OPENJDK_TARGET_CPU), ppc64)
++ LIBFDLIBM_CFLAGS_LINUX := -mno-fused-madd -fno-strict-aliasing
++ else
++ BUILD_LIBFDLIBM_OPTIMIZATION := NONE
++ endif
++ endif
++endif
++
++ifneq ($(OPENJDK_TARGET_OS), macosx)
+ $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM, \
+ STATIC_LIBRARY := fdlibm, \
+ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
+@@ -62,9 +73,7 @@ ifneq ($(OPENJDK_TARGET_OS), macosx)
+ -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \
+ CFLAGS_windows_debug := -DLOGGING, \
+ CFLAGS_aix := -qfloat=nomaf, \
+- CFLAGS_linux_ppc64 := -mno-fused-madd -fno-strict-aliasing, \
+- CFLAGS_linux_ppc64le := -ffp-contract=off, \
+- CFLAGS_linux_aarch64 := -ffp-contract=off, \
++ CFLAGS_linux := $(LIBFDLIBM_CFLAGS_LINUX), \
+ ARFLAGS := $(ARFLAGS), \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
diff --git a/jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch b/jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch
new file mode 100644
index 0000000..0b05ba6
--- /dev/null
+++ b/jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch
@@ -0,0 +1,83 @@
+diff --git openjdk.orig/hotspot/make/linux/makefiles/amd64.make openjdk/hotspot/make/linux/makefiles/amd64.make
+--- openjdk.orig/hotspot/make/linux/makefiles/amd64.make
++++ openjdk/hotspot/make/linux/makefiles/amd64.make
+@@ -22,10 +22,13 @@
+ #
+ #
+
+-# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+-# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++ifeq ($(OPT_CFLAGS_NO_FMA),)
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++else
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++endif
+ # Must also specify if CPU is little endian
+ CFLAGS += -DVM_LITTLE_ENDIAN
+
+diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
++++ openjdk/hotspot/make/linux/makefiles/gcc.make
+@@ -225,6 +225,16 @@
+ OPT_CFLAGS/SIZE=-Os
+ OPT_CFLAGS/SPEED=-O3
+
++ifeq ($(USE_CLANG),)
++ # Only GCC 4.6 and better have machine independent -ffp-contract=off.
++ # For other versions we need to explicitly set arch specific machine
++ # flags or keep optimization off for them.
++ ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 6 \) \))" "1"
++ OPT_CFLAGS_NO_FMA = -ffp-contract=off
++ endif
++endif
++
++
+ # Hotspot uses very unstrict aliasing turn this optimization off
+ # This option is added to CFLAGS rather than OPT_CFLAGS
+ # so that OPT_CFLAGS overrides get this option too.
+diff --git openjdk.orig/hotspot/make/linux/makefiles/i486.make openjdk/hotspot/make/linux/makefiles/i486.make
+--- openjdk.orig/hotspot/make/linux/makefiles/i486.make
++++ openjdk/hotspot/make/linux/makefiles/i486.make
+@@ -24,10 +24,13 @@
+
+ # TLS helper, assembled from .s file
+
+-# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+-# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++ifeq ($(OPT_CFLAGS_NO_FMA),)
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++else
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++endif
+ # Must also specify if CPU is little endian
+ CFLAGS += -DVM_LITTLE_ENDIAN
+
+diff --git openjdk.orig/hotspot/make/linux/makefiles/ppc64.make openjdk/hotspot/make/linux/makefiles/ppc64.make
+--- openjdk.orig/hotspot/make/linux/makefiles/ppc64.make
++++ openjdk/hotspot/make/linux/makefiles/ppc64.make
+@@ -49,3 +49,17 @@
+ # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
+ CFLAGS += -mcpu=power7 -mtune=power8 -minsert-sched-nops=regroup_exact -mno-multiple -mno-string
+ endif
++
++ifeq ($(OPT_CFLAGS_NO_FMA),)
++ ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),big)
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) -mno-fused-madd -fno-strict-aliasing
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) -mno-fused-madd -fno-strict-aliasing
++ else
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++ endif
++else
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++endif
++
diff --git a/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch b/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch
new file mode 100644
index 0000000..cf1b40b
--- /dev/null
+++ b/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch
@@ -0,0 +1,22 @@
+diff --git openjdk.orig/hotspot/make/linux/makefiles/aarch64.make openjdk/hotspot/make/linux/makefiles/aarch64.make
+index 3d17326..7cdb498 100644
+--- openjdk.orig/hotspot/make/linux/makefiles/aarch64.make
++++ openjdk/hotspot/make/linux/makefiles/aarch64.make
+@@ -22,10 +22,13 @@
+ #
+ #
+
+-# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+-# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++ifeq ($(OPT_CFLAGS_NO_FMA),)
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++else
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++endif
+ # Must also specify if CPU is little endian
+ CFLAGS += -DVM_LITTLE_ENDIAN
+
diff --git a/jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch b/jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch
new file mode 100644
index 0000000..6c1ebad
--- /dev/null
+++ b/jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch
@@ -0,0 +1,20 @@
+--- openjdk/hotspot/make/linux/makefiles/zeroshark.make
++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
+@@ -30,10 +30,13 @@ ifeq ($(USE_CLANG), true)
+ WARNING_FLAGS += -Wno-undef
+ endif
+
+-# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+-# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++ifeq ($(OPT_CFLAGS_NO_FMA),)
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++else
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++endif
+
+ # Specify that the CPU is little endian, if necessary
+ ifeq ($(ZERO_ENDIANNESS), little)
diff --git a/jdk8210647-rh1632174-libsaproc_is_being_compiled_without_optimization.patch b/jdk8210647-rh1632174-libsaproc_is_being_compiled_without_optimization.patch
new file mode 100644
index 0000000..0ab09e4
--- /dev/null
+++ b/jdk8210647-rh1632174-libsaproc_is_being_compiled_without_optimization.patch
@@ -0,0 +1,23 @@
+diff --git openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
++++ openjdk/hotspot/make/linux/makefiles/saproc.make
+@@ -59,6 +59,11 @@
+ SA_DEBUG_CFLAGS = -g
+ endif
+
++# Optimize saproc lib at level -O3 unless it's a slowdebug build
++ifneq ($(DEBUG_LEVEL), slowdebug)
++ SA_OPT_FLAGS = $(OPT_CFLAGS)
++endif
++
+ # if $(AGENT_DIR) does not exist, we don't build SA
+ # also, we don't build SA on Itanium or zero.
+
+@@ -95,6 +100,7 @@
+ $(SASRCFILES) \
+ $(SA_LFLAGS) \
+ $(SA_DEBUG_CFLAGS) \
++ $(SA_OPT_FLAGS) \
+ $(EXTRA_CFLAGS) \
+ -o $@ \
+ -lthread_db
diff --git a/jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch b/jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch
new file mode 100644
index 0000000..be2650b
--- /dev/null
+++ b/jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1537541916 -7200
+# Fri Sep 21 16:58:36 2018 +0200
+# Node ID 4010c90156d1bfeaf988dbfeb01520f2e3a66ea8
+# Parent 54afe70c50b6a6685763d00883e5173c0ba3a19d
+8210761: libjsig is being compiled without optimization
+Reviewed-by: erikj, ihse
+
+diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
+--- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
++++ openjdk/hotspot/make/linux/makefiles/jsig.make
+@@ -51,10 +51,15 @@
+ JSIG_DEBUG_CFLAGS = -g
+ endif
+
++# Optimize jsig lib at level -O3 unless it's a slowdebug build
++ifneq ($(DEBUG_LEVEL), slowdebug)
++ JSIG_OPT_FLAGS = $(OPT_CFLAGS)
++endif
++
+ $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
+ @echo Making signal interposition lib...
+ $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
+- $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
++ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(JSIG_OPT_FLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifneq ($(STRIP_POLICY),no_strip)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
diff --git a/jstack-pr1845.patch b/jstack-pr1845.patch
deleted file mode 100644
index 5d036ba..0000000
--- a/jstack-pr1845.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-diff -r c728621e76f2 tapset/jstack.stp.in
---- tapset/jstack-1.8.0.stp.in Mon Jun 02 18:41:24 2014 +0100
-+++ tapset/jstack-1.8.0.stp.in Sat Jun 14 00:21:14 2014 +0900
-@@ -45,11 +45,7 @@
- semantic error: failed to retrieve location attribute for local
- */
-
--global Universe_methodKlassObj;
--global Universe_collectedHeap;
--global HeapWordSize;
- global CodeCache_heap;
--global NarrowOopStruct;
-
- global sp_register;
- global fp_register;
-@@ -57,9 +53,8 @@
- global ptr_size;
- global ptr_mask;
-
--global constantPoolOopDesc_size;
-+global constantPool_size;
- global HeapBlock_Header_size;
--global oopDesc_size;
-
- global vm_inited;
-
-@@ -67,26 +62,6 @@
- in a bare function and vm_init_end seems a good place to use. */
- probe hotspot.vm_init_end
- {
-- // The parent/type oop for a methodOop.
-- Universe_methodKlassObj[pid()] = %( systemtap_v >= "1.8"
-- %? @var("_methodKlassObj(a)universe.cpp")
-- %: $_methodKlassObj %);
--
-- /**
-- * The Universe class holds some of the interesting statics for
-- * introspection into HotSpot. The CollectedHeap
-- * (Universe::_collectedHeap) is an abstraction of a java heap for Hotspot
-- * it contains a _reserved MemRegion which represents a contigous
-- * region of the address space consisting of HeapWords (which just
-- * have one field member char *i).
-- *
-- * Note that we access it through its "short name" _collectedHeap.
-- */
-- Universe_collectedHeap[pid()] = %( systemtap_v >= "1.8"
-- %? @var("_collectedHeap(a)universe.cpp")
-- %: $_collectedHeap %);
-- HeapWordSize[pid()] = $HeapWordSize;
--
- /**
- * The CodeCache class contains the static CodeHeap _heap that
- * is malloced at the start of the vm run and holds all generated
-@@ -107,17 +82,6 @@
- %? @var("_heap(a)codeCache.cpp")
- %: $_heap %);
-
-- /**
-- * Does target process use CompressedOops ?
-- */
-- NarrowOopStruct[pid()] = 0;
-- %( systemtap_v >= "1.8"
-- %? if (@var("UseCompressedOops(a)globals.cpp"))
-- NarrowOopStruct[pid()] = &@var("_narrow_oop(a)universe.cpp");
-- %: if($UseCompressedOops)
-- NarrowOopStruct[pid()] = $_narrow_oop;
-- %)
--
- // Should really check arch of user space (for 32bit jvm on 64bit kernel).
- %( arch == "i386" %?
- sp_register = "esp";
-@@ -136,22 +100,17 @@
-
- // Pretend we have an array at address zero and take address of second
- // element and we have the size.
-- constantPoolOopDesc_size = &@cast(0, "constantPoolOopDesc")[1];
-+ constantPool_size = &@cast(0, "ConstantPool")[1];
-
- // Really should get from dwarf: @size("HeapBlock::Header"), @size("oopDesc")
- HeapBlock_Header_size = 2 * ptr_size;
-- oopDesc_size = 2 * ptr_size;
-
- vm_inited[pid()] = 1;
- }
-
- probe hotspot.vm_shutdown
- {
-- delete(Universe_methodKlassObj[pid()]);
-- delete(Universe_collectedHeap[pid()]);
-- delete(HeapWordSize[pid()]);
- delete(CodeCache_heap[pid()]);
-- delete(NarrowOopStruct[pid()]);
- delete(vm_inited[pid()]);
- }
-
-@@ -262,15 +221,7 @@
- return frame;
- }
-
-- // Extract heap and code bounds.
-- heap_start = @cast(Universe_collectedHeap[pid()],
-- "CollectedHeap",
-- "@ABS_SERVER_LIBJVM_SO@")->_reserved->_start;
-- heap_size = HeapWordSize[pid()] * @cast(Universe_collectedHeap[pid()],
-- "CollectedHeap",
-- "@ABS_SERVER_LIBJVM_SO@")->_reserved->_word_size;
-- heap_end = heap_start + heap_size;
--
-+ // Extract code bounds.
- CodeCache_low = @cast(CodeCache_heap[pid()], "CodeHeap",
- "@ABS_SERVER_LIBJVM_SO@")->_memory->_low;
- CodeCache_high = @cast(CodeCache_heap[pid()], "CodeHeap",
-@@ -351,105 +302,69 @@
- // For the interpreter (and other code blobs) it is on the
- // stack relative to the frame pointer.
- if (blob_name == "nmethod")
-- methodOopPtr = @cast(blob, "nmethod",
-+ methodPtr = @cast(blob, "nmethod",
- "@ABS_SERVER_LIBJVM_SO@")->_method
- else
-- methodOopPtr = user_long(fp + (-3 * ptr_size)) & ptr_mask
--
-- // Start optimistic. A methodOop is only valid if it was
-- // heap allocated. And if the "type class" oop equals the
-- // Universe::methodKlassObj.
-- if (heap_start > methodOopPtr || methodOopPtr >= heap_end)
-- isMethodOop = 0
-- else
-- {
-- if (NarrowOopStruct[pid()])
-- {
-- methodOopKlass = @cast(methodOopPtr, "methodOopDesc",
-- "@ABS_SERVER_LIBJVM_SO@")->_metadata->_compressed_klass;
-- methodOopKlass = (@cast(NarrowOopStruct[pid()],
-- "NarrowOopStruct",
-- "@ABS_SERVER_LIBJVM_SO@")->_base
-- + (methodOopKlass
-- << @cast(NarrowOopStruct[pid()],
-- "NarrowOopStruct",
-- "@ABS_SERVER_LIBJVM_SO@")->_shift));
-- }
-- else
-- methodOopKlass = @cast(methodOopPtr, "methodOopDesc",
-- "@ABS_SERVER_LIBJVM_SO@")->_metadata->_klass;
-+ methodPtr = user_long(fp + (-3 * ptr_size)) & ptr_mask
-
-- isMethodOop = (methodOopKlass == Universe_methodKlassObj[pid()]);
-- }
-+ // The java class is the holder of the constants (strings)
-+ // that describe the method and signature. This constant pool
-+ // contains symbolic information that describe the properties
-+ // of the class. The indexes for methods and signaturates in
-+ // the constant pool are Symbols that contain utf8
-+ // strings (plus lenghts). (We could also sanity check that
-+ // the tag value is correct [CONSTANT_String = 8]).
-+ // Note that the class name uses '/' instead of '.' as
-+ // package name separator and that the method signature is
-+ // encoded as a method descriptor string. Both of which we
-+ // don't demangle here.
-+ constMethod = @cast(methodPtr, "Method",
-+ "@ABS_SERVER_LIBJVM_SO@")->_constMethod;
-+ constantPool = @cast(constMethod, "ConstMethod",
-+ "@ABS_SERVER_LIBJVM_SO@")->_constants;
-+ constantPool_base = constantPool + constantPool_size;
-+
-+ klass = @cast(constantPool, "ConstantPool",
-+ "@ABS_SERVER_LIBJVM_SO@")->_pool_holder;
-+ klassSymbol = @cast(klass, "Klass",
-+ "@ABS_SERVER_LIBJVM_SO@")->_name;
-+ klassName = &@cast(klassSymbol, "Symbol",
-+ "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-+ klassLength = @cast(klassSymbol, "Symbol",
-+ "@ABS_SERVER_LIBJVM_SO@")->_length;
-+
-+ methodIndex = @cast(constMethod, "ConstMethod",
-+ "@ABS_SERVER_LIBJVM_SO@")->_name_index;
-+ methodSymbol = user_long(constantPool_base + (methodIndex * ptr_size));
-+ methodName = &@cast(methodSymbol, "Symbol",
-+ "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-+ methodLength = @cast(methodSymbol, "Symbol",
-+ "@ABS_SERVER_LIBJVM_SO@")->_length;
-
-- if (isMethodOop)
-+ if (log_sig)
- {
-- // The java class is the holder of the constants (strings)
-- // that describe the method and signature. This constant pool
-- // contains symbolic information that describe the properties
-- // of the class. The indexes for methods and signaturates in
-- // the constant pool are Symbols that contain utf8
-- // strings (plus lenghts). (We could also sanity check that
-- // the tag value is correct [CONSTANT_String = 8]).
-- // Note that the class name uses '/' instead of '.' as
-- // package name separator and that the method signature is
-- // encoded as a method descriptor string. Both of which we
-- // don't demangle here.
-- constantPoolOopDesc = @cast(methodOopPtr, "methodOopDesc",
-- "@ABS_SERVER_LIBJVM_SO@")->_constants;
-- constantPoolOop_base = constantPoolOopDesc + constantPoolOopDesc_size;
--
-- klassPtr = @cast(constantPoolOopDesc, "constantPoolOopDesc",
-- "@ABS_SERVER_LIBJVM_SO@")->_pool_holder;
-- klassSymbol = @cast(klassPtr + oopDesc_size, "Klass",
-- "@ABS_SERVER_LIBJVM_SO@")->_name;
-- klassName = &@cast(klassSymbol, "Symbol",
-- "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-- klassLength = @cast(klassSymbol, "Symbol",
-- "@ABS_SERVER_LIBJVM_SO@")->_length;
--
-- methodIndex = @cast(methodOopPtr, "methodOopDesc",
-- "@ABS_SERVER_LIBJVM_SO@")->_constMethod->_name_index;
-- methodOopDesc = user_long(constantPoolOop_base + (methodIndex * ptr_size)) - 1;
-- methodName = &@cast(methodOopDesc, "Symbol",
-- "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-- methodLength = @cast(methodOopDesc, "Symbol",
-- "@ABS_SERVER_LIBJVM_SO@")->_length;
--
-- if (log_sig)
-- {
-- sigIndex = @cast(methodOopPtr, "methodOopDesc",
-- "@ABS_SERVER_LIBJVM_SO@")->_constMethod->_signature_index;
-- sigOopDesc = user_long(constantPoolOop_base
-- + (sigIndex * ptr_size)) - 1;
-- sigName = &@cast(sigOopDesc, "Symbol",
-- "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-- sigLength = @cast(sigOopDesc, "Symbol",
-- "@ABS_SERVER_LIBJVM_SO@")->_length;
-- sig = user_string_n(sigName, sigLength);
-- }
-- else
-- sig = "";
--
-- code_name = (log_native
-- ? sprintf("<%s@0x%x>",
-- str_replace(blob_name, " ", "_"), pc)
-- : "");
--
-- frame = sprintf("%s.%s%s%s",
-- user_string_n(klassName, klassLength),
-- user_string_n(methodName, methodLength),
-- sig, code_name);
-+ sigIndex = @cast(constMethod, "ConstMethod",
-+ "@ABS_SERVER_LIBJVM_SO@")->_signature_index;
-+ sigSymbol = user_long(constantPool_base
-+ + (sigIndex * ptr_size));
-+ sigName = &@cast(sigSymbol, "Symbol",
-+ "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-+ sigLength = @cast(sigSymbol, "Symbol",
-+ "@ABS_SERVER_LIBJVM_SO@")->_length;
-+ sig = user_string_n(sigName, sigLength);
- }
- else
-- {
-- // This is probably just an internal function, not a java
-- // method, just print the blob_name and continue.
-- // fp is probably still trusted.
-- if (log_native)
-- frame = sprintf("<%s@0x%x>",
-- str_replace(blob_name, " ", "_"), pc);
-- }
-+ sig = "";
-+
-+ code_name = (log_native
-+ ? sprintf("<%s@0x%x>",
-+ str_replace(blob_name, " ", "_"), pc)
-+ : "");
-+
-+ frame = sprintf("%s.%s%s%s",
-+ user_string_n(klassName, klassLength),
-+ user_string_n(methodName, methodLength),
-+ sig, code_name);
-
- // We cannot trust the frame pointer of compiled methods.
- // The server (c2) jit compiler uses the fp register.
diff --git a/multiple-pkcs11-library-init.patch b/multiple-pkcs11-library-init.patch
deleted file mode 100644
index f1e8bc2..0000000
--- a/multiple-pkcs11-library-init.patch
+++ /dev/null
@@ -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 {
diff --git a/no_strict_overflow.patch b/no_strict_overflow.patch
deleted file mode 100644
index 53fa41c..0000000
--- a/no_strict_overflow.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -r 1fe56343ecc8 make/lib/Awt2dLibraries.gmk
---- openjdk/jdk/make/lib/Awt2dLibraries.gmk Tue Jan 12 21:01:12 2016 +0000
-+++ openjdk/jdk/make/lib/Awt2dLibraries.gmk Thu Jan 14 00:47:01 2016 +0000
-@@ -904,6 +904,12 @@
- BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
- endif
-
-+# Turn off strict overflow with GCC for IndicRearrangementProcessor.cpp
-+ifeq ($(OPENJDK_TARGET_OS), linux)
-+ BUILD_LIBFONTMANAGER_IndicRearrangementProcessor.cpp_CXXFLAGS := -fno-strict-overflow
-+ BUILD_LIBFONTMANAGER_IndicRearrangementProcessor2.cpp_CXXFLAGS := -fno-strict-overflow
-+endif
-+
- $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \
- LIBRARY := fontmanager, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
diff --git a/policytool.desktop.in b/policytool.desktop.in
index e05969d..e38c0ec 100644
--- a/policytool.desktop.in
+++ b/policytool.desktop.in
@@ -1,6 +1,6 @@
[Desktop Entry]
-Name=OpenJDK @JAVA_MAJOR_VERSION@ Policy Tool #ARCH#
-Comment=Manage OpenJDK @JAVA_MAJOR_VERSION@ policy files #ARCH#
+Name=OpenJDK @JAVA_MAJOR_VERSION@ Policy Tool @ARCH@
+Comment=Manage OpenJDK @JAVA_MAJOR_VERSION@ policy files @ARCH@
Exec=@JRE_HOME@/policytool
Icon=java-@JAVA_MAJOR_VERSION@-@JAVA_VENDOR@
Terminal=false
diff --git a/pr1834-rh1022017-reduce_ellipticcurvesextension_to_provide_only_three_nss_supported_nist_curves_23_24_25.patch b/pr1834-rh1022017-reduce_ellipticcurvesextension_to_provide_only_three_nss_supported_nist_curves_23_24_25.patch
new file mode 100644
index 0000000..8165340
--- /dev/null
+++ b/pr1834-rh1022017-reduce_ellipticcurvesextension_to_provide_only_three_nss_supported_nist_curves_23_24_25.patch
@@ -0,0 +1,28 @@
+diff --git a/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java b/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
+--- openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
++++ openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
+@@ -168,20 +168,10 @@
+ "contains no supported elliptic curves");
+ }
+ } else { // default curves
+- int[] ids;
+- if (requireFips) {
+- ids = new int[] {
+- // only NIST curves in FIPS mode
+- 23, 24, 25, 9, 10, 11, 12, 13, 14,
+- };
+- } else {
+- ids = new int[] {
+- // NIST curves first
+- 23, 24, 25, 9, 10, 11, 12, 13, 14,
+- // non-NIST curves
+- 22,
+- };
+- }
++ int[] ids = new int[] {
++ // NSS currently only supports these three NIST curves
++ 23, 24, 25
++ };
+
+ idList = new ArrayList<>(ids.length);
+ for (int curveId : ids) {
diff --git a/pr1834-rh1022017.patch b/pr1834-rh1022017.patch
deleted file mode 100644
index 8165340..0000000
--- a/pr1834-rh1022017.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java b/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
---- openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
-+++ openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
-@@ -168,20 +168,10 @@
- "contains no supported elliptic curves");
- }
- } else { // default curves
-- int[] ids;
-- if (requireFips) {
-- ids = new int[] {
-- // only NIST curves in FIPS mode
-- 23, 24, 25, 9, 10, 11, 12, 13, 14,
-- };
-- } else {
-- ids = new int[] {
-- // NIST curves first
-- 23, 24, 25, 9, 10, 11, 12, 13, 14,
-- // non-NIST curves
-- 22,
-- };
-- }
-+ int[] ids = new int[] {
-+ // NSS currently only supports these three NIST curves
-+ 23, 24, 25
-+ };
-
- idList = new ArrayList<>(ids.length);
- for (int curveId : ids) {
diff --git a/pr1983-jdk.patch b/pr1983-jdk.patch
deleted file mode 100644
index 673b8a9..0000000
--- a/pr1983-jdk.patch
+++ /dev/null
@@ -1,694 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1453863246 0
-# Wed Jan 27 02:54:06 2016 +0000
-# Node ID 48c15869ecd568263249af4b9a4e98d4e57f9a8f
-# Parent afd392dfaed501ac674a7cc3e37353ce300969c7
-PR1983: Support using the system installation of NSS with the SunEC provider
-Summary: Apply code changes from PR1699 & PR1742 & forward-port Makefile changes to the new build.
-Updated 2017/07/04 to accomodate 8175110
-
-diff -r 984a4af2ed4e make/lib/SecurityLibraries.gmk
---- openjdk/jdk/make/lib/SecurityLibraries.gmk
-+++ openjdk/jdk/make/lib/SecurityLibraries.gmk
-@@ -218,8 +218,17 @@
-
- ifeq ($(ENABLE_INTREE_EC), yes)
-
-- BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec \
-+ BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec
-+
-+ ifeq ($(USE_EXTERNAL_NSS), true)
-+ BUILD_LIBSUNEC_IMPL_DIR :=
-+ BUILD_LIBSUNEC_FLAGS += $(NSS_CFLAGS) -DSYSTEM_NSS -DNSS_ENABLE_ECC
-+ else
-+ BUILD_LIBSUNEC_IMPL_DIR := \
-+ $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
-+ BUILD_LIBSUNEC_FLAGS += \
- -I$(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
-+ endif
-
- #
- # On sol-sparc...all libraries are compiled with -xregs=no%appl
-@@ -235,8 +244,8 @@
- $(eval $(call SetupNativeCompilation,BUILD_LIBSUNEC, \
- LIBRARY := sunec, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-- SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec \
-- $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl, \
-+ SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec/ECC_JNI.cpp \
-+ $(BUILD_LIBSUNEC_IMPL_DIR), \
- LANG := C++, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \
-@@ -248,8 +257,8 @@
- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
- LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(LIBCXX), \
-- LDFLAGS_SUFFIX_linux := -lc, \
-- LDFLAGS_SUFFIX_solaris := -lc, \
-+ LDFLAGS_SUFFIX_linux := -lc $(NSS_LIBS), \
-+ LDFLAGS_SUFFIX_solaris := -lc $(NSS_LIBS), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=sunec.dll" \
-diff -r 984a4af2ed4e src/share/native/sun/security/ec/ECC_JNI.cpp
---- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
-+++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
-@@ -24,7 +24,7 @@
- */
-
- #include <jni.h>
--#include "impl/ecc_impl.h"
-+#include "ecc_impl.h"
-
- #define ILLEGAL_STATE_EXCEPTION "java/lang/IllegalStateException"
- #define INVALID_ALGORITHM_PARAMETER_EXCEPTION \
-@@ -89,7 +89,7 @@
- */
- JNIEXPORT jobjectArray
- JNICALL Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair
-- (JNIEnv *env, jclass clazz, jint keySize, jbyteArray encodedParams, jbyteArray seed)
-+ (JNIEnv *env, jclass UNUSED(clazz), jint UNUSED(keySize), jbyteArray encodedParams, jbyteArray seed)
- {
- ECPrivateKey *privKey = NULL; // contains both public and private values
- ECParams *ecparams = NULL;
-@@ -190,7 +190,7 @@
- */
- JNIEXPORT jbyteArray
- JNICALL Java_sun_security_ec_ECDSASignature_signDigest
-- (JNIEnv *env, jclass clazz, jbyteArray digest, jbyteArray privateKey, jbyteArray encodedParams, jbyteArray seed, jint timing)
-+ (JNIEnv *env, jclass UNUSED(clazz), jbyteArray digest, jbyteArray privateKey, jbyteArray encodedParams, jbyteArray seed, jint timing)
- {
- jbyte* pDigestBuffer = NULL;
- jint jDigestLength = env->GetArrayLength(digest);
-@@ -299,7 +299,7 @@
- */
- JNIEXPORT jboolean
- JNICALL Java_sun_security_ec_ECDSASignature_verifySignedDigest
-- (JNIEnv *env, jclass clazz, jbyteArray signedDigest, jbyteArray digest, jbyteArray publicKey, jbyteArray encodedParams)
-+ (JNIEnv *env, jclass UNUSED(clazz), jbyteArray signedDigest, jbyteArray digest, jbyteArray publicKey, jbyteArray encodedParams)
- {
- jboolean isValid = false;
-
-@@ -384,7 +384,7 @@
- */
- JNIEXPORT jbyteArray
- JNICALL Java_sun_security_ec_ECDHKeyAgreement_deriveKey
-- (JNIEnv *env, jclass clazz, jbyteArray privateKey, jbyteArray publicKey, jbyteArray encodedParams)
-+ (JNIEnv *env, jclass UNUSED(clazz), jbyteArray privateKey, jbyteArray publicKey, jbyteArray encodedParams)
- {
- jbyteArray jSecret = NULL;
- ECParams *ecparams = NULL;
-diff -r 984a4af2ed4e src/share/native/sun/security/ec/ecc_impl.h
---- /dev/null
-+++ openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
-@@ -0,0 +1,298 @@
-+/*
-+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library 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
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * along with this library; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin Street, 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.
-+ */
-+
-+/* *********************************************************************
-+ *
-+ * The Original Code is the Netscape security libraries.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1994-2000
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Dr Vipul Gupta <vipul.gupta(a)sun.com> and
-+ * Douglas Stebila <douglas(a)stebila.ca>, Sun Microsystems Laboratories
-+ *
-+ * Last Modified Date from the Original Code: May 2017
-+ *********************************************************************** */
-+
-+#ifndef _ECC_IMPL_H
-+#define _ECC_IMPL_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include <sys/types.h>
-+
-+#ifdef SYSTEM_NSS
-+#include <secitem.h>
-+#include <secerr.h>
-+#include <keythi.h>
-+#ifdef LEGACY_NSS
-+#include <softoken.h>
-+#else
-+#include <blapi.h>
-+#endif
-+#else
-+#include "ecl-exp.h"
-+#endif
-+
-+/*
-+ * Multi-platform definitions
-+ */
-+#ifdef __linux__
-+#define B_FALSE FALSE
-+#define B_TRUE TRUE
-+typedef unsigned char uint8_t;
-+typedef unsigned long ulong_t;
-+typedef enum { B_FALSE, B_TRUE } boolean_t;
-+#endif /* __linux__ */
-+
-+#ifdef _ALLBSD_SOURCE
-+#include <stdint.h>
-+#define B_FALSE FALSE
-+#define B_TRUE TRUE
-+typedef unsigned long ulong_t;
-+typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
-+#endif /* _ALLBSD_SOURCE */
-+
-+#ifdef AIX
-+#define B_FALSE FALSE
-+#define B_TRUE TRUE
-+typedef unsigned char uint8_t;
-+typedef unsigned long ulong_t;
-+#endif /* AIX */
-+
-+#ifdef _WIN32
-+typedef unsigned char uint8_t;
-+typedef unsigned long ulong_t;
-+typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
-+#define strdup _strdup /* Replace POSIX name with ISO C++ name */
-+#endif /* _WIN32 */
-+
-+#ifndef _KERNEL
-+#include <stdlib.h>
-+#endif /* _KERNEL */
-+
-+#define EC_MAX_DIGEST_LEN 1024 /* max digest that can be signed */
-+#define EC_MAX_POINT_LEN 145 /* max len of DER encoded Q */
-+#define EC_MAX_VALUE_LEN 72 /* max len of ANSI X9.62 private value d */
-+#define EC_MAX_SIG_LEN 144 /* max signature len for supported curves */
-+#define EC_MIN_KEY_LEN 112 /* min key length in bits */
-+#define EC_MAX_KEY_LEN 571 /* max key length in bits */
-+#define EC_MAX_OID_LEN 10 /* max length of OID buffer */
-+
-+/*
-+ * Various structures and definitions from NSS are here.
-+ */
-+
-+#ifndef SYSTEM_NSS
-+#ifdef _KERNEL
-+#define PORT_ArenaAlloc(a, n, f) kmem_alloc((n), (f))
-+#define PORT_ArenaZAlloc(a, n, f) kmem_zalloc((n), (f))
-+#define PORT_ArenaGrow(a, b, c, d) NULL
-+#define PORT_ZAlloc(n, f) kmem_zalloc((n), (f))
-+#define PORT_Alloc(n, f) kmem_alloc((n), (f))
-+#else
-+#define PORT_ArenaAlloc(a, n, f) malloc((n))
-+#define PORT_ArenaZAlloc(a, n, f) calloc(1, (n))
-+#define PORT_ArenaGrow(a, b, c, d) NULL
-+#define PORT_ZAlloc(n, f) calloc(1, (n))
-+#define PORT_Alloc(n, f) malloc((n))
-+#endif
-+
-+#define PORT_NewArena(b) (char *)12345
-+#define PORT_ArenaMark(a) NULL
-+#define PORT_ArenaUnmark(a, b)
-+#define PORT_ArenaRelease(a, m)
-+#define PORT_FreeArena(a, b)
-+#define PORT_Strlen(s) strlen((s))
-+#define PORT_SetError(e)
-+
-+#define PRBool boolean_t
-+#define PR_TRUE B_TRUE
-+#define PR_FALSE B_FALSE
-+
-+#ifdef _KERNEL
-+#define PORT_Assert ASSERT
-+#define PORT_Memcpy(t, f, l) bcopy((f), (t), (l))
-+#else
-+#define PORT_Assert assert
-+#define PORT_Memcpy(t, f, l) memcpy((t), (f), (l))
-+#endif
-+
-+#endif
-+
-+#define CHECK_OK(func) if (func == NULL) goto cleanup
-+#define CHECK_SEC_OK(func) if (SECSuccess != (rv = func)) goto cleanup
-+
-+#ifndef SYSTEM_NSS
-+typedef enum {
-+ siBuffer = 0,
-+ siClearDataBuffer = 1,
-+ siCipherDataBuffer = 2,
-+ siDERCertBuffer = 3,
-+ siEncodedCertBuffer = 4,
-+ siDERNameBuffer = 5,
-+ siEncodedNameBuffer = 6,
-+ siAsciiNameString = 7,
-+ siAsciiString = 8,
-+ siDEROID = 9,
-+ siUnsignedInteger = 10,
-+ siUTCTime = 11,
-+ siGeneralizedTime = 12
-+} SECItemType;
-+
-+typedef struct SECItemStr SECItem;
-+
-+struct SECItemStr {
-+ SECItemType type;
-+ unsigned char *data;
-+ unsigned int len;
-+};
-+
-+typedef SECItem SECKEYECParams;
-+
-+typedef enum { ec_params_explicit,
-+ ec_params_named
-+} ECParamsType;
-+
-+typedef enum { ec_field_GFp = 1,
-+ ec_field_GF2m
-+} ECFieldType;
-+
-+struct ECFieldIDStr {
-+ int size; /* field size in bits */
-+ ECFieldType type;
-+ union {
-+ SECItem prime; /* prime p for (GFp) */
-+ SECItem poly; /* irreducible binary polynomial for (GF2m) */
-+ } u;
-+ int k1; /* first coefficient of pentanomial or
-+ * the only coefficient of trinomial
-+ */
-+ int k2; /* two remaining coefficients of pentanomial */
-+ int k3;
-+};
-+typedef struct ECFieldIDStr ECFieldID;
-+
-+struct ECCurveStr {
-+ SECItem a; /* contains octet stream encoding of
-+ * field element (X9.62 section 4.3.3)
-+ */
-+ SECItem b;
-+ SECItem seed;
-+};
-+typedef struct ECCurveStr ECCurve;
-+
-+typedef void PRArenaPool;
-+
-+struct ECParamsStr {
-+ PRArenaPool * arena;
-+ ECParamsType type;
-+ ECFieldID fieldID;
-+ ECCurve curve;
-+ SECItem base;
-+ SECItem order;
-+ int cofactor;
-+ SECItem DEREncoding;
-+ ECCurveName name;
-+ SECItem curveOID;
-+};
-+typedef struct ECParamsStr ECParams;
-+
-+struct ECPublicKeyStr {
-+ ECParams ecParams;
-+ SECItem publicValue; /* elliptic curve point encoded as
-+ * octet stream.
-+ */
-+};
-+typedef struct ECPublicKeyStr ECPublicKey;
-+
-+struct ECPrivateKeyStr {
-+ ECParams ecParams;
-+ SECItem publicValue; /* encoded ec point */
-+ SECItem privateValue; /* private big integer */
-+ SECItem version; /* As per SEC 1, Appendix C, Section C.4 */
-+};
-+typedef struct ECPrivateKeyStr ECPrivateKey;
-+
-+typedef enum _SECStatus {
-+ SECBufferTooSmall = -3,
-+ SECWouldBlock = -2,
-+ SECFailure = -1,
-+ SECSuccess = 0
-+} SECStatus;
-+#endif
-+
-+#ifdef _KERNEL
-+#define RNG_GenerateGlobalRandomBytes(p,l) ecc_knzero_random_generator((p), (l))
-+#else
-+/*
-+ This function is no longer required because the random bytes are now
-+ supplied by the caller. Force a failure.
-+*/
-+#define RNG_GenerateGlobalRandomBytes(p,l) SECFailure
-+#endif
-+#define CHECK_MPI_OK(func) if (MP_OKAY > (err = func)) goto cleanup
-+#define MP_TO_SEC_ERROR(err)
-+
-+#define SECITEM_TO_MPINT(it, mp) \
-+ CHECK_MPI_OK(mp_read_unsigned_octets((mp), (it).data, (it).len))
-+
-+extern int ecc_knzero_random_generator(uint8_t *, size_t);
-+extern ulong_t soft_nzero_random_generator(uint8_t *, ulong_t);
-+
-+#ifdef SYSTEM_NSS
-+#define EC_DecodeParams(a,b,c) EC_DecodeParams(a,b)
-+#define EC_NewKey(a,b,c,d,e) EC_NewKeyFromSeed(a,b,c,d)
-+#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigestWithSeed(a,b,c,d,e)
-+#define ECDSA_VerifyDigest(a,b,c,d) ECDSA_VerifyDigest(a,b,c)
-+#define ECDH_Derive(a,b,c,d,e,f) ECDH_Derive(a,b,c,d,e)
-+#else
-+extern SECStatus EC_DecodeParams(const SECItem *, ECParams **, int);
-+
-+extern SECItem * SECITEM_AllocItem(PRArenaPool *, SECItem *, unsigned int, int);
-+extern SECStatus SECITEM_CopyItem(PRArenaPool *, SECItem *, const SECItem *,
-+ int);
-+extern void SECITEM_FreeItem(SECItem *, boolean_t);
-+
-+/* This function has been modified to accept an array of random bytes */
-+extern SECStatus EC_NewKey(ECParams *ecParams, ECPrivateKey **privKey,
-+ const unsigned char* random, int randomlen, int);
-+/* This function has been modified to accept an array of random bytes */
-+extern SECStatus ECDSA_SignDigest(ECPrivateKey *, SECItem *, const SECItem *,
-+ const unsigned char* random, int randomlen, int, int timing);
-+extern SECStatus ECDSA_VerifyDigest(ECPublicKey *, const SECItem *,
-+ const SECItem *, int);
-+extern SECStatus ECDH_Derive(SECItem *, ECParams *, SECItem *, boolean_t,
-+ SECItem *, int);
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _ECC_IMPL_H */
-diff -r 984a4af2ed4e src/share/native/sun/security/ec/impl/ecc_impl.h
---- openjdk/jdk/src/share/native/sun/security/ec/impl/ecc_impl.h
-+++ /dev/null
-@@ -1,271 +0,0 @@
--/*
-- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
-- * Use is subject to license terms.
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2.1 of the License, or (at your option) any later version.
-- *
-- * This library 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
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this library; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin Street, 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.
-- */
--
--/* *********************************************************************
-- *
-- * The Original Code is the Netscape security libraries.
-- *
-- * The Initial Developer of the Original Code is
-- * Netscape Communications Corporation.
-- * Portions created by the Initial Developer are Copyright (C) 1994-2000
-- * the Initial Developer. All Rights Reserved.
-- *
-- * Contributor(s):
-- * Dr Vipul Gupta <vipul.gupta(a)sun.com> and
-- * Douglas Stebila <douglas(a)stebila.ca>, Sun Microsystems Laboratories
-- *
-- * Last Modified Date from the Original Code: May 2017
-- *********************************************************************** */
--
--#ifndef _ECC_IMPL_H
--#define _ECC_IMPL_H
--
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--#include <sys/types.h>
--#include "ecl-exp.h"
--
--/*
-- * Multi-platform definitions
-- */
--#ifdef __linux__
--#define B_FALSE FALSE
--#define B_TRUE TRUE
--typedef unsigned char uint8_t;
--typedef unsigned long ulong_t;
--typedef enum { B_FALSE, B_TRUE } boolean_t;
--#endif /* __linux__ */
--
--#ifdef _ALLBSD_SOURCE
--#include <stdint.h>
--#define B_FALSE FALSE
--#define B_TRUE TRUE
--typedef unsigned long ulong_t;
--typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
--#endif /* _ALLBSD_SOURCE */
--
--#ifdef AIX
--#define B_FALSE FALSE
--#define B_TRUE TRUE
--typedef unsigned char uint8_t;
--typedef unsigned long ulong_t;
--#endif /* AIX */
--
--#ifdef _WIN32
--typedef unsigned char uint8_t;
--typedef unsigned long ulong_t;
--typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
--#define strdup _strdup /* Replace POSIX name with ISO C++ name */
--#endif /* _WIN32 */
--
--#ifndef _KERNEL
--#include <stdlib.h>
--#endif /* _KERNEL */
--
--#define EC_MAX_DIGEST_LEN 1024 /* max digest that can be signed */
--#define EC_MAX_POINT_LEN 145 /* max len of DER encoded Q */
--#define EC_MAX_VALUE_LEN 72 /* max len of ANSI X9.62 private value d */
--#define EC_MAX_SIG_LEN 144 /* max signature len for supported curves */
--#define EC_MIN_KEY_LEN 112 /* min key length in bits */
--#define EC_MAX_KEY_LEN 571 /* max key length in bits */
--#define EC_MAX_OID_LEN 10 /* max length of OID buffer */
--
--/*
-- * Various structures and definitions from NSS are here.
-- */
--
--#ifdef _KERNEL
--#define PORT_ArenaAlloc(a, n, f) kmem_alloc((n), (f))
--#define PORT_ArenaZAlloc(a, n, f) kmem_zalloc((n), (f))
--#define PORT_ArenaGrow(a, b, c, d) NULL
--#define PORT_ZAlloc(n, f) kmem_zalloc((n), (f))
--#define PORT_Alloc(n, f) kmem_alloc((n), (f))
--#else
--#define PORT_ArenaAlloc(a, n, f) malloc((n))
--#define PORT_ArenaZAlloc(a, n, f) calloc(1, (n))
--#define PORT_ArenaGrow(a, b, c, d) NULL
--#define PORT_ZAlloc(n, f) calloc(1, (n))
--#define PORT_Alloc(n, f) malloc((n))
--#endif
--
--#define PORT_NewArena(b) (char *)12345
--#define PORT_ArenaMark(a) NULL
--#define PORT_ArenaUnmark(a, b)
--#define PORT_ArenaRelease(a, m)
--#define PORT_FreeArena(a, b)
--#define PORT_Strlen(s) strlen((s))
--#define PORT_SetError(e)
--
--#define PRBool boolean_t
--#define PR_TRUE B_TRUE
--#define PR_FALSE B_FALSE
--
--#ifdef _KERNEL
--#define PORT_Assert ASSERT
--#define PORT_Memcpy(t, f, l) bcopy((f), (t), (l))
--#else
--#define PORT_Assert assert
--#define PORT_Memcpy(t, f, l) memcpy((t), (f), (l))
--#endif
--
--#define CHECK_OK(func) if (func == NULL) goto cleanup
--#define CHECK_SEC_OK(func) if (SECSuccess != (rv = func)) goto cleanup
--
--typedef enum {
-- siBuffer = 0,
-- siClearDataBuffer = 1,
-- siCipherDataBuffer = 2,
-- siDERCertBuffer = 3,
-- siEncodedCertBuffer = 4,
-- siDERNameBuffer = 5,
-- siEncodedNameBuffer = 6,
-- siAsciiNameString = 7,
-- siAsciiString = 8,
-- siDEROID = 9,
-- siUnsignedInteger = 10,
-- siUTCTime = 11,
-- siGeneralizedTime = 12
--} SECItemType;
--
--typedef struct SECItemStr SECItem;
--
--struct SECItemStr {
-- SECItemType type;
-- unsigned char *data;
-- unsigned int len;
--};
--
--typedef SECItem SECKEYECParams;
--
--typedef enum { ec_params_explicit,
-- ec_params_named
--} ECParamsType;
--
--typedef enum { ec_field_GFp = 1,
-- ec_field_GF2m
--} ECFieldType;
--
--struct ECFieldIDStr {
-- int size; /* field size in bits */
-- ECFieldType type;
-- union {
-- SECItem prime; /* prime p for (GFp) */
-- SECItem poly; /* irreducible binary polynomial for (GF2m) */
-- } u;
-- int k1; /* first coefficient of pentanomial or
-- * the only coefficient of trinomial
-- */
-- int k2; /* two remaining coefficients of pentanomial */
-- int k3;
--};
--typedef struct ECFieldIDStr ECFieldID;
--
--struct ECCurveStr {
-- SECItem a; /* contains octet stream encoding of
-- * field element (X9.62 section 4.3.3)
-- */
-- SECItem b;
-- SECItem seed;
--};
--typedef struct ECCurveStr ECCurve;
--
--typedef void PRArenaPool;
--
--struct ECParamsStr {
-- PRArenaPool * arena;
-- ECParamsType type;
-- ECFieldID fieldID;
-- ECCurve curve;
-- SECItem base;
-- SECItem order;
-- int cofactor;
-- SECItem DEREncoding;
-- ECCurveName name;
-- SECItem curveOID;
--};
--typedef struct ECParamsStr ECParams;
--
--struct ECPublicKeyStr {
-- ECParams ecParams;
-- SECItem publicValue; /* elliptic curve point encoded as
-- * octet stream.
-- */
--};
--typedef struct ECPublicKeyStr ECPublicKey;
--
--struct ECPrivateKeyStr {
-- ECParams ecParams;
-- SECItem publicValue; /* encoded ec point */
-- SECItem privateValue; /* private big integer */
-- SECItem version; /* As per SEC 1, Appendix C, Section C.4 */
--};
--typedef struct ECPrivateKeyStr ECPrivateKey;
--
--typedef enum _SECStatus {
-- SECBufferTooSmall = -3,
-- SECWouldBlock = -2,
-- SECFailure = -1,
-- SECSuccess = 0
--} SECStatus;
--
--#ifdef _KERNEL
--#define RNG_GenerateGlobalRandomBytes(p,l) ecc_knzero_random_generator((p), (l))
--#else
--/*
-- This function is no longer required because the random bytes are now
-- supplied by the caller. Force a failure.
--*/
--#define RNG_GenerateGlobalRandomBytes(p,l) SECFailure
--#endif
--#define CHECK_MPI_OK(func) if (MP_OKAY > (err = func)) goto cleanup
--#define MP_TO_SEC_ERROR(err)
--
--#define SECITEM_TO_MPINT(it, mp) \
-- CHECK_MPI_OK(mp_read_unsigned_octets((mp), (it).data, (it).len))
--
--extern int ecc_knzero_random_generator(uint8_t *, size_t);
--extern ulong_t soft_nzero_random_generator(uint8_t *, ulong_t);
--
--extern SECStatus EC_DecodeParams(const SECItem *, ECParams **, int);
--extern SECItem * SECITEM_AllocItem(PRArenaPool *, SECItem *, unsigned int, int);
--extern SECStatus SECITEM_CopyItem(PRArenaPool *, SECItem *, const SECItem *,
-- int);
--extern void SECITEM_FreeItem(SECItem *, boolean_t);
--/* This function has been modified to accept an array of random bytes */
--extern SECStatus EC_NewKey(ECParams *ecParams, ECPrivateKey **privKey,
-- const unsigned char* random, int randomlen, int);
--/* This function has been modified to accept an array of random bytes */
--extern SECStatus ECDSA_SignDigest(ECPrivateKey *, SECItem *, const SECItem *,
-- const unsigned char* random, int randomlen, int, int timing);
--extern SECStatus ECDSA_VerifyDigest(ECPublicKey *, const SECItem *,
-- const SECItem *, int);
--extern SECStatus ECDH_Derive(SECItem *, ECParams *, SECItem *, boolean_t,
-- SECItem *, int);
--
--#ifdef __cplusplus
--}
--#endif
--
--#endif /* _ECC_IMPL_H */
-diff -r 984a4af2ed4e src/solaris/javavm/export/jni_md.h
---- openjdk/jdk/src/solaris/javavm/export/jni_md.h
-+++ openjdk/jdk/src/solaris/javavm/export/jni_md.h
-@@ -36,6 +36,11 @@
- #define JNIEXPORT
- #define JNIIMPORT
- #endif
-+#if (defined(__GNUC__)) || __has_attribute(unused)
-+ #define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
-+#else
-+ #define UNUSED(x) UNUSED_ ## x
-+#endif
-
- #define JNICALL
-
diff --git a/pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_jdk8.patch b/pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_jdk8.patch
new file mode 100644
index 0000000..31c285b
--- /dev/null
+++ b/pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_jdk8.patch
@@ -0,0 +1,699 @@
+# HG changeset patch
+# User andrew
+# Date 1453863246 0
+# Wed Jan 27 02:54:06 2016 +0000
+# Node ID 48c15869ecd568263249af4b9a4e98d4e57f9a8f
+# Parent afd392dfaed501ac674a7cc3e37353ce300969c7
+PR1983: Support using the system installation of NSS with the SunEC provider
+Summary: Apply code changes from PR1699 & PR1742 & forward-port Makefile changes to the new build.
+Updated 2017/07/04 to accomodate 8175110
+
+diff -r 984a4af2ed4e make/lib/SecurityLibraries.gmk
+--- openjdk/jdk/make/lib/SecurityLibraries.gmk
++++ openjdk/jdk/make/lib/SecurityLibraries.gmk
+@@ -218,8 +218,17 @@
+
+ ifeq ($(ENABLE_INTREE_EC), yes)
+
+- BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec \
++ BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec
++
++ ifeq ($(USE_EXTERNAL_NSS), true)
++ BUILD_LIBSUNEC_IMPL_DIR :=
++ BUILD_LIBSUNEC_FLAGS += $(NSS_CFLAGS) -DSYSTEM_NSS -DNSS_ENABLE_ECC
++ else
++ BUILD_LIBSUNEC_IMPL_DIR := \
++ $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
++ BUILD_LIBSUNEC_FLAGS += \
+ -I$(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
++ endif
+
+ #
+ # On sol-sparc...all libraries are compiled with -xregs=no%appl
+@@ -235,8 +244,8 @@
+ $(eval $(call SetupNativeCompilation,BUILD_LIBSUNEC, \
+ LIBRARY := sunec, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+- SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec \
+- $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl, \
++ SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec/ECC_JNI.cpp \
++ $(BUILD_LIBSUNEC_IMPL_DIR), \
+ LANG := C++, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \
+@@ -245,11 +254,12 @@
+ CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \
+ $(BUILD_LIBSUNEC_FLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsunec/mapfile-vers, \
+- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
++ LDFLAGS := $(subst -Xlinker --as-needed,, \
++ $(subst -Wl$(COMMA)--as-needed,, $(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK), \
+ LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(LIBCXX), \
+- LDFLAGS_SUFFIX_linux := -lc, \
+- LDFLAGS_SUFFIX_solaris := -lc, \
++ LDFLAGS_SUFFIX_linux := -lc $(NSS_LIBS), \
++ LDFLAGS_SUFFIX_solaris := -lc $(NSS_LIBS), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=sunec.dll" \
+diff -r 984a4af2ed4e src/share/native/sun/security/ec/ECC_JNI.cpp
+--- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
++++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
+@@ -24,7 +24,7 @@
+ */
+
+ #include <jni.h>
+-#include "impl/ecc_impl.h"
++#include "ecc_impl.h"
+
+ #define ILLEGAL_STATE_EXCEPTION "java/lang/IllegalStateException"
+ #define INVALID_ALGORITHM_PARAMETER_EXCEPTION \
+@@ -89,7 +89,7 @@
+ */
+ JNIEXPORT jobjectArray
+ JNICALL Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair
+- (JNIEnv *env, jclass clazz, jint keySize, jbyteArray encodedParams, jbyteArray seed)
++ (JNIEnv *env, jclass UNUSED(clazz), jint UNUSED(keySize), jbyteArray encodedParams, jbyteArray seed)
+ {
+ ECPrivateKey *privKey = NULL; // contains both public and private values
+ ECParams *ecparams = NULL;
+@@ -190,7 +190,7 @@
+ */
+ JNIEXPORT jbyteArray
+ JNICALL Java_sun_security_ec_ECDSASignature_signDigest
+- (JNIEnv *env, jclass clazz, jbyteArray digest, jbyteArray privateKey, jbyteArray encodedParams, jbyteArray seed, jint timing)
++ (JNIEnv *env, jclass UNUSED(clazz), jbyteArray digest, jbyteArray privateKey, jbyteArray encodedParams, jbyteArray seed, jint timing)
+ {
+ jbyte* pDigestBuffer = NULL;
+ jint jDigestLength = env->GetArrayLength(digest);
+@@ -299,7 +299,7 @@
+ */
+ JNIEXPORT jboolean
+ JNICALL Java_sun_security_ec_ECDSASignature_verifySignedDigest
+- (JNIEnv *env, jclass clazz, jbyteArray signedDigest, jbyteArray digest, jbyteArray publicKey, jbyteArray encodedParams)
++ (JNIEnv *env, jclass UNUSED(clazz), jbyteArray signedDigest, jbyteArray digest, jbyteArray publicKey, jbyteArray encodedParams)
+ {
+ jboolean isValid = false;
+
+@@ -384,7 +384,7 @@
+ */
+ JNIEXPORT jbyteArray
+ JNICALL Java_sun_security_ec_ECDHKeyAgreement_deriveKey
+- (JNIEnv *env, jclass clazz, jbyteArray privateKey, jbyteArray publicKey, jbyteArray encodedParams)
++ (JNIEnv *env, jclass UNUSED(clazz), jbyteArray privateKey, jbyteArray publicKey, jbyteArray encodedParams)
+ {
+ jbyteArray jSecret = NULL;
+ ECParams *ecparams = NULL;
+diff -r 984a4af2ed4e src/share/native/sun/security/ec/ecc_impl.h
+--- /dev/null
++++ openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
+@@ -0,0 +1,298 @@
++/*
++ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
++ * Use is subject to license terms.
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library 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
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this library; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin Street, 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.
++ */
++
++/* *********************************************************************
++ *
++ * The Original Code is the Netscape security libraries.
++ *
++ * The Initial Developer of the Original Code is
++ * Netscape Communications Corporation.
++ * Portions created by the Initial Developer are Copyright (C) 1994-2000
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ * Dr Vipul Gupta <vipul.gupta(a)sun.com> and
++ * Douglas Stebila <douglas(a)stebila.ca>, Sun Microsystems Laboratories
++ *
++ * Last Modified Date from the Original Code: May 2017
++ *********************************************************************** */
++
++#ifndef _ECC_IMPL_H
++#define _ECC_IMPL_H
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#include <sys/types.h>
++
++#ifdef SYSTEM_NSS
++#include <secitem.h>
++#include <secerr.h>
++#include <keythi.h>
++#ifdef LEGACY_NSS
++#include <softoken.h>
++#else
++#include <blapi.h>
++#endif
++#else
++#include "ecl-exp.h"
++#endif
++
++/*
++ * Multi-platform definitions
++ */
++#ifdef __linux__
++#define B_FALSE FALSE
++#define B_TRUE TRUE
++typedef unsigned char uint8_t;
++typedef unsigned long ulong_t;
++typedef enum { B_FALSE, B_TRUE } boolean_t;
++#endif /* __linux__ */
++
++#ifdef _ALLBSD_SOURCE
++#include <stdint.h>
++#define B_FALSE FALSE
++#define B_TRUE TRUE
++typedef unsigned long ulong_t;
++typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
++#endif /* _ALLBSD_SOURCE */
++
++#ifdef AIX
++#define B_FALSE FALSE
++#define B_TRUE TRUE
++typedef unsigned char uint8_t;
++typedef unsigned long ulong_t;
++#endif /* AIX */
++
++#ifdef _WIN32
++typedef unsigned char uint8_t;
++typedef unsigned long ulong_t;
++typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
++#define strdup _strdup /* Replace POSIX name with ISO C++ name */
++#endif /* _WIN32 */
++
++#ifndef _KERNEL
++#include <stdlib.h>
++#endif /* _KERNEL */
++
++#define EC_MAX_DIGEST_LEN 1024 /* max digest that can be signed */
++#define EC_MAX_POINT_LEN 145 /* max len of DER encoded Q */
++#define EC_MAX_VALUE_LEN 72 /* max len of ANSI X9.62 private value d */
++#define EC_MAX_SIG_LEN 144 /* max signature len for supported curves */
++#define EC_MIN_KEY_LEN 112 /* min key length in bits */
++#define EC_MAX_KEY_LEN 571 /* max key length in bits */
++#define EC_MAX_OID_LEN 10 /* max length of OID buffer */
++
++/*
++ * Various structures and definitions from NSS are here.
++ */
++
++#ifndef SYSTEM_NSS
++#ifdef _KERNEL
++#define PORT_ArenaAlloc(a, n, f) kmem_alloc((n), (f))
++#define PORT_ArenaZAlloc(a, n, f) kmem_zalloc((n), (f))
++#define PORT_ArenaGrow(a, b, c, d) NULL
++#define PORT_ZAlloc(n, f) kmem_zalloc((n), (f))
++#define PORT_Alloc(n, f) kmem_alloc((n), (f))
++#else
++#define PORT_ArenaAlloc(a, n, f) malloc((n))
++#define PORT_ArenaZAlloc(a, n, f) calloc(1, (n))
++#define PORT_ArenaGrow(a, b, c, d) NULL
++#define PORT_ZAlloc(n, f) calloc(1, (n))
++#define PORT_Alloc(n, f) malloc((n))
++#endif
++
++#define PORT_NewArena(b) (char *)12345
++#define PORT_ArenaMark(a) NULL
++#define PORT_ArenaUnmark(a, b)
++#define PORT_ArenaRelease(a, m)
++#define PORT_FreeArena(a, b)
++#define PORT_Strlen(s) strlen((s))
++#define PORT_SetError(e)
++
++#define PRBool boolean_t
++#define PR_TRUE B_TRUE
++#define PR_FALSE B_FALSE
++
++#ifdef _KERNEL
++#define PORT_Assert ASSERT
++#define PORT_Memcpy(t, f, l) bcopy((f), (t), (l))
++#else
++#define PORT_Assert assert
++#define PORT_Memcpy(t, f, l) memcpy((t), (f), (l))
++#endif
++
++#endif
++
++#define CHECK_OK(func) if (func == NULL) goto cleanup
++#define CHECK_SEC_OK(func) if (SECSuccess != (rv = func)) goto cleanup
++
++#ifndef SYSTEM_NSS
++typedef enum {
++ siBuffer = 0,
++ siClearDataBuffer = 1,
++ siCipherDataBuffer = 2,
++ siDERCertBuffer = 3,
++ siEncodedCertBuffer = 4,
++ siDERNameBuffer = 5,
++ siEncodedNameBuffer = 6,
++ siAsciiNameString = 7,
++ siAsciiString = 8,
++ siDEROID = 9,
++ siUnsignedInteger = 10,
++ siUTCTime = 11,
++ siGeneralizedTime = 12
++} SECItemType;
++
++typedef struct SECItemStr SECItem;
++
++struct SECItemStr {
++ SECItemType type;
++ unsigned char *data;
++ unsigned int len;
++};
++
++typedef SECItem SECKEYECParams;
++
++typedef enum { ec_params_explicit,
++ ec_params_named
++} ECParamsType;
++
++typedef enum { ec_field_GFp = 1,
++ ec_field_GF2m
++} ECFieldType;
++
++struct ECFieldIDStr {
++ int size; /* field size in bits */
++ ECFieldType type;
++ union {
++ SECItem prime; /* prime p for (GFp) */
++ SECItem poly; /* irreducible binary polynomial for (GF2m) */
++ } u;
++ int k1; /* first coefficient of pentanomial or
++ * the only coefficient of trinomial
++ */
++ int k2; /* two remaining coefficients of pentanomial */
++ int k3;
++};
++typedef struct ECFieldIDStr ECFieldID;
++
++struct ECCurveStr {
++ SECItem a; /* contains octet stream encoding of
++ * field element (X9.62 section 4.3.3)
++ */
++ SECItem b;
++ SECItem seed;
++};
++typedef struct ECCurveStr ECCurve;
++
++typedef void PRArenaPool;
++
++struct ECParamsStr {
++ PRArenaPool * arena;
++ ECParamsType type;
++ ECFieldID fieldID;
++ ECCurve curve;
++ SECItem base;
++ SECItem order;
++ int cofactor;
++ SECItem DEREncoding;
++ ECCurveName name;
++ SECItem curveOID;
++};
++typedef struct ECParamsStr ECParams;
++
++struct ECPublicKeyStr {
++ ECParams ecParams;
++ SECItem publicValue; /* elliptic curve point encoded as
++ * octet stream.
++ */
++};
++typedef struct ECPublicKeyStr ECPublicKey;
++
++struct ECPrivateKeyStr {
++ ECParams ecParams;
++ SECItem publicValue; /* encoded ec point */
++ SECItem privateValue; /* private big integer */
++ SECItem version; /* As per SEC 1, Appendix C, Section C.4 */
++};
++typedef struct ECPrivateKeyStr ECPrivateKey;
++
++typedef enum _SECStatus {
++ SECBufferTooSmall = -3,
++ SECWouldBlock = -2,
++ SECFailure = -1,
++ SECSuccess = 0
++} SECStatus;
++#endif
++
++#ifdef _KERNEL
++#define RNG_GenerateGlobalRandomBytes(p,l) ecc_knzero_random_generator((p), (l))
++#else
++/*
++ This function is no longer required because the random bytes are now
++ supplied by the caller. Force a failure.
++*/
++#define RNG_GenerateGlobalRandomBytes(p,l) SECFailure
++#endif
++#define CHECK_MPI_OK(func) if (MP_OKAY > (err = func)) goto cleanup
++#define MP_TO_SEC_ERROR(err)
++
++#define SECITEM_TO_MPINT(it, mp) \
++ CHECK_MPI_OK(mp_read_unsigned_octets((mp), (it).data, (it).len))
++
++extern int ecc_knzero_random_generator(uint8_t *, size_t);
++extern ulong_t soft_nzero_random_generator(uint8_t *, ulong_t);
++
++#ifdef SYSTEM_NSS
++#define EC_DecodeParams(a,b,c) EC_DecodeParams(a,b)
++#define EC_NewKey(a,b,c,d,e) EC_NewKeyFromSeed(a,b,c,d)
++#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigestWithSeed(a,b,c,d,e)
++#define ECDSA_VerifyDigest(a,b,c,d) ECDSA_VerifyDigest(a,b,c)
++#define ECDH_Derive(a,b,c,d,e,f) ECDH_Derive(a,b,c,d,e)
++#else
++extern SECStatus EC_DecodeParams(const SECItem *, ECParams **, int);
++
++extern SECItem * SECITEM_AllocItem(PRArenaPool *, SECItem *, unsigned int, int);
++extern SECStatus SECITEM_CopyItem(PRArenaPool *, SECItem *, const SECItem *,
++ int);
++extern void SECITEM_FreeItem(SECItem *, boolean_t);
++
++/* This function has been modified to accept an array of random bytes */
++extern SECStatus EC_NewKey(ECParams *ecParams, ECPrivateKey **privKey,
++ const unsigned char* random, int randomlen, int);
++/* This function has been modified to accept an array of random bytes */
++extern SECStatus ECDSA_SignDigest(ECPrivateKey *, SECItem *, const SECItem *,
++ const unsigned char* random, int randomlen, int, int timing);
++extern SECStatus ECDSA_VerifyDigest(ECPublicKey *, const SECItem *,
++ const SECItem *, int);
++extern SECStatus ECDH_Derive(SECItem *, ECParams *, SECItem *, boolean_t,
++ SECItem *, int);
++#endif
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif /* _ECC_IMPL_H */
+diff -r 984a4af2ed4e src/share/native/sun/security/ec/impl/ecc_impl.h
+--- openjdk/jdk/src/share/native/sun/security/ec/impl/ecc_impl.h
++++ /dev/null
+@@ -1,271 +0,0 @@
+-/*
+- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+- * Use is subject to license terms.
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2.1 of the License, or (at your option) any later version.
+- *
+- * This library 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
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * along with this library; if not, write to the Free Software Foundation,
+- * Inc., 51 Franklin Street, 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.
+- */
+-
+-/* *********************************************************************
+- *
+- * The Original Code is the Netscape security libraries.
+- *
+- * The Initial Developer of the Original Code is
+- * Netscape Communications Corporation.
+- * Portions created by the Initial Developer are Copyright (C) 1994-2000
+- * the Initial Developer. All Rights Reserved.
+- *
+- * Contributor(s):
+- * Dr Vipul Gupta <vipul.gupta(a)sun.com> and
+- * Douglas Stebila <douglas(a)stebila.ca>, Sun Microsystems Laboratories
+- *
+- * Last Modified Date from the Original Code: May 2017
+- *********************************************************************** */
+-
+-#ifndef _ECC_IMPL_H
+-#define _ECC_IMPL_H
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-#include <sys/types.h>
+-#include "ecl-exp.h"
+-
+-/*
+- * Multi-platform definitions
+- */
+-#ifdef __linux__
+-#define B_FALSE FALSE
+-#define B_TRUE TRUE
+-typedef unsigned char uint8_t;
+-typedef unsigned long ulong_t;
+-typedef enum { B_FALSE, B_TRUE } boolean_t;
+-#endif /* __linux__ */
+-
+-#ifdef _ALLBSD_SOURCE
+-#include <stdint.h>
+-#define B_FALSE FALSE
+-#define B_TRUE TRUE
+-typedef unsigned long ulong_t;
+-typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
+-#endif /* _ALLBSD_SOURCE */
+-
+-#ifdef AIX
+-#define B_FALSE FALSE
+-#define B_TRUE TRUE
+-typedef unsigned char uint8_t;
+-typedef unsigned long ulong_t;
+-#endif /* AIX */
+-
+-#ifdef _WIN32
+-typedef unsigned char uint8_t;
+-typedef unsigned long ulong_t;
+-typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
+-#define strdup _strdup /* Replace POSIX name with ISO C++ name */
+-#endif /* _WIN32 */
+-
+-#ifndef _KERNEL
+-#include <stdlib.h>
+-#endif /* _KERNEL */
+-
+-#define EC_MAX_DIGEST_LEN 1024 /* max digest that can be signed */
+-#define EC_MAX_POINT_LEN 145 /* max len of DER encoded Q */
+-#define EC_MAX_VALUE_LEN 72 /* max len of ANSI X9.62 private value d */
+-#define EC_MAX_SIG_LEN 144 /* max signature len for supported curves */
+-#define EC_MIN_KEY_LEN 112 /* min key length in bits */
+-#define EC_MAX_KEY_LEN 571 /* max key length in bits */
+-#define EC_MAX_OID_LEN 10 /* max length of OID buffer */
+-
+-/*
+- * Various structures and definitions from NSS are here.
+- */
+-
+-#ifdef _KERNEL
+-#define PORT_ArenaAlloc(a, n, f) kmem_alloc((n), (f))
+-#define PORT_ArenaZAlloc(a, n, f) kmem_zalloc((n), (f))
+-#define PORT_ArenaGrow(a, b, c, d) NULL
+-#define PORT_ZAlloc(n, f) kmem_zalloc((n), (f))
+-#define PORT_Alloc(n, f) kmem_alloc((n), (f))
+-#else
+-#define PORT_ArenaAlloc(a, n, f) malloc((n))
+-#define PORT_ArenaZAlloc(a, n, f) calloc(1, (n))
+-#define PORT_ArenaGrow(a, b, c, d) NULL
+-#define PORT_ZAlloc(n, f) calloc(1, (n))
+-#define PORT_Alloc(n, f) malloc((n))
+-#endif
+-
+-#define PORT_NewArena(b) (char *)12345
+-#define PORT_ArenaMark(a) NULL
+-#define PORT_ArenaUnmark(a, b)
+-#define PORT_ArenaRelease(a, m)
+-#define PORT_FreeArena(a, b)
+-#define PORT_Strlen(s) strlen((s))
+-#define PORT_SetError(e)
+-
+-#define PRBool boolean_t
+-#define PR_TRUE B_TRUE
+-#define PR_FALSE B_FALSE
+-
+-#ifdef _KERNEL
+-#define PORT_Assert ASSERT
+-#define PORT_Memcpy(t, f, l) bcopy((f), (t), (l))
+-#else
+-#define PORT_Assert assert
+-#define PORT_Memcpy(t, f, l) memcpy((t), (f), (l))
+-#endif
+-
+-#define CHECK_OK(func) if (func == NULL) goto cleanup
+-#define CHECK_SEC_OK(func) if (SECSuccess != (rv = func)) goto cleanup
+-
+-typedef enum {
+- siBuffer = 0,
+- siClearDataBuffer = 1,
+- siCipherDataBuffer = 2,
+- siDERCertBuffer = 3,
+- siEncodedCertBuffer = 4,
+- siDERNameBuffer = 5,
+- siEncodedNameBuffer = 6,
+- siAsciiNameString = 7,
+- siAsciiString = 8,
+- siDEROID = 9,
+- siUnsignedInteger = 10,
+- siUTCTime = 11,
+- siGeneralizedTime = 12
+-} SECItemType;
+-
+-typedef struct SECItemStr SECItem;
+-
+-struct SECItemStr {
+- SECItemType type;
+- unsigned char *data;
+- unsigned int len;
+-};
+-
+-typedef SECItem SECKEYECParams;
+-
+-typedef enum { ec_params_explicit,
+- ec_params_named
+-} ECParamsType;
+-
+-typedef enum { ec_field_GFp = 1,
+- ec_field_GF2m
+-} ECFieldType;
+-
+-struct ECFieldIDStr {
+- int size; /* field size in bits */
+- ECFieldType type;
+- union {
+- SECItem prime; /* prime p for (GFp) */
+- SECItem poly; /* irreducible binary polynomial for (GF2m) */
+- } u;
+- int k1; /* first coefficient of pentanomial or
+- * the only coefficient of trinomial
+- */
+- int k2; /* two remaining coefficients of pentanomial */
+- int k3;
+-};
+-typedef struct ECFieldIDStr ECFieldID;
+-
+-struct ECCurveStr {
+- SECItem a; /* contains octet stream encoding of
+- * field element (X9.62 section 4.3.3)
+- */
+- SECItem b;
+- SECItem seed;
+-};
+-typedef struct ECCurveStr ECCurve;
+-
+-typedef void PRArenaPool;
+-
+-struct ECParamsStr {
+- PRArenaPool * arena;
+- ECParamsType type;
+- ECFieldID fieldID;
+- ECCurve curve;
+- SECItem base;
+- SECItem order;
+- int cofactor;
+- SECItem DEREncoding;
+- ECCurveName name;
+- SECItem curveOID;
+-};
+-typedef struct ECParamsStr ECParams;
+-
+-struct ECPublicKeyStr {
+- ECParams ecParams;
+- SECItem publicValue; /* elliptic curve point encoded as
+- * octet stream.
+- */
+-};
+-typedef struct ECPublicKeyStr ECPublicKey;
+-
+-struct ECPrivateKeyStr {
+- ECParams ecParams;
+- SECItem publicValue; /* encoded ec point */
+- SECItem privateValue; /* private big integer */
+- SECItem version; /* As per SEC 1, Appendix C, Section C.4 */
+-};
+-typedef struct ECPrivateKeyStr ECPrivateKey;
+-
+-typedef enum _SECStatus {
+- SECBufferTooSmall = -3,
+- SECWouldBlock = -2,
+- SECFailure = -1,
+- SECSuccess = 0
+-} SECStatus;
+-
+-#ifdef _KERNEL
+-#define RNG_GenerateGlobalRandomBytes(p,l) ecc_knzero_random_generator((p), (l))
+-#else
+-/*
+- This function is no longer required because the random bytes are now
+- supplied by the caller. Force a failure.
+-*/
+-#define RNG_GenerateGlobalRandomBytes(p,l) SECFailure
+-#endif
+-#define CHECK_MPI_OK(func) if (MP_OKAY > (err = func)) goto cleanup
+-#define MP_TO_SEC_ERROR(err)
+-
+-#define SECITEM_TO_MPINT(it, mp) \
+- CHECK_MPI_OK(mp_read_unsigned_octets((mp), (it).data, (it).len))
+-
+-extern int ecc_knzero_random_generator(uint8_t *, size_t);
+-extern ulong_t soft_nzero_random_generator(uint8_t *, ulong_t);
+-
+-extern SECStatus EC_DecodeParams(const SECItem *, ECParams **, int);
+-extern SECItem * SECITEM_AllocItem(PRArenaPool *, SECItem *, unsigned int, int);
+-extern SECStatus SECITEM_CopyItem(PRArenaPool *, SECItem *, const SECItem *,
+- int);
+-extern void SECITEM_FreeItem(SECItem *, boolean_t);
+-/* This function has been modified to accept an array of random bytes */
+-extern SECStatus EC_NewKey(ECParams *ecParams, ECPrivateKey **privKey,
+- const unsigned char* random, int randomlen, int);
+-/* This function has been modified to accept an array of random bytes */
+-extern SECStatus ECDSA_SignDigest(ECPrivateKey *, SECItem *, const SECItem *,
+- const unsigned char* random, int randomlen, int, int timing);
+-extern SECStatus ECDSA_VerifyDigest(ECPublicKey *, const SECItem *,
+- const SECItem *, int);
+-extern SECStatus ECDH_Derive(SECItem *, ECParams *, SECItem *, boolean_t,
+- SECItem *, int);
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif /* _ECC_IMPL_H */
+diff -r 984a4af2ed4e src/solaris/javavm/export/jni_md.h
+--- openjdk/jdk/src/solaris/javavm/export/jni_md.h
++++ openjdk/jdk/src/solaris/javavm/export/jni_md.h
+@@ -36,6 +36,11 @@
+ #define JNIEXPORT
+ #define JNIIMPORT
+ #endif
++#if (defined(__GNUC__)) || __has_attribute(unused)
++ #define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
++#else
++ #define UNUSED(x) UNUSED_ ## x
++#endif
+
+ #define JNICALL
+
diff --git a/pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_root8.patch b/pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_root8.patch
new file mode 100644
index 0000000..100472b
--- /dev/null
+++ b/pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_root8.patch
@@ -0,0 +1,89 @@
+# HG changeset patch
+# User andrew
+# Date 1453863007 0
+# Wed Jan 27 02:50:07 2016 +0000
+# Node ID f0635543beb309c4da1bb88c906a76ee4b75e16d
+# Parent 4a5a0d4e1ae0feec2f47d17be380d6fcd5eff126
+PR1983: Support using the system installation of NSS with the SunEC provider
+Summary: Add new configure option --enable-system-nss
+
+diff -r 92af9369869f common/autoconf/jdk-options.m4
+--- openjdk/common/autoconf/jdk-options.m4 Thu Jan 21 22:17:02 2016 +0000
++++ openjdk/common/autoconf/jdk-options.m4 Wed Jan 27 05:32:12 2016 +0000
+@@ -414,9 +414,10 @@
+ #
+ AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
+ [
+- AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
++ AC_REQUIRE([LIB_SETUP_MISC_LIBS])
++ AC_MSG_CHECKING([if the elliptic curve crypto implementation is present])
+
+- if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
++ if test "x${system_nss}" = "xyes" -o -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
+ ENABLE_INTREE_EC=yes
+ AC_MSG_RESULT([yes])
+ else
+diff -r 92af9369869f common/autoconf/libraries.m4
+--- openjdk/common/autoconf/libraries.m4 Thu Jan 21 22:17:02 2016 +0000
++++ openjdk/common/autoconf/libraries.m4 Wed Jan 27 05:32:12 2016 +0000
+@@ -731,6 +731,47 @@
+ LIBDL="$LIBS"
+ AC_SUBST(LIBDL)
+ LIBS="$save_LIBS"
++
++ ###############################################################################
++ #
++ # Check for the NSS libraries
++ #
++
++ AC_MSG_CHECKING([whether to build the Sun EC provider against the system NSS libraries])
++
++ # default is bundled
++ DEFAULT_SYSTEM_NSS=no
++
++ AC_ARG_ENABLE([system-nss], [AS_HELP_STRING([--enable-system-nss],
++ [build the SunEC provider using the system NSS libraries @<:@disabled@:>@])],
++ [
++ case "${enableval}" in
++ yes)
++ system_nss=yes
++ ;;
++ *)
++ system_nss=no
++ ;;
++ esac
++ ],
++ [
++ system_nss=${DEFAULT_SYSTEM_NSS}
++ ])
++ AC_MSG_RESULT([$system_nss])
++
++ if test "x${system_nss}" = "xyes"; then
++ PKG_CHECK_MODULES(NSS, nss-softokn >= 3.16.1, [NSS_SOFTOKN_FOUND=yes], [NSS_SOFTOKN_FOUND=no])
++ if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
++ NSS_LIBS="$NSS_LIBS -lfreebl";
++ USE_EXTERNAL_NSS=true
++ else
++ AC_MSG_ERROR([--enable-system-nss specified, but NSS not found.])
++ fi
++ else
++ USE_EXTERNAL_NSS=false
++ fi
++ AC_SUBST(USE_EXTERNAL_NSS)
++
+ ])
+
+ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP],
+diff -r 92af9369869f common/autoconf/spec.gmk.in
+--- openjdk/common/autoconf/spec.gmk.in Thu Jan 21 22:17:02 2016 +0000
++++ openjdk/common/autoconf/spec.gmk.in Wed Jan 27 05:32:12 2016 +0000
+@@ -647,6 +647,9 @@
+ # Read-only single-machine data
+ INSTALL_SYSCONFDIR=@sysconfdir@
+
++USE_EXTERNAL_NSS:=@USE_EXTERNAL_NSS@
++NSS_LIBS:=@NSS_LIBS@
++NSS_CFLAGS:=@NSS_CFLAGS@
+
+ ####################################################
+ #
diff --git a/pr1983-root.patch b/pr1983-root.patch
deleted file mode 100644
index 100472b..0000000
--- a/pr1983-root.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1453863007 0
-# Wed Jan 27 02:50:07 2016 +0000
-# Node ID f0635543beb309c4da1bb88c906a76ee4b75e16d
-# Parent 4a5a0d4e1ae0feec2f47d17be380d6fcd5eff126
-PR1983: Support using the system installation of NSS with the SunEC provider
-Summary: Add new configure option --enable-system-nss
-
-diff -r 92af9369869f common/autoconf/jdk-options.m4
---- openjdk/common/autoconf/jdk-options.m4 Thu Jan 21 22:17:02 2016 +0000
-+++ openjdk/common/autoconf/jdk-options.m4 Wed Jan 27 05:32:12 2016 +0000
-@@ -414,9 +414,10 @@
- #
- AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
- [
-- AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
-+ AC_REQUIRE([LIB_SETUP_MISC_LIBS])
-+ AC_MSG_CHECKING([if the elliptic curve crypto implementation is present])
-
-- if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
-+ if test "x${system_nss}" = "xyes" -o -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
- ENABLE_INTREE_EC=yes
- AC_MSG_RESULT([yes])
- else
-diff -r 92af9369869f common/autoconf/libraries.m4
---- openjdk/common/autoconf/libraries.m4 Thu Jan 21 22:17:02 2016 +0000
-+++ openjdk/common/autoconf/libraries.m4 Wed Jan 27 05:32:12 2016 +0000
-@@ -731,6 +731,47 @@
- LIBDL="$LIBS"
- AC_SUBST(LIBDL)
- LIBS="$save_LIBS"
-+
-+ ###############################################################################
-+ #
-+ # Check for the NSS libraries
-+ #
-+
-+ AC_MSG_CHECKING([whether to build the Sun EC provider against the system NSS libraries])
-+
-+ # default is bundled
-+ DEFAULT_SYSTEM_NSS=no
-+
-+ AC_ARG_ENABLE([system-nss], [AS_HELP_STRING([--enable-system-nss],
-+ [build the SunEC provider using the system NSS libraries @<:@disabled@:>@])],
-+ [
-+ case "${enableval}" in
-+ yes)
-+ system_nss=yes
-+ ;;
-+ *)
-+ system_nss=no
-+ ;;
-+ esac
-+ ],
-+ [
-+ system_nss=${DEFAULT_SYSTEM_NSS}
-+ ])
-+ AC_MSG_RESULT([$system_nss])
-+
-+ if test "x${system_nss}" = "xyes"; then
-+ PKG_CHECK_MODULES(NSS, nss-softokn >= 3.16.1, [NSS_SOFTOKN_FOUND=yes], [NSS_SOFTOKN_FOUND=no])
-+ if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
-+ NSS_LIBS="$NSS_LIBS -lfreebl";
-+ USE_EXTERNAL_NSS=true
-+ else
-+ AC_MSG_ERROR([--enable-system-nss specified, but NSS not found.])
-+ fi
-+ else
-+ USE_EXTERNAL_NSS=false
-+ fi
-+ AC_SUBST(USE_EXTERNAL_NSS)
-+
- ])
-
- AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP],
-diff -r 92af9369869f common/autoconf/spec.gmk.in
---- openjdk/common/autoconf/spec.gmk.in Thu Jan 21 22:17:02 2016 +0000
-+++ openjdk/common/autoconf/spec.gmk.in Wed Jan 27 05:32:12 2016 +0000
-@@ -647,6 +647,9 @@
- # Read-only single-machine data
- INSTALL_SYSCONFDIR=@sysconfdir@
-
-+USE_EXTERNAL_NSS:=@USE_EXTERNAL_NSS@
-+NSS_LIBS:=@NSS_LIBS@
-+NSS_CFLAGS:=@NSS_CFLAGS@
-
- ####################################################
- #
diff --git a/pr2127-sunec_provider_crashes_when_built_using_system_nss_thus_use_of_nss_memory_management_functions.patch b/pr2127-sunec_provider_crashes_when_built_using_system_nss_thus_use_of_nss_memory_management_functions.patch
new file mode 100644
index 0000000..b08822a
--- /dev/null
+++ b/pr2127-sunec_provider_crashes_when_built_using_system_nss_thus_use_of_nss_memory_management_functions.patch
@@ -0,0 +1,178 @@
+# HG changeset patch
+# User andrew
+# Date 1453866306 0
+# Wed Jan 27 03:45:06 2016 +0000
+# Node ID 0ff7720931e8dbf7de25720bdc93b18527ab89e8
+# Parent 48c15869ecd568263249af4b9a4e98d4e57f9a8f
+PR2127: SunEC provider crashes when built using system NSS
+Summary: Use NSS memory management functions
+
+diff -r 48c15869ecd5 -r 0ff7720931e8 src/share/native/sun/security/ec/ECC_JNI.cpp
+--- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 02:54:06 2016 +0000
++++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 03:45:06 2016 +0000
+@@ -32,6 +32,13 @@
+ #define INVALID_PARAMETER_EXCEPTION \
+ "java/security/InvalidParameterException"
+ #define KEY_EXCEPTION "java/security/KeyException"
++#define INTERNAL_ERROR "java/lang/InternalError"
++
++#ifdef SYSTEM_NSS
++#define SYSTEM_UNUSED(x) UNUSED(x)
++#else
++#define SYSTEM_UNUSED(x) x
++#endif
+
+ extern "C" {
+
+@@ -49,8 +56,13 @@
+ /*
+ * Deep free of the ECParams struct
+ */
+-void FreeECParams(ECParams *ecparams, jboolean freeStruct)
++void FreeECParams(ECParams *ecparams, jboolean SYSTEM_UNUSED(freeStruct))
+ {
++#ifdef SYSTEM_NSS
++ // Needs to be freed using the matching method to the one
++ // that allocated it. PR_TRUE means the memory is zeroed.
++ PORT_FreeArena(ecparams->arena, PR_TRUE);
++#else
+ // Use B_FALSE to free the SECItem->data element, but not the SECItem itself
+ // Use B_TRUE to free both
+
+@@ -64,6 +76,7 @@
+ SECITEM_FreeItem(&ecparams->curveOID, B_FALSE);
+ if (freeStruct)
+ free(ecparams);
++#endif
+ }
+
+ jbyteArray getEncodedBytes(JNIEnv *env, SECItem *hSECItem)
+@@ -108,6 +121,13 @@
+ goto cleanup;
+ }
+
++#ifdef SYSTEM_NSS
++ if (SECOID_Init() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ goto cleanup;
++ }
++#endif
++
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -163,16 +183,26 @@
+ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
++#ifdef SYSTEM_NSS
++ if (SECOID_Shutdown() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
++#endif
+ }
+ if (ecparams) {
+ FreeECParams(ecparams, true);
+ }
+ if (privKey) {
+ FreeECParams(&privKey->ecParams, false);
++#ifndef SYSTEM_NSS
++ // The entire ECPrivateKey is allocated in the arena
++ // when using system NSS, so only the in-tree version
++ // needs to clear these manually.
+ SECITEM_FreeItem(&privKey->version, B_FALSE);
+ SECITEM_FreeItem(&privKey->privateValue, B_FALSE);
+ SECITEM_FreeItem(&privKey->publicValue, B_FALSE);
+ free(privKey);
++#endif
+ }
+
+ if (pSeedBuffer) {
+@@ -223,6 +253,13 @@
+ goto cleanup;
+ }
+
++#ifdef SYSTEM_NSS
++ if (SECOID_Init() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ goto cleanup;
++ }
++#endif
++
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -270,6 +307,11 @@
+ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
++#ifdef SYSTEM_NSS
++ if (SECOID_Shutdown() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
++#endif
+ }
+ if (privKey.privateValue.data) {
+ env->ReleaseByteArrayElements(privateKey,
+@@ -336,6 +378,13 @@
+ goto cleanup;
+ }
+
++#ifdef SYSTEM_NSS
++ if (SECOID_Init() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ goto cleanup;
++ }
++#endif
++
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -356,9 +405,15 @@
+
+ cleanup:
+ {
+- if (params_item.data)
++ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
++#ifdef SYSTEM_NSS
++ if (SECOID_Shutdown() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
++#endif
++ }
+
+ if (pubKey.publicValue.data)
+ env->ReleaseByteArrayElements(publicKey,
+@@ -419,6 +474,13 @@
+ goto cleanup;
+ }
+
++#ifdef SYSTEM_NSS
++ if (SECOID_Init() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ goto cleanup;
++ }
++#endif
++
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -460,9 +522,15 @@
+ env->ReleaseByteArrayElements(publicKey,
+ (jbyte *) publicValue_item.data, JNI_ABORT);
+
+- if (params_item.data)
++ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
++#ifdef SYSTEM_NSS
++ if (SECOID_Shutdown() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
++#endif
++ }
+
+ if (ecparams)
+ FreeECParams(ecparams, true);
diff --git a/pr2127.patch b/pr2127.patch
deleted file mode 100644
index b08822a..0000000
--- a/pr2127.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1453866306 0
-# Wed Jan 27 03:45:06 2016 +0000
-# Node ID 0ff7720931e8dbf7de25720bdc93b18527ab89e8
-# Parent 48c15869ecd568263249af4b9a4e98d4e57f9a8f
-PR2127: SunEC provider crashes when built using system NSS
-Summary: Use NSS memory management functions
-
-diff -r 48c15869ecd5 -r 0ff7720931e8 src/share/native/sun/security/ec/ECC_JNI.cpp
---- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 02:54:06 2016 +0000
-+++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 03:45:06 2016 +0000
-@@ -32,6 +32,13 @@
- #define INVALID_PARAMETER_EXCEPTION \
- "java/security/InvalidParameterException"
- #define KEY_EXCEPTION "java/security/KeyException"
-+#define INTERNAL_ERROR "java/lang/InternalError"
-+
-+#ifdef SYSTEM_NSS
-+#define SYSTEM_UNUSED(x) UNUSED(x)
-+#else
-+#define SYSTEM_UNUSED(x) x
-+#endif
-
- extern "C" {
-
-@@ -49,8 +56,13 @@
- /*
- * Deep free of the ECParams struct
- */
--void FreeECParams(ECParams *ecparams, jboolean freeStruct)
-+void FreeECParams(ECParams *ecparams, jboolean SYSTEM_UNUSED(freeStruct))
- {
-+#ifdef SYSTEM_NSS
-+ // Needs to be freed using the matching method to the one
-+ // that allocated it. PR_TRUE means the memory is zeroed.
-+ PORT_FreeArena(ecparams->arena, PR_TRUE);
-+#else
- // Use B_FALSE to free the SECItem->data element, but not the SECItem itself
- // Use B_TRUE to free both
-
-@@ -64,6 +76,7 @@
- SECITEM_FreeItem(&ecparams->curveOID, B_FALSE);
- if (freeStruct)
- free(ecparams);
-+#endif
- }
-
- jbyteArray getEncodedBytes(JNIEnv *env, SECItem *hSECItem)
-@@ -108,6 +121,13 @@
- goto cleanup;
- }
-
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Init() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ goto cleanup;
-+ }
-+#endif
-+
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -163,16 +183,26 @@
- if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Shutdown() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
-+#endif
- }
- if (ecparams) {
- FreeECParams(ecparams, true);
- }
- if (privKey) {
- FreeECParams(&privKey->ecParams, false);
-+#ifndef SYSTEM_NSS
-+ // The entire ECPrivateKey is allocated in the arena
-+ // when using system NSS, so only the in-tree version
-+ // needs to clear these manually.
- SECITEM_FreeItem(&privKey->version, B_FALSE);
- SECITEM_FreeItem(&privKey->privateValue, B_FALSE);
- SECITEM_FreeItem(&privKey->publicValue, B_FALSE);
- free(privKey);
-+#endif
- }
-
- if (pSeedBuffer) {
-@@ -223,6 +253,13 @@
- goto cleanup;
- }
-
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Init() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ goto cleanup;
-+ }
-+#endif
-+
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -270,6 +307,11 @@
- if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Shutdown() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
-+#endif
- }
- if (privKey.privateValue.data) {
- env->ReleaseByteArrayElements(privateKey,
-@@ -336,6 +378,13 @@
- goto cleanup;
- }
-
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Init() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ goto cleanup;
-+ }
-+#endif
-+
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -356,9 +405,15 @@
-
- cleanup:
- {
-- if (params_item.data)
-+ if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Shutdown() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
-+#endif
-+ }
-
- if (pubKey.publicValue.data)
- env->ReleaseByteArrayElements(publicKey,
-@@ -419,6 +474,13 @@
- goto cleanup;
- }
-
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Init() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ goto cleanup;
-+ }
-+#endif
-+
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -460,9 +522,15 @@
- env->ReleaseByteArrayElements(publicKey,
- (jbyte *) publicValue_item.data, JNI_ABORT);
-
-- if (params_item.data)
-+ if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Shutdown() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
-+#endif
-+ }
-
- if (ecparams)
- FreeECParams(ecparams, true);
diff --git a/pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binary.patch b/pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binary.patch
new file mode 100644
index 0000000..17e1f69
--- /dev/null
+++ b/pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binary.patch
@@ -0,0 +1,302 @@
+# HG changeset patch
+# User mikael
+# Date 1426870964 25200
+# Fri Mar 20 10:02:44 2015 -0700
+# Node ID ee13ce369705a700b867f8c77423580b7b22cc13
+# Parent 7847ccfb240b35ed0dd328f0404b713b20e0905a
+8074839: Resolve disabled warnings for libunpack and the unpack200 binary
+Reviewed-by: dholmes, ksrini
+
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
+@@ -63,7 +63,7 @@
+ bytes res;
+ res.ptr = ptr + beg;
+ res.len = end - beg;
+- assert(res.len == 0 || inBounds(res.ptr) && inBounds(res.limit()-1));
++ assert(res.len == 0 || (inBounds(res.ptr) && inBounds(res.limit()-1)));
+ return res;
+ }
+ // building C strings inside byte buffers:
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
+@@ -292,7 +292,7 @@
+
+ if (uPtr->aborting()) {
+ THROW_IOE(uPtr->get_abort_message());
+- return false;
++ return null;
+ }
+
+ // We have fetched all the files.
+@@ -310,7 +310,7 @@
+ JNIEXPORT jlong JNICALL
+ Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
+ unpacker* uPtr = get_unpacker(env, pObj, false);
+- CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, 0);
+ size_t consumed = uPtr->input_consumed();
+ free_unpacker(env, pObj, uPtr);
+ return consumed;
+@@ -320,6 +320,7 @@
+ Java_com_sun_java_util_jar_pack_NativeUnpack_setOption(JNIEnv *env, jobject pObj,
+ jstring pProp, jstring pValue) {
+ unpacker* uPtr = get_unpacker(env, pObj);
++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false);
+ const char* prop = env->GetStringUTFChars(pProp, JNI_FALSE);
+ CHECK_EXCEPTION_RETURN_VALUE(prop, false);
+ const char* value = env->GetStringUTFChars(pValue, JNI_FALSE);
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
+@@ -142,31 +142,28 @@
+ return progname;
+ }
+
+-static const char* usage_lines[] = {
+- "Usage: %s [-opt... | --option=value]... x.pack[.gz] y.jar\n",
+- "\n",
+- "Unpacking Options\n",
+- " -H{h}, --deflate-hint={h} override transmitted deflate hint: true, false, or keep (default)\n",
+- " -r, --remove-pack-file remove input file after unpacking\n",
+- " -v, --verbose increase program verbosity\n",
+- " -q, --quiet set verbosity to lowest level\n",
+- " -l{F}, --log-file={F} output to the given log file, or '-' for standard output (default)\n",
+- " -?, -h, --help print this message\n",
+- " -V, --version print program version\n",
+- " -J{X} Java VM argument (ignored)\n",
+- null
+-};
++#define USAGE_HEADER "Usage: %s [-opt... | --option=value]... x.pack[.gz] y.jar\n"
++#define USAGE_OPTIONS \
++ "\n" \
++ "Unpacking Options\n" \
++ " -H{h}, --deflate-hint={h} override transmitted deflate hint: true, false, or keep (default)\n" \
++ " -r, --remove-pack-file remove input file after unpacking\n" \
++ " -v, --verbose increase program verbosity\n" \
++ " -q, --quiet set verbosity to lowest level\n" \
++ " -l{F}, --log-file={F} output to the given log file, or '-' for standard output (default)\n" \
++ " -?, -h, --help print this message\n" \
++ " -V, --version print program version\n" \
++ " -J{X} Java VM argument (ignored)\n"
+
+ static void usage(unpacker* u, const char* progname, bool full = false) {
+ // WinMain does not set argv[0] to the progrname
+ progname = (progname != null) ? nbasename(progname) : "unpack200";
+- for (int i = 0; usage_lines[i] != null; i++) {
+- fprintf(u->errstrm, usage_lines[i], progname);
+- if (!full) {
+- fprintf(u->errstrm,
+- "(For more information, run %s --help .)\n", progname);
+- break;
+- }
++
++ fprintf(u->errstrm, USAGE_HEADER, progname);
++ if (full) {
++ fprintf(u->errstrm, USAGE_OPTIONS);
++ } else {
++ fprintf(u->errstrm, "(For more information, run %s --help .)\n", progname);
+ }
+ }
+
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+@@ -222,9 +222,9 @@
+ }
+
+ #ifdef PRODUCT
+- char* string() { return 0; }
++ const char* string() { return NULL; }
+ #else
+- char* string(); // see far below
++ const char* string(); // see far below
+ #endif
+ };
+
+@@ -715,13 +715,13 @@
+ // Now we can size the whole archive.
+ // Read everything else into a mega-buffer.
+ rp = hdr.rp;
+- int header_size_0 = (int)(rp - input.base()); // used-up header (4byte + 3int)
+- int header_size_1 = (int)(rplimit - rp); // buffered unused initial fragment
+- int header_size = header_size_0+header_size_1;
++ size_t header_size_0 = (rp - input.base()); // used-up header (4byte + 3int)
++ size_t header_size_1 = (rplimit - rp); // buffered unused initial fragment
++ size_t header_size = header_size_0 + header_size_1;
+ unsized_bytes_read = header_size_0;
+ CHECK;
+ if (foreign_buf) {
+- if (archive_size > (size_t)header_size_1) {
++ if (archive_size > header_size_1) {
+ abort("EOF reading fixed input buffer");
+ return;
+ }
+@@ -735,7 +735,7 @@
+ return;
+ }
+ input.set(U_NEW(byte, add_size(header_size_0, archive_size, C_SLOP)),
+- (size_t) header_size_0 + archive_size);
++ header_size_0 + archive_size);
+ CHECK;
+ assert(input.limit()[0] == 0);
+ // Move all the bytes we read initially into the real buffer.
+@@ -958,13 +958,13 @@
+ nentries = next_entry;
+
+ // place a limit on future CP growth:
+- int generous = 0;
++ size_t generous = 0;
+ generous = add_size(generous, u->ic_count); // implicit name
+ generous = add_size(generous, u->ic_count); // outer
+ generous = add_size(generous, u->ic_count); // outer.utf8
+ generous = add_size(generous, 40); // WKUs, misc
+ generous = add_size(generous, u->class_count); // implicit SourceFile strings
+- maxentries = add_size(nentries, generous);
++ maxentries = (uint)add_size(nentries, generous);
+
+ // Note that this CP does not include "empty" entries
+ // for longs and doubles. Those are introduced when
+@@ -982,8 +982,9 @@
+ }
+
+ // Initialize *all* our entries once
+- for (int i = 0 ; i < maxentries ; i++)
++ for (uint i = 0 ; i < maxentries ; i++) {
+ entries[i].outputIndex = REQUESTED_NONE;
++ }
+
+ initGroupIndexes();
+ // Initialize hashTab to a generous power-of-two size.
+@@ -3677,21 +3678,22 @@
+
+ unpacker* debug_u;
+
+-static bytes& getbuf(int len) { // for debugging only!
++static bytes& getbuf(size_t len) { // for debugging only!
+ static int bn = 0;
+ static bytes bufs[8];
+ bytes& buf = bufs[bn++ & 7];
+- while ((int)buf.len < len+10)
++ while (buf.len < len + 10) {
+ buf.realloc(buf.len ? buf.len * 2 : 1000);
++ }
+ buf.ptr[0] = 0; // for the sake of strcat
+ return buf;
+ }
+
+-char* entry::string() {
++const char* entry::string() {
+ bytes buf;
+ switch (tag) {
+ case CONSTANT_None:
+- return (char*)"<empty>";
++ return "<empty>";
+ case CONSTANT_Signature:
+ if (value.b.ptr == null)
+ return ref(0)->string();
+@@ -3711,26 +3713,28 @@
+ break;
+ default:
+ if (nrefs == 0) {
+- buf = getbuf(20);
+- sprintf((char*)buf.ptr, TAG_NAME[tag]);
++ return TAG_NAME[tag];
+ } else if (nrefs == 1) {
+ return refs[0]->string();
+ } else {
+- char* s1 = refs[0]->string();
+- char* s2 = refs[1]->string();
+- buf = getbuf((int)strlen(s1) + 1 + (int)strlen(s2) + 4 + 1);
++ const char* s1 = refs[0]->string();
++ const char* s2 = refs[1]->string();
++ buf = getbuf(strlen(s1) + 1 + strlen(s2) + 4 + 1);
+ buf.strcat(s1).strcat(" ").strcat(s2);
+ if (nrefs > 2) buf.strcat(" ...");
+ }
+ }
+- return (char*)buf.ptr;
++ return (const char*)buf.ptr;
+ }
+
+ void print_cp_entry(int i) {
+ entry& e = debug_u->cp.entries[i];
+- char buf[30];
+- sprintf(buf, ((uint)e.tag < CONSTANT_Limit)? TAG_NAME[e.tag]: "%d", e.tag);
+- printf(" %d\t%s %s\n", i, buf, e.string());
++
++ if ((uint)e.tag < CONSTANT_Limit) {
++ printf(" %d\t%s %s\n", i, TAG_NAME[e.tag], e.string());
++ } else {
++ printf(" %d\t%d %s\n", i, e.tag, e.string());
++ }
+ }
+
+ void print_cp_entries(int beg, int end) {
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
+@@ -209,7 +209,7 @@
+ byte* rp; // read pointer (< rplimit <= input.limit())
+ byte* rplimit; // how much of the input block has been read?
+ julong bytes_read;
+- int unsized_bytes_read;
++ size_t unsized_bytes_read;
+
+ // callback to read at least one byte, up to available input
+ typedef jlong (*read_input_fn_t)(unpacker* self, void* buf, jlong minlen, jlong maxlen);
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
+@@ -81,7 +81,7 @@
+ int assert_failed(const char* p) {
+ char message[1<<12];
+ sprintf(message, "@assert failed: %s\n", p);
+- fprintf(stdout, 1+message);
++ fprintf(stdout, "%s", 1+message);
+ breakpoint();
+ unpack_abort(message);
+ return 0;
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
+@@ -84,7 +84,7 @@
+ }
+
+ // Write data to the ZIP output stream.
+-void jar::write_data(void* buff, int len) {
++void jar::write_data(void* buff, size_t len) {
+ while (len > 0) {
+ int rc = (int)fwrite(buff, 1, len, jarfp);
+ if (rc <= 0) {
+@@ -323,12 +323,12 @@
+ // Total number of disks (int)
+ header64[36] = (ushort)SWAP_BYTES(1);
+ header64[37] = 0;
+- write_data(header64, (int)sizeof(header64));
++ write_data(header64, sizeof(header64));
+ }
+
+ // Write the End of Central Directory structure.
+ PRINTCR((2, "end-of-directory at %d\n", output_file_offset));
+- write_data(header, (int)sizeof(header));
++ write_data(header, sizeof(header));
+
+ PRINTCR((2, "writing zip comment\n"));
+ // Write the comment.
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
+@@ -68,8 +68,8 @@
+ }
+
+ // Private Methods
+- void write_data(void* ptr, int len);
+- void write_data(bytes& b) { write_data(b.ptr, (int)b.len); }
++ void write_data(void* ptr, size_t len);
++ void write_data(bytes& b) { write_data(b.ptr, b.len); }
+ void add_to_jar_directory(const char* fname, bool store, int modtime,
+ int len, int clen, uLong crc);
+ void write_jar_header(const char* fname, bool store, int modtime,
diff --git a/pr2462.patch b/pr2462.patch
deleted file mode 100644
index 17e1f69..0000000
--- a/pr2462.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-# HG changeset patch
-# User mikael
-# Date 1426870964 25200
-# Fri Mar 20 10:02:44 2015 -0700
-# Node ID ee13ce369705a700b867f8c77423580b7b22cc13
-# Parent 7847ccfb240b35ed0dd328f0404b713b20e0905a
-8074839: Resolve disabled warnings for libunpack and the unpack200 binary
-Reviewed-by: dholmes, ksrini
-
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
-@@ -63,7 +63,7 @@
- bytes res;
- res.ptr = ptr + beg;
- res.len = end - beg;
-- assert(res.len == 0 || inBounds(res.ptr) && inBounds(res.limit()-1));
-+ assert(res.len == 0 || (inBounds(res.ptr) && inBounds(res.limit()-1)));
- return res;
- }
- // building C strings inside byte buffers:
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
-@@ -292,7 +292,7 @@
-
- if (uPtr->aborting()) {
- THROW_IOE(uPtr->get_abort_message());
-- return false;
-+ return null;
- }
-
- // We have fetched all the files.
-@@ -310,7 +310,7 @@
- JNIEXPORT jlong JNICALL
- Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
- unpacker* uPtr = get_unpacker(env, pObj, false);
-- CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
-+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, 0);
- size_t consumed = uPtr->input_consumed();
- free_unpacker(env, pObj, uPtr);
- return consumed;
-@@ -320,6 +320,7 @@
- Java_com_sun_java_util_jar_pack_NativeUnpack_setOption(JNIEnv *env, jobject pObj,
- jstring pProp, jstring pValue) {
- unpacker* uPtr = get_unpacker(env, pObj);
-+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false);
- const char* prop = env->GetStringUTFChars(pProp, JNI_FALSE);
- CHECK_EXCEPTION_RETURN_VALUE(prop, false);
- const char* value = env->GetStringUTFChars(pValue, JNI_FALSE);
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
-@@ -142,31 +142,28 @@
- return progname;
- }
-
--static const char* usage_lines[] = {
-- "Usage: %s [-opt... | --option=value]... x.pack[.gz] y.jar\n",
-- "\n",
-- "Unpacking Options\n",
-- " -H{h}, --deflate-hint={h} override transmitted deflate hint: true, false, or keep (default)\n",
-- " -r, --remove-pack-file remove input file after unpacking\n",
-- " -v, --verbose increase program verbosity\n",
-- " -q, --quiet set verbosity to lowest level\n",
-- " -l{F}, --log-file={F} output to the given log file, or '-' for standard output (default)\n",
-- " -?, -h, --help print this message\n",
-- " -V, --version print program version\n",
-- " -J{X} Java VM argument (ignored)\n",
-- null
--};
-+#define USAGE_HEADER "Usage: %s [-opt... | --option=value]... x.pack[.gz] y.jar\n"
-+#define USAGE_OPTIONS \
-+ "\n" \
-+ "Unpacking Options\n" \
-+ " -H{h}, --deflate-hint={h} override transmitted deflate hint: true, false, or keep (default)\n" \
-+ " -r, --remove-pack-file remove input file after unpacking\n" \
-+ " -v, --verbose increase program verbosity\n" \
-+ " -q, --quiet set verbosity to lowest level\n" \
-+ " -l{F}, --log-file={F} output to the given log file, or '-' for standard output (default)\n" \
-+ " -?, -h, --help print this message\n" \
-+ " -V, --version print program version\n" \
-+ " -J{X} Java VM argument (ignored)\n"
-
- static void usage(unpacker* u, const char* progname, bool full = false) {
- // WinMain does not set argv[0] to the progrname
- progname = (progname != null) ? nbasename(progname) : "unpack200";
-- for (int i = 0; usage_lines[i] != null; i++) {
-- fprintf(u->errstrm, usage_lines[i], progname);
-- if (!full) {
-- fprintf(u->errstrm,
-- "(For more information, run %s --help .)\n", progname);
-- break;
-- }
-+
-+ fprintf(u->errstrm, USAGE_HEADER, progname);
-+ if (full) {
-+ fprintf(u->errstrm, USAGE_OPTIONS);
-+ } else {
-+ fprintf(u->errstrm, "(For more information, run %s --help .)\n", progname);
- }
- }
-
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
-@@ -222,9 +222,9 @@
- }
-
- #ifdef PRODUCT
-- char* string() { return 0; }
-+ const char* string() { return NULL; }
- #else
-- char* string(); // see far below
-+ const char* string(); // see far below
- #endif
- };
-
-@@ -715,13 +715,13 @@
- // Now we can size the whole archive.
- // Read everything else into a mega-buffer.
- rp = hdr.rp;
-- int header_size_0 = (int)(rp - input.base()); // used-up header (4byte + 3int)
-- int header_size_1 = (int)(rplimit - rp); // buffered unused initial fragment
-- int header_size = header_size_0+header_size_1;
-+ size_t header_size_0 = (rp - input.base()); // used-up header (4byte + 3int)
-+ size_t header_size_1 = (rplimit - rp); // buffered unused initial fragment
-+ size_t header_size = header_size_0 + header_size_1;
- unsized_bytes_read = header_size_0;
- CHECK;
- if (foreign_buf) {
-- if (archive_size > (size_t)header_size_1) {
-+ if (archive_size > header_size_1) {
- abort("EOF reading fixed input buffer");
- return;
- }
-@@ -735,7 +735,7 @@
- return;
- }
- input.set(U_NEW(byte, add_size(header_size_0, archive_size, C_SLOP)),
-- (size_t) header_size_0 + archive_size);
-+ header_size_0 + archive_size);
- CHECK;
- assert(input.limit()[0] == 0);
- // Move all the bytes we read initially into the real buffer.
-@@ -958,13 +958,13 @@
- nentries = next_entry;
-
- // place a limit on future CP growth:
-- int generous = 0;
-+ size_t generous = 0;
- generous = add_size(generous, u->ic_count); // implicit name
- generous = add_size(generous, u->ic_count); // outer
- generous = add_size(generous, u->ic_count); // outer.utf8
- generous = add_size(generous, 40); // WKUs, misc
- generous = add_size(generous, u->class_count); // implicit SourceFile strings
-- maxentries = add_size(nentries, generous);
-+ maxentries = (uint)add_size(nentries, generous);
-
- // Note that this CP does not include "empty" entries
- // for longs and doubles. Those are introduced when
-@@ -982,8 +982,9 @@
- }
-
- // Initialize *all* our entries once
-- for (int i = 0 ; i < maxentries ; i++)
-+ for (uint i = 0 ; i < maxentries ; i++) {
- entries[i].outputIndex = REQUESTED_NONE;
-+ }
-
- initGroupIndexes();
- // Initialize hashTab to a generous power-of-two size.
-@@ -3677,21 +3678,22 @@
-
- unpacker* debug_u;
-
--static bytes& getbuf(int len) { // for debugging only!
-+static bytes& getbuf(size_t len) { // for debugging only!
- static int bn = 0;
- static bytes bufs[8];
- bytes& buf = bufs[bn++ & 7];
-- while ((int)buf.len < len+10)
-+ while (buf.len < len + 10) {
- buf.realloc(buf.len ? buf.len * 2 : 1000);
-+ }
- buf.ptr[0] = 0; // for the sake of strcat
- return buf;
- }
-
--char* entry::string() {
-+const char* entry::string() {
- bytes buf;
- switch (tag) {
- case CONSTANT_None:
-- return (char*)"<empty>";
-+ return "<empty>";
- case CONSTANT_Signature:
- if (value.b.ptr == null)
- return ref(0)->string();
-@@ -3711,26 +3713,28 @@
- break;
- default:
- if (nrefs == 0) {
-- buf = getbuf(20);
-- sprintf((char*)buf.ptr, TAG_NAME[tag]);
-+ return TAG_NAME[tag];
- } else if (nrefs == 1) {
- return refs[0]->string();
- } else {
-- char* s1 = refs[0]->string();
-- char* s2 = refs[1]->string();
-- buf = getbuf((int)strlen(s1) + 1 + (int)strlen(s2) + 4 + 1);
-+ const char* s1 = refs[0]->string();
-+ const char* s2 = refs[1]->string();
-+ buf = getbuf(strlen(s1) + 1 + strlen(s2) + 4 + 1);
- buf.strcat(s1).strcat(" ").strcat(s2);
- if (nrefs > 2) buf.strcat(" ...");
- }
- }
-- return (char*)buf.ptr;
-+ return (const char*)buf.ptr;
- }
-
- void print_cp_entry(int i) {
- entry& e = debug_u->cp.entries[i];
-- char buf[30];
-- sprintf(buf, ((uint)e.tag < CONSTANT_Limit)? TAG_NAME[e.tag]: "%d", e.tag);
-- printf(" %d\t%s %s\n", i, buf, e.string());
-+
-+ if ((uint)e.tag < CONSTANT_Limit) {
-+ printf(" %d\t%s %s\n", i, TAG_NAME[e.tag], e.string());
-+ } else {
-+ printf(" %d\t%d %s\n", i, e.tag, e.string());
-+ }
- }
-
- void print_cp_entries(int beg, int end) {
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
-@@ -209,7 +209,7 @@
- byte* rp; // read pointer (< rplimit <= input.limit())
- byte* rplimit; // how much of the input block has been read?
- julong bytes_read;
-- int unsized_bytes_read;
-+ size_t unsized_bytes_read;
-
- // callback to read at least one byte, up to available input
- typedef jlong (*read_input_fn_t)(unpacker* self, void* buf, jlong minlen, jlong maxlen);
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
-@@ -81,7 +81,7 @@
- int assert_failed(const char* p) {
- char message[1<<12];
- sprintf(message, "@assert failed: %s\n", p);
-- fprintf(stdout, 1+message);
-+ fprintf(stdout, "%s", 1+message);
- breakpoint();
- unpack_abort(message);
- return 0;
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
-@@ -84,7 +84,7 @@
- }
-
- // Write data to the ZIP output stream.
--void jar::write_data(void* buff, int len) {
-+void jar::write_data(void* buff, size_t len) {
- while (len > 0) {
- int rc = (int)fwrite(buff, 1, len, jarfp);
- if (rc <= 0) {
-@@ -323,12 +323,12 @@
- // Total number of disks (int)
- header64[36] = (ushort)SWAP_BYTES(1);
- header64[37] = 0;
-- write_data(header64, (int)sizeof(header64));
-+ write_data(header64, sizeof(header64));
- }
-
- // Write the End of Central Directory structure.
- PRINTCR((2, "end-of-directory at %d\n", output_file_offset));
-- write_data(header, (int)sizeof(header));
-+ write_data(header, sizeof(header));
-
- PRINTCR((2, "writing zip comment\n"));
- // Write the comment.
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
-@@ -68,8 +68,8 @@
- }
-
- // Private Methods
-- void write_data(void* ptr, int len);
-- void write_data(bytes& b) { write_data(b.ptr, (int)b.len); }
-+ void write_data(void* ptr, size_t len);
-+ void write_data(bytes& b) { write_data(b.ptr, b.len); }
- void add_to_jar_directory(const char* fname, bool store, int modtime,
- int len, int clen, uLong crc);
- void write_jar_header(const char* fname, bool store, int modtime,
diff --git a/pr2737-allow_multiple_pkcs11_library_initialisation_to_be_a_non_critical_error.patch b/pr2737-allow_multiple_pkcs11_library_initialisation_to_be_a_non_critical_error.patch
new file mode 100644
index 0000000..f1e8bc2
--- /dev/null
+++ b/pr2737-allow_multiple_pkcs11_library_initialisation_to_be_a_non_critical_error.patch
@@ -0,0 +1,74 @@
+# 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 {
diff --git a/pr2815-race_condition_in_sunec_provider_with_system_nss_fix.patch b/pr2815-race_condition_in_sunec_provider_with_system_nss_fix.patch
new file mode 100644
index 0000000..db14f10
--- /dev/null
+++ b/pr2815-race_condition_in_sunec_provider_with_system_nss_fix.patch
@@ -0,0 +1,189 @@
+# HG changeset patch
+# User andrew
+# Date 1453867347 0
+# Wed Jan 27 04:02:27 2016 +0000
+# Node ID 26e2e029ee256e9815fdc324831a03d8582255e1
+# Parent 0ff7720931e8dbf7de25720bdc93b18527ab89e8
+PR2815: Race condition in SunEC provider with system NSS
+Summary: Perform initialisation and shutdown only when library is loaded or SunEC is finalized respectively
+
+diff -r 0ff7720931e8 -r 26e2e029ee25 make/mapfiles/libsunec/mapfile-vers
+--- openjdk/jdk/make/mapfiles/libsunec/mapfile-vers Wed Jan 27 03:45:06 2016 +0000
++++ openjdk/jdk/make/mapfiles/libsunec/mapfile-vers Wed Jan 27 04:02:27 2016 +0000
+@@ -31,6 +31,8 @@
+ Java_sun_security_ec_ECDSASignature_signDigest;
+ Java_sun_security_ec_ECDSASignature_verifySignedDigest;
+ Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
++ Java_sun_security_ec_SunEC_initialize;
++ Java_sun_security_ec_SunEC_cleanup;
+ local:
+ *;
+ };
+diff -r 0ff7720931e8 -r 26e2e029ee25 src/share/classes/sun/security/ec/SunEC.java
+--- openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java Wed Jan 27 03:45:06 2016 +0000
++++ openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java Wed Jan 27 04:02:27 2016 +0000
+@@ -58,6 +58,7 @@
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ public Void run() {
+ System.loadLibrary("sunec"); // check for native library
++ initialize();
+ return null;
+ }
+ });
+@@ -81,4 +82,22 @@
+ }
+ }
+
++ /**
++ * Cleanup native resources during finalisation.
++ */
++ @Override
++ protected void finalize() {
++ cleanup();
++ }
++
++ /**
++ * Initialize the native code.
++ */
++ private static native void initialize();
++
++ /**
++ * Cleanup in the native layer.
++ */
++ private static native void cleanup();
++
+ }
+diff -r 0ff7720931e8 -r 26e2e029ee25 src/share/native/sun/security/ec/ECC_JNI.cpp
+--- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 03:45:06 2016 +0000
++++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 04:02:27 2016 +0000
+@@ -121,13 +121,6 @@
+ goto cleanup;
+ }
+
+-#ifdef SYSTEM_NSS
+- if (SECOID_Init() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- goto cleanup;
+- }
+-#endif
+-
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -183,11 +176,6 @@
+ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
+-#ifdef SYSTEM_NSS
+- if (SECOID_Shutdown() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- }
+-#endif
+ }
+ if (ecparams) {
+ FreeECParams(ecparams, true);
+@@ -253,13 +241,6 @@
+ goto cleanup;
+ }
+
+-#ifdef SYSTEM_NSS
+- if (SECOID_Init() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- goto cleanup;
+- }
+-#endif
+-
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -307,11 +288,6 @@
+ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
+-#ifdef SYSTEM_NSS
+- if (SECOID_Shutdown() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- }
+-#endif
+ }
+ if (privKey.privateValue.data) {
+ env->ReleaseByteArrayElements(privateKey,
+@@ -378,13 +354,6 @@
+ goto cleanup;
+ }
+
+-#ifdef SYSTEM_NSS
+- if (SECOID_Init() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- goto cleanup;
+- }
+-#endif
+-
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -408,11 +377,6 @@
+ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
+-#ifdef SYSTEM_NSS
+- if (SECOID_Shutdown() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- }
+-#endif
+ }
+
+ if (pubKey.publicValue.data)
+@@ -474,13 +438,6 @@
+ goto cleanup;
+ }
+
+-#ifdef SYSTEM_NSS
+- if (SECOID_Init() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- goto cleanup;
+- }
+-#endif
+-
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -525,11 +482,6 @@
+ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
+-#ifdef SYSTEM_NSS
+- if (SECOID_Shutdown() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- }
+-#endif
+ }
+
+ if (ecparams)
+@@ -539,4 +491,26 @@
+ return jSecret;
+ }
+
++JNIEXPORT void
++JNICALL Java_sun_security_ec_SunEC_initialize
++ (JNIEnv *env, jclass UNUSED(clazz))
++{
++#ifdef SYSTEM_NSS
++ if (SECOID_Init() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
++#endif
++}
++
++JNIEXPORT void
++JNICALL Java_sun_security_ec_SunEC_cleanup
++ (JNIEnv *env, jclass UNUSED(clazz))
++{
++#ifdef SYSTEM_NSS
++ if (SECOID_Shutdown() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
++#endif
++}
++
+ } /* extern "C" */
diff --git a/pr2815.patch b/pr2815.patch
deleted file mode 100644
index db14f10..0000000
--- a/pr2815.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1453867347 0
-# Wed Jan 27 04:02:27 2016 +0000
-# Node ID 26e2e029ee256e9815fdc324831a03d8582255e1
-# Parent 0ff7720931e8dbf7de25720bdc93b18527ab89e8
-PR2815: Race condition in SunEC provider with system NSS
-Summary: Perform initialisation and shutdown only when library is loaded or SunEC is finalized respectively
-
-diff -r 0ff7720931e8 -r 26e2e029ee25 make/mapfiles/libsunec/mapfile-vers
---- openjdk/jdk/make/mapfiles/libsunec/mapfile-vers Wed Jan 27 03:45:06 2016 +0000
-+++ openjdk/jdk/make/mapfiles/libsunec/mapfile-vers Wed Jan 27 04:02:27 2016 +0000
-@@ -31,6 +31,8 @@
- Java_sun_security_ec_ECDSASignature_signDigest;
- Java_sun_security_ec_ECDSASignature_verifySignedDigest;
- Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
-+ Java_sun_security_ec_SunEC_initialize;
-+ Java_sun_security_ec_SunEC_cleanup;
- local:
- *;
- };
-diff -r 0ff7720931e8 -r 26e2e029ee25 src/share/classes/sun/security/ec/SunEC.java
---- openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java Wed Jan 27 03:45:06 2016 +0000
-+++ openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java Wed Jan 27 04:02:27 2016 +0000
-@@ -58,6 +58,7 @@
- AccessController.doPrivileged(new PrivilegedAction<Void>() {
- public Void run() {
- System.loadLibrary("sunec"); // check for native library
-+ initialize();
- return null;
- }
- });
-@@ -81,4 +82,22 @@
- }
- }
-
-+ /**
-+ * Cleanup native resources during finalisation.
-+ */
-+ @Override
-+ protected void finalize() {
-+ cleanup();
-+ }
-+
-+ /**
-+ * Initialize the native code.
-+ */
-+ private static native void initialize();
-+
-+ /**
-+ * Cleanup in the native layer.
-+ */
-+ private static native void cleanup();
-+
- }
-diff -r 0ff7720931e8 -r 26e2e029ee25 src/share/native/sun/security/ec/ECC_JNI.cpp
---- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 03:45:06 2016 +0000
-+++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 04:02:27 2016 +0000
-@@ -121,13 +121,6 @@
- goto cleanup;
- }
-
--#ifdef SYSTEM_NSS
-- if (SECOID_Init() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- goto cleanup;
-- }
--#endif
--
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -183,11 +176,6 @@
- if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
--#ifdef SYSTEM_NSS
-- if (SECOID_Shutdown() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- }
--#endif
- }
- if (ecparams) {
- FreeECParams(ecparams, true);
-@@ -253,13 +241,6 @@
- goto cleanup;
- }
-
--#ifdef SYSTEM_NSS
-- if (SECOID_Init() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- goto cleanup;
-- }
--#endif
--
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -307,11 +288,6 @@
- if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
--#ifdef SYSTEM_NSS
-- if (SECOID_Shutdown() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- }
--#endif
- }
- if (privKey.privateValue.data) {
- env->ReleaseByteArrayElements(privateKey,
-@@ -378,13 +354,6 @@
- goto cleanup;
- }
-
--#ifdef SYSTEM_NSS
-- if (SECOID_Init() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- goto cleanup;
-- }
--#endif
--
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -408,11 +377,6 @@
- if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
--#ifdef SYSTEM_NSS
-- if (SECOID_Shutdown() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- }
--#endif
- }
-
- if (pubKey.publicValue.data)
-@@ -474,13 +438,6 @@
- goto cleanup;
- }
-
--#ifdef SYSTEM_NSS
-- if (SECOID_Init() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- goto cleanup;
-- }
--#endif
--
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -525,11 +482,6 @@
- if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
--#ifdef SYSTEM_NSS
-- if (SECOID_Shutdown() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- }
--#endif
- }
-
- if (ecparams)
-@@ -539,4 +491,26 @@
- return jSecret;
- }
-
-+JNIEXPORT void
-+JNICALL Java_sun_security_ec_SunEC_initialize
-+ (JNIEnv *env, jclass UNUSED(clazz))
-+{
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Init() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
-+#endif
-+}
-+
-+JNIEXPORT void
-+JNICALL Java_sun_security_ec_SunEC_cleanup
-+ (JNIEnv *env, jclass UNUSED(clazz))
-+{
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Shutdown() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
-+#endif
-+}
-+
- } /* extern "C" */
diff --git a/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch b/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch
new file mode 100644
index 0000000..fc8f981
--- /dev/null
+++ b/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch
@@ -0,0 +1,60 @@
+# HG changeset patch
+# User andrew
+# Date 1459487045 -3600
+# Fri Apr 01 06:04:05 2016 +0100
+# Node ID 3334efeacd8327a14b7d2f392f4546e3c29c594b
+# Parent 6b81fd2227d14226f2121f2d51b464536925686e
+PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
+
+diff --git a/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java b/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
+--- openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
++++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
+@@ -174,15 +174,20 @@
+ storeFile = new File(storeFileName);
+ fis = getFileInputStream(storeFile);
+ } else {
+- String javaHome = props.get("javaHome");
+- storeFile = new File(javaHome + sep + "lib" + sep
+- + "security" + sep +
+- "jssecacerts");
++ /* Check system cacerts DB first; /etc/pki/java/cacerts */
++ storeFile = new File(sep + "etc" + sep + "pki" + sep
++ + "java" + sep + "cacerts");
+ if ((fis = getFileInputStream(storeFile)) == null) {
++ String javaHome = props.get("javaHome");
+ storeFile = new File(javaHome + sep + "lib" + sep
+- + "security" + sep +
+- "cacerts");
+- fis = getFileInputStream(storeFile);
++ + "security" + sep +
++ "jssecacerts");
++ if ((fis = getFileInputStream(storeFile)) == null) {
++ storeFile = new File(javaHome + sep + "lib" + sep
++ + "security" + sep +
++ "cacerts");
++ fis = getFileInputStream(storeFile);
++ }
+ }
+ }
+
+diff --git a/src/share/classes/sun/security/tools/KeyStoreUtil.java b/src/share/classes/sun/security/tools/KeyStoreUtil.java
+--- openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
++++ openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
+@@ -87,9 +87,14 @@
+ throws Exception
+ {
+ String sep = File.separator;
+- File file = new File(System.getProperty("java.home") + sep
+- + "lib" + sep + "security" + sep
+- + "cacerts");
++ /* Check system cacerts DB first; /etc/pki/java/cacerts */
++ File file = new File(sep + "etc" + sep + "pki" + sep
++ + "java" + sep + "cacerts");
++ if (!file.exists()) {
++ file = new File(System.getProperty("java.home") + sep
++ + "lib" + sep + "security" + sep
++ + "cacerts");
++ }
+ if (!file.exists()) {
+ return null;
+ }
diff --git a/pr2888.patch b/pr2888.patch
deleted file mode 100644
index fc8f981..0000000
--- a/pr2888.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1459487045 -3600
-# Fri Apr 01 06:04:05 2016 +0100
-# Node ID 3334efeacd8327a14b7d2f392f4546e3c29c594b
-# Parent 6b81fd2227d14226f2121f2d51b464536925686e
-PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
-
-diff --git a/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java b/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
---- openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
-+++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
-@@ -174,15 +174,20 @@
- storeFile = new File(storeFileName);
- fis = getFileInputStream(storeFile);
- } else {
-- String javaHome = props.get("javaHome");
-- storeFile = new File(javaHome + sep + "lib" + sep
-- + "security" + sep +
-- "jssecacerts");
-+ /* Check system cacerts DB first; /etc/pki/java/cacerts */
-+ storeFile = new File(sep + "etc" + sep + "pki" + sep
-+ + "java" + sep + "cacerts");
- if ((fis = getFileInputStream(storeFile)) == null) {
-+ String javaHome = props.get("javaHome");
- storeFile = new File(javaHome + sep + "lib" + sep
-- + "security" + sep +
-- "cacerts");
-- fis = getFileInputStream(storeFile);
-+ + "security" + sep +
-+ "jssecacerts");
-+ if ((fis = getFileInputStream(storeFile)) == null) {
-+ storeFile = new File(javaHome + sep + "lib" + sep
-+ + "security" + sep +
-+ "cacerts");
-+ fis = getFileInputStream(storeFile);
-+ }
- }
- }
-
-diff --git a/src/share/classes/sun/security/tools/KeyStoreUtil.java b/src/share/classes/sun/security/tools/KeyStoreUtil.java
---- openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
-+++ openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
-@@ -87,9 +87,14 @@
- throws Exception
- {
- String sep = File.separator;
-- File file = new File(System.getProperty("java.home") + sep
-- + "lib" + sep + "security" + sep
-- + "cacerts");
-+ /* Check system cacerts DB first; /etc/pki/java/cacerts */
-+ File file = new File(sep + "etc" + sep + "pki" + sep
-+ + "java" + sep + "cacerts");
-+ if (!file.exists()) {
-+ file = new File(System.getProperty("java.home") + sep
-+ + "lib" + sep + "security" + sep
-+ + "cacerts");
-+ }
- if (!file.exists()) {
- return null;
- }
diff --git a/pr2899-dont_use_withseed_versions_of_nss_functions_as_they_dont_fully_process_the_seed.patch b/pr2899-dont_use_withseed_versions_of_nss_functions_as_they_dont_fully_process_the_seed.patch
new file mode 100644
index 0000000..ffdefb0
--- /dev/null
+++ b/pr2899-dont_use_withseed_versions_of_nss_functions_as_they_dont_fully_process_the_seed.patch
@@ -0,0 +1,24 @@
+# HG changeset patch
+# User andrew
+# Date 1459313680 -3600
+# Wed Mar 30 05:54:40 2016 +0100
+# Node ID 9dc0eca5fa8926e6a952fa4f1931e78aa1f52443
+# Parent 8957aff589013e671f02d38023d5ff245ef27e87
+PR2899: Don't use WithSeed versions of NSS functions as they don't fully process the seed
+Contributed-by: Alex Kashchenko <akashche(a)redhat.com>
+Updated 2017/07/04 to accomodate 8175110 by Andrew Hughes <gnu.andrew(a)redhat.com>
+
+diff -r e5fdbb82bd49 src/share/native/sun/security/ec/ecc_impl.h
+--- openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
++++ openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
+@@ -267,8 +267,8 @@
+
+ #ifdef SYSTEM_NSS
+ #define EC_DecodeParams(a,b,c) EC_DecodeParams(a,b)
+-#define EC_NewKey(a,b,c,d,e) EC_NewKeyFromSeed(a,b,c,d)
+-#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigestWithSeed(a,b,c,d,e)
++#define EC_NewKey(a,b,c,d,e) EC_NewKey(a,b)
++#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigest(a,b,c)
+ #define ECDSA_VerifyDigest(a,b,c,d) ECDSA_VerifyDigest(a,b,c)
+ #define ECDH_Derive(a,b,c,d,e,f) ECDH_Derive(a,b,c,d,e)
+ #else
diff --git a/pr2899.patch b/pr2899.patch
deleted file mode 100644
index ffdefb0..0000000
--- a/pr2899.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1459313680 -3600
-# Wed Mar 30 05:54:40 2016 +0100
-# Node ID 9dc0eca5fa8926e6a952fa4f1931e78aa1f52443
-# Parent 8957aff589013e671f02d38023d5ff245ef27e87
-PR2899: Don't use WithSeed versions of NSS functions as they don't fully process the seed
-Contributed-by: Alex Kashchenko <akashche(a)redhat.com>
-Updated 2017/07/04 to accomodate 8175110 by Andrew Hughes <gnu.andrew(a)redhat.com>
-
-diff -r e5fdbb82bd49 src/share/native/sun/security/ec/ecc_impl.h
---- openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
-+++ openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
-@@ -267,8 +267,8 @@
-
- #ifdef SYSTEM_NSS
- #define EC_DecodeParams(a,b,c) EC_DecodeParams(a,b)
--#define EC_NewKey(a,b,c,d,e) EC_NewKeyFromSeed(a,b,c,d)
--#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigestWithSeed(a,b,c,d,e)
-+#define EC_NewKey(a,b,c,d,e) EC_NewKey(a,b)
-+#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigest(a,b,c)
- #define ECDSA_VerifyDigest(a,b,c,d) ECDSA_VerifyDigest(a,b,c)
- #define ECDH_Derive(a,b,c,d,e,f) ECDH_Derive(a,b,c,d,e)
- #else
diff --git a/pr2934-sunec_provider_throwing_keyexception_withine.separator_current_nss_thus_initialise_the_random_number_generator_and_feed_the_seed_to_it.patch b/pr2934-sunec_provider_throwing_keyexception_withine.separator_current_nss_thus_initialise_the_random_number_generator_and_feed_the_seed_to_it.patch
new file mode 100644
index 0000000..83385da
--- /dev/null
+++ b/pr2934-sunec_provider_throwing_keyexception_withine.separator_current_nss_thus_initialise_the_random_number_generator_and_feed_the_seed_to_it.patch
@@ -0,0 +1,91 @@
+# HG changeset patch
+# User andrew
+# Date 1461349033 -3600
+# Fri Apr 22 19:17:13 2016 +0100
+# Node ID dab76de2f91cf1791c03560a3f45aaa69f8351fd
+# Parent 3fa42705acab6d69b6141f47ebba4f85739a338c
+PR2934: SunEC provider throwing KeyException with current NSS
+Summary: Initialise the random number generator and feed the seed to it.
+Updated 2017/07/04 to accomodate 8175110
+
+diff -r 8aed1e903a4c src/share/native/sun/security/ec/ECC_JNI.cpp
+--- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
++++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
+@@ -134,8 +134,17 @@
+ env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
+
+ // Generate the new keypair (using the supplied seed)
++#ifdef SYSTEM_NSS
++ if (RNG_RandomUpdate((unsigned char *) pSeedBuffer, jSeedLength)
++ != SECSuccess) {
++ ThrowException(env, KEY_EXCEPTION);
++ goto cleanup;
++ }
++ if (EC_NewKey(ecparams, &privKey) != SECSuccess) {
++#else
+ if (EC_NewKey(ecparams, &privKey, (unsigned char *) pSeedBuffer,
+ jSeedLength, 0) != SECSuccess) {
++#endif
+ ThrowException(env, KEY_EXCEPTION);
+ goto cleanup;
+ }
+@@ -267,8 +276,18 @@
+ env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
+
+ // Sign the digest (using the supplied seed)
++#ifdef SYSTEM_NSS
++ if (RNG_RandomUpdate((unsigned char *) pSeedBuffer, jSeedLength)
++ != SECSuccess) {
++ ThrowException(env, KEY_EXCEPTION);
++ goto cleanup;
++ }
++ if (ECDSA_SignDigest(&privKey, &signature_item, &digest_item)
++ != SECSuccess) {
++#else
+ if (ECDSA_SignDigest(&privKey, &signature_item, &digest_item,
+ (unsigned char *) pSeedBuffer, jSeedLength, 0, timing) != SECSuccess) {
++#endif
+ ThrowException(env, KEY_EXCEPTION);
+ goto cleanup;
+ }
+@@ -499,6 +518,9 @@
+ if (SECOID_Init() != SECSuccess) {
+ ThrowException(env, INTERNAL_ERROR);
+ }
++ if (RNG_RNGInit() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
+ #endif
+ }
+
+@@ -507,6 +529,7 @@
+ (JNIEnv *env, jclass UNUSED(clazz))
+ {
+ #ifdef SYSTEM_NSS
++ RNG_RNGShutdown();
+ if (SECOID_Shutdown() != SECSuccess) {
+ ThrowException(env, INTERNAL_ERROR);
+ }
+diff -r 8aed1e903a4c src/share/native/sun/security/ec/ecc_impl.h
+--- openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
++++ openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
+@@ -254,8 +254,10 @@
+ This function is no longer required because the random bytes are now
+ supplied by the caller. Force a failure.
+ */
++#ifndef SYSTEM_NSS
+ #define RNG_GenerateGlobalRandomBytes(p,l) SECFailure
+ #endif
++#endif
+ #define CHECK_MPI_OK(func) if (MP_OKAY > (err = func)) goto cleanup
+ #define MP_TO_SEC_ERROR(err)
+
+@@ -267,8 +269,6 @@
+
+ #ifdef SYSTEM_NSS
+ #define EC_DecodeParams(a,b,c) EC_DecodeParams(a,b)
+-#define EC_NewKey(a,b,c,d,e) EC_NewKey(a,b)
+-#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigest(a,b,c)
+ #define ECDSA_VerifyDigest(a,b,c,d) ECDSA_VerifyDigest(a,b,c)
+ #define ECDH_Derive(a,b,c,d,e,f) ECDH_Derive(a,b,c,d,e)
+ #else
diff --git a/pr2934.patch b/pr2934.patch
deleted file mode 100644
index 83385da..0000000
--- a/pr2934.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1461349033 -3600
-# Fri Apr 22 19:17:13 2016 +0100
-# Node ID dab76de2f91cf1791c03560a3f45aaa69f8351fd
-# Parent 3fa42705acab6d69b6141f47ebba4f85739a338c
-PR2934: SunEC provider throwing KeyException with current NSS
-Summary: Initialise the random number generator and feed the seed to it.
-Updated 2017/07/04 to accomodate 8175110
-
-diff -r 8aed1e903a4c src/share/native/sun/security/ec/ECC_JNI.cpp
---- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
-+++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
-@@ -134,8 +134,17 @@
- env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
-
- // Generate the new keypair (using the supplied seed)
-+#ifdef SYSTEM_NSS
-+ if (RNG_RandomUpdate((unsigned char *) pSeedBuffer, jSeedLength)
-+ != SECSuccess) {
-+ ThrowException(env, KEY_EXCEPTION);
-+ goto cleanup;
-+ }
-+ if (EC_NewKey(ecparams, &privKey) != SECSuccess) {
-+#else
- if (EC_NewKey(ecparams, &privKey, (unsigned char *) pSeedBuffer,
- jSeedLength, 0) != SECSuccess) {
-+#endif
- ThrowException(env, KEY_EXCEPTION);
- goto cleanup;
- }
-@@ -267,8 +276,18 @@
- env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
-
- // Sign the digest (using the supplied seed)
-+#ifdef SYSTEM_NSS
-+ if (RNG_RandomUpdate((unsigned char *) pSeedBuffer, jSeedLength)
-+ != SECSuccess) {
-+ ThrowException(env, KEY_EXCEPTION);
-+ goto cleanup;
-+ }
-+ if (ECDSA_SignDigest(&privKey, &signature_item, &digest_item)
-+ != SECSuccess) {
-+#else
- if (ECDSA_SignDigest(&privKey, &signature_item, &digest_item,
- (unsigned char *) pSeedBuffer, jSeedLength, 0, timing) != SECSuccess) {
-+#endif
- ThrowException(env, KEY_EXCEPTION);
- goto cleanup;
- }
-@@ -499,6 +518,9 @@
- if (SECOID_Init() != SECSuccess) {
- ThrowException(env, INTERNAL_ERROR);
- }
-+ if (RNG_RNGInit() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
- #endif
- }
-
-@@ -507,6 +529,7 @@
- (JNIEnv *env, jclass UNUSED(clazz))
- {
- #ifdef SYSTEM_NSS
-+ RNG_RNGShutdown();
- if (SECOID_Shutdown() != SECSuccess) {
- ThrowException(env, INTERNAL_ERROR);
- }
-diff -r 8aed1e903a4c src/share/native/sun/security/ec/ecc_impl.h
---- openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
-+++ openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
-@@ -254,8 +254,10 @@
- This function is no longer required because the random bytes are now
- supplied by the caller. Force a failure.
- */
-+#ifndef SYSTEM_NSS
- #define RNG_GenerateGlobalRandomBytes(p,l) SECFailure
- #endif
-+#endif
- #define CHECK_MPI_OK(func) if (MP_OKAY > (err = func)) goto cleanup
- #define MP_TO_SEC_ERROR(err)
-
-@@ -267,8 +269,6 @@
-
- #ifdef SYSTEM_NSS
- #define EC_DecodeParams(a,b,c) EC_DecodeParams(a,b)
--#define EC_NewKey(a,b,c,d,e) EC_NewKey(a,b)
--#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigest(a,b,c)
- #define ECDSA_VerifyDigest(a,b,c,d) ECDSA_VerifyDigest(a,b,c)
- #define ECDH_Derive(a,b,c,d,e,f) ECDH_Derive(a,b,c,d,e)
- #else
diff --git a/pr2974-rh1337583-add_systemlineendings_option_to_keytool_and_use_line_separator_instead_of_crlf_in_pkcs10.patch b/pr2974-rh1337583-add_systemlineendings_option_to_keytool_and_use_line_separator_instead_of_crlf_in_pkcs10.patch
new file mode 100644
index 0000000..4859ca6
--- /dev/null
+++ b/pr2974-rh1337583-add_systemlineendings_option_to_keytool_and_use_line_separator_instead_of_crlf_in_pkcs10.patch
@@ -0,0 +1,148 @@
+# HG changeset patch
+# User andrew
+# Date 1464316115 -3600
+# Fri May 27 03:28:35 2016 +0100
+# Node ID 794541fbbdc323f7da8a5cee75611f977eee66ee
+# Parent 0be28a33e12dfc9ae1e4be381530643f691d351a
+PR2974: PKCS#10 certificate requests now use CRLF line endings rather than system line endings
+Summary: Add -systemlineendings option to keytool to allow system line endings to be used again.
+
+diff --git a/src/share/classes/sun/security/pkcs10/PKCS10.java b/src/share/classes/sun/security/pkcs10/PKCS10.java
+--- openjdk/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
+@@ -30,6 +30,7 @@
+ import java.io.IOException;
+ import java.math.BigInteger;
+
++import java.security.AccessController;
+ import java.security.cert.CertificateException;
+ import java.security.NoSuchAlgorithmException;
+ import java.security.InvalidKeyException;
+@@ -39,6 +40,7 @@
+
+ import java.util.Base64;
+
++import sun.security.action.GetPropertyAction;
+ import sun.security.util.*;
+ import sun.security.x509.AlgorithmId;
+ import sun.security.x509.X509Key;
+@@ -76,6 +78,14 @@
+ * @author Hemma Prafullchandra
+ */
+ public class PKCS10 {
++
++ private static final byte[] sysLineEndings;
++
++ static {
++ sysLineEndings =
++ AccessController.doPrivileged(new GetPropertyAction("line.separator")).getBytes();
++ }
++
+ /**
+ * Constructs an unsigned PKCS #10 certificate request. Before this
+ * request may be used, it must be encoded and signed. Then it
+@@ -293,13 +303,39 @@
+ */
+ public void print(PrintStream out)
+ throws IOException, SignatureException {
++ print(out, false);
++ }
++
++ /**
++ * Prints an E-Mailable version of the certificate request on the print
++ * stream passed. The format is a common base64 encoded one, supported
++ * by most Certificate Authorities because Netscape web servers have
++ * used this for some time. Some certificate authorities expect some
++ * more information, in particular contact information for the web
++ * server administrator.
++ *
++ * @param out the print stream where the certificate request
++ * will be printed.
++ * @param systemLineEndings true if the request should be terminated
++ * using the system line endings.
++ * @exception IOException when an output operation failed
++ * @exception SignatureException when the certificate request was
++ * not yet signed.
++ */
++ public void print(PrintStream out, boolean systemLineEndings)
++ throws IOException, SignatureException {
++ byte[] lineEndings;
++
+ if (encoded == null)
+ throw new SignatureException("Cert request was not signed");
+
++ if (systemLineEndings)
++ lineEndings = sysLineEndings;
++ else
++ lineEndings = new byte[] {'\r', '\n'}; // CRLF
+
+- byte[] CRLF = new byte[] {'\r', '\n'};
+ out.println("-----BEGIN NEW CERTIFICATE REQUEST-----");
+- out.println(Base64.getMimeEncoder(64, CRLF).encodeToString(encoded));
++ out.println(Base64.getMimeEncoder(64, lineEndings).encodeToString(encoded));
+ out.println("-----END NEW CERTIFICATE REQUEST-----");
+ }
+
+diff --git a/src/share/classes/sun/security/tools/keytool/Main.java b/src/share/classes/sun/security/tools/keytool/Main.java
+--- openjdk/jdk/src/share/classes/sun/security/tools/keytool/Main.java
++++ openjdk/jdk/src/share/classes/sun/security/tools/keytool/Main.java
+@@ -124,6 +124,7 @@
+ private String infilename = null;
+ private String outfilename = null;
+ private String srcksfname = null;
++ private boolean systemLineEndings = false;
+
+ // User-specified providers are added before any command is called.
+ // However, they are not removed before the end of the main() method.
+@@ -186,7 +187,7 @@
+ CERTREQ("Generates.a.certificate.request",
+ ALIAS, SIGALG, FILEOUT, KEYPASS, KEYSTORE, DNAME,
+ STOREPASS, STORETYPE, PROVIDERNAME, PROVIDERCLASS,
+- PROVIDERARG, PROVIDERPATH, V, PROTECTED),
++ PROVIDERARG, PROVIDERPATH, SYSTEMLINEENDINGS, V, PROTECTED),
+ CHANGEALIAS("Changes.an.entry.s.alias",
+ ALIAS, DESTALIAS, KEYPASS, KEYSTORE, STOREPASS,
+ STORETYPE, PROVIDERNAME, PROVIDERCLASS, PROVIDERARG,
+@@ -319,6 +320,7 @@
+ STARTDATE("startdate", "<startdate>", "certificate.validity.start.date.time"),
+ STOREPASS("storepass", "<arg>", "keystore.password"),
+ STORETYPE("storetype", "<storetype>", "keystore.type"),
++ SYSTEMLINEENDINGS("systemlineendings", null, "system.line.endings"),
+ TRUSTCACERTS("trustcacerts", null, "trust.certificates.from.cacerts"),
+ V("v", null, "verbose.output"),
+ VALIDITY("validity", "<valDays>", "validity.number.of.days");
+@@ -559,6 +561,8 @@
+ protectedPath = true;
+ } else if (collator.compare(flags, "-srcprotected") == 0) {
+ srcprotectedPath = true;
++ } else if (collator.compare(flags, "-systemlineendings") == 0) {
++ systemLineEndings = true;
+ } else {
+ System.err.println(rb.getString("Illegal.option.") + flags);
+ tinyHelp();
+@@ -1463,7 +1467,7 @@
+
+ // Sign the request and base-64 encode it
+ request.encodeAndSign(subject, signature);
+- request.print(out);
++ request.print(out, systemLineEndings);
+
+ checkWeak(rb.getString("the.generated.certificate.request"), request);
+ }
+@@ -4540,4 +4544,3 @@
+ return new Pair<>(a,b);
+ }
+ }
+-
+diff --git a/src/share/classes/sun/security/tools/keytool/Resources.java b/src/share/classes/sun/security/tools/keytool/Resources.java
+--- openjdk/jdk/src/share/classes/sun/security/tools/keytool/Resources.java
++++ openjdk/jdk/src/share/classes/sun/security/tools/keytool/Resources.java
+@@ -168,6 +168,8 @@
+ "keystore password"}, //-storepass
+ {"keystore.type",
+ "keystore type"}, //-storetype
++ {"system.line.endings",
++ "use system line endings rather than CRLF to terminate output"}, //-systemlineendings
+ {"trust.certificates.from.cacerts",
+ "trust certificates from cacerts"}, //-trustcacerts
+ {"verbose.output",
diff --git a/pr2974-rh1337583.patch b/pr2974-rh1337583.patch
deleted file mode 100644
index 4859ca6..0000000
--- a/pr2974-rh1337583.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1464316115 -3600
-# Fri May 27 03:28:35 2016 +0100
-# Node ID 794541fbbdc323f7da8a5cee75611f977eee66ee
-# Parent 0be28a33e12dfc9ae1e4be381530643f691d351a
-PR2974: PKCS#10 certificate requests now use CRLF line endings rather than system line endings
-Summary: Add -systemlineendings option to keytool to allow system line endings to be used again.
-
-diff --git a/src/share/classes/sun/security/pkcs10/PKCS10.java b/src/share/classes/sun/security/pkcs10/PKCS10.java
---- openjdk/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
-+++ openjdk/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
-@@ -30,6 +30,7 @@
- import java.io.IOException;
- import java.math.BigInteger;
-
-+import java.security.AccessController;
- import java.security.cert.CertificateException;
- import java.security.NoSuchAlgorithmException;
- import java.security.InvalidKeyException;
-@@ -39,6 +40,7 @@
-
- import java.util.Base64;
-
-+import sun.security.action.GetPropertyAction;
- import sun.security.util.*;
- import sun.security.x509.AlgorithmId;
- import sun.security.x509.X509Key;
-@@ -76,6 +78,14 @@
- * @author Hemma Prafullchandra
- */
- public class PKCS10 {
-+
-+ private static final byte[] sysLineEndings;
-+
-+ static {
-+ sysLineEndings =
-+ AccessController.doPrivileged(new GetPropertyAction("line.separator")).getBytes();
-+ }
-+
- /**
- * Constructs an unsigned PKCS #10 certificate request. Before this
- * request may be used, it must be encoded and signed. Then it
-@@ -293,13 +303,39 @@
- */
- public void print(PrintStream out)
- throws IOException, SignatureException {
-+ print(out, false);
-+ }
-+
-+ /**
-+ * Prints an E-Mailable version of the certificate request on the print
-+ * stream passed. The format is a common base64 encoded one, supported
-+ * by most Certificate Authorities because Netscape web servers have
-+ * used this for some time. Some certificate authorities expect some
-+ * more information, in particular contact information for the web
-+ * server administrator.
-+ *
-+ * @param out the print stream where the certificate request
-+ * will be printed.
-+ * @param systemLineEndings true if the request should be terminated
-+ * using the system line endings.
-+ * @exception IOException when an output operation failed
-+ * @exception SignatureException when the certificate request was
-+ * not yet signed.
-+ */
-+ public void print(PrintStream out, boolean systemLineEndings)
-+ throws IOException, SignatureException {
-+ byte[] lineEndings;
-+
- if (encoded == null)
- throw new SignatureException("Cert request was not signed");
-
-+ if (systemLineEndings)
-+ lineEndings = sysLineEndings;
-+ else
-+ lineEndings = new byte[] {'\r', '\n'}; // CRLF
-
-- byte[] CRLF = new byte[] {'\r', '\n'};
- out.println("-----BEGIN NEW CERTIFICATE REQUEST-----");
-- out.println(Base64.getMimeEncoder(64, CRLF).encodeToString(encoded));
-+ out.println(Base64.getMimeEncoder(64, lineEndings).encodeToString(encoded));
- out.println("-----END NEW CERTIFICATE REQUEST-----");
- }
-
-diff --git a/src/share/classes/sun/security/tools/keytool/Main.java b/src/share/classes/sun/security/tools/keytool/Main.java
---- openjdk/jdk/src/share/classes/sun/security/tools/keytool/Main.java
-+++ openjdk/jdk/src/share/classes/sun/security/tools/keytool/Main.java
-@@ -124,6 +124,7 @@
- private String infilename = null;
- private String outfilename = null;
- private String srcksfname = null;
-+ private boolean systemLineEndings = false;
-
- // User-specified providers are added before any command is called.
- // However, they are not removed before the end of the main() method.
-@@ -186,7 +187,7 @@
- CERTREQ("Generates.a.certificate.request",
- ALIAS, SIGALG, FILEOUT, KEYPASS, KEYSTORE, DNAME,
- STOREPASS, STORETYPE, PROVIDERNAME, PROVIDERCLASS,
-- PROVIDERARG, PROVIDERPATH, V, PROTECTED),
-+ PROVIDERARG, PROVIDERPATH, SYSTEMLINEENDINGS, V, PROTECTED),
- CHANGEALIAS("Changes.an.entry.s.alias",
- ALIAS, DESTALIAS, KEYPASS, KEYSTORE, STOREPASS,
- STORETYPE, PROVIDERNAME, PROVIDERCLASS, PROVIDERARG,
-@@ -319,6 +320,7 @@
- STARTDATE("startdate", "<startdate>", "certificate.validity.start.date.time"),
- STOREPASS("storepass", "<arg>", "keystore.password"),
- STORETYPE("storetype", "<storetype>", "keystore.type"),
-+ SYSTEMLINEENDINGS("systemlineendings", null, "system.line.endings"),
- TRUSTCACERTS("trustcacerts", null, "trust.certificates.from.cacerts"),
- V("v", null, "verbose.output"),
- VALIDITY("validity", "<valDays>", "validity.number.of.days");
-@@ -559,6 +561,8 @@
- protectedPath = true;
- } else if (collator.compare(flags, "-srcprotected") == 0) {
- srcprotectedPath = true;
-+ } else if (collator.compare(flags, "-systemlineendings") == 0) {
-+ systemLineEndings = true;
- } else {
- System.err.println(rb.getString("Illegal.option.") + flags);
- tinyHelp();
-@@ -1463,7 +1467,7 @@
-
- // Sign the request and base-64 encode it
- request.encodeAndSign(subject, signature);
-- request.print(out);
-+ request.print(out, systemLineEndings);
-
- checkWeak(rb.getString("the.generated.certificate.request"), request);
- }
-@@ -4540,4 +4544,3 @@
- return new Pair<>(a,b);
- }
- }
--
-diff --git a/src/share/classes/sun/security/tools/keytool/Resources.java b/src/share/classes/sun/security/tools/keytool/Resources.java
---- openjdk/jdk/src/share/classes/sun/security/tools/keytool/Resources.java
-+++ openjdk/jdk/src/share/classes/sun/security/tools/keytool/Resources.java
-@@ -168,6 +168,8 @@
- "keystore password"}, //-storepass
- {"keystore.type",
- "keystore type"}, //-storetype
-+ {"system.line.endings",
-+ "use system line endings rather than CRLF to terminate output"}, //-systemlineendings
- {"trust.certificates.from.cacerts",
- "trust certificates from cacerts"}, //-trustcacerts
- {"verbose.output",
diff --git a/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch b/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch
new file mode 100644
index 0000000..d44ed1d
--- /dev/null
+++ b/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch
@@ -0,0 +1,152 @@
+# HG changeset patch
+# User andrew
+# Date 1467652889 -3600
+# Mon Jul 04 18:21:29 2016 +0100
+# Node ID a4541d1d8609cadb08d3e31b40b9184ff32dd6c3
+# Parent bc6eab2038c603afb2eb2b4644f3b900c8fd0c46
+PR3083, RH1346460: Regression in SSL debug output without an ECC provider
+Summary: Return null rather than throwing an exception when there's no ECC provider.
+
+diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/Debug.java
+--- openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 17:08:12 2016 +0100
++++ openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 18:21:29 2016 +0100
+@@ -73,6 +73,7 @@
+ System.err.println("certpath PKIX CertPathBuilder and");
+ System.err.println(" CertPathValidator debugging");
+ System.err.println("combiner SubjectDomainCombiner debugging");
++ System.err.println("ecc Elliptic Curve Cryptography debugging");
+ System.err.println("gssloginconfig");
+ System.err.println(" GSS LoginConfigImpl debugging");
+ System.err.println("configfile JAAS ConfigFile loading");
+diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/ECUtil.java
+--- openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 17:08:12 2016 +0100
++++ openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 18:21:29 2016 +0100
+@@ -41,6 +41,9 @@
+
+ public class ECUtil {
+
++ /* Are we debugging ? */
++ private static final Debug debug = Debug.getInstance("ecc");
++
+ // Used by SunPKCS11 and SunJSSE.
+ public static ECPoint decodePoint(byte[] data, EllipticCurve curve)
+ throws IOException {
+@@ -90,6 +93,10 @@
+ }
+
+ private static AlgorithmParameters getECParameters(Provider p) {
++ return getECParameters(p, false);
++ }
++
++ private static AlgorithmParameters getECParameters(Provider p, boolean throwException) {
+ try {
+ if (p != null) {
+ return AlgorithmParameters.getInstance("EC", p);
+@@ -97,13 +104,21 @@
+
+ return AlgorithmParameters.getInstance("EC");
+ } catch (NoSuchAlgorithmException nsae) {
+- throw new RuntimeException(nsae);
++ if (throwException) {
++ throw new RuntimeException(nsae);
++ } else {
++ // ECC provider is optional so just return null
++ if (debug != null) {
++ debug.println("Provider unavailable: " + nsae);
++ }
++ return null;
++ }
+ }
+ }
+
+ public static byte[] encodeECParameterSpec(Provider p,
+ ECParameterSpec spec) {
+- AlgorithmParameters parameters = getECParameters(p);
++ AlgorithmParameters parameters = getECParameters(p, true);
+
+ try {
+ parameters.init(spec);
+@@ -122,11 +137,16 @@
+ public static ECParameterSpec getECParameterSpec(Provider p,
+ ECParameterSpec spec) {
+ AlgorithmParameters parameters = getECParameters(p);
++ if (parameters == null)
++ return null;
+
+ try {
+ parameters.init(spec);
+ return parameters.getParameterSpec(ECParameterSpec.class);
+ } catch (InvalidParameterSpecException ipse) {
++ if (debug != null) {
++ debug.println("Invalid parameter specification: " + ipse);
++ }
+ return null;
+ }
+ }
+@@ -135,34 +155,49 @@
+ byte[] params)
+ throws IOException {
+ AlgorithmParameters parameters = getECParameters(p);
++ if (parameters == null)
++ return null;
+
+ parameters.init(params);
+
+ try {
+ return parameters.getParameterSpec(ECParameterSpec.class);
+ } catch (InvalidParameterSpecException ipse) {
++ if (debug != null) {
++ debug.println("Invalid parameter specification: " + ipse);
++ }
+ return null;
+ }
+ }
+
+ public static ECParameterSpec getECParameterSpec(Provider p, String name) {
+ AlgorithmParameters parameters = getECParameters(p);
++ if (parameters == null)
++ return null;
+
+ try {
+ parameters.init(new ECGenParameterSpec(name));
+ return parameters.getParameterSpec(ECParameterSpec.class);
+ } catch (InvalidParameterSpecException ipse) {
++ if (debug != null) {
++ debug.println("Invalid parameter specification: " + ipse);
++ }
+ return null;
+ }
+ }
+
+ public static ECParameterSpec getECParameterSpec(Provider p, int keySize) {
+ AlgorithmParameters parameters = getECParameters(p);
++ if (parameters == null)
++ return null;
+
+ try {
+ parameters.init(new ECKeySizeParameterSpec(keySize));
+ return parameters.getParameterSpec(ECParameterSpec.class);
+ } catch (InvalidParameterSpecException ipse) {
++ if (debug != null) {
++ debug.println("Invalid parameter specification: " + ipse);
++ }
+ return null;
+ }
+
+@@ -171,11 +206,16 @@
+ public static String getCurveName(Provider p, ECParameterSpec spec) {
+ ECGenParameterSpec nameSpec;
+ AlgorithmParameters parameters = getECParameters(p);
++ if (parameters == null)
++ return null;
+
+ try {
+ parameters.init(spec);
+ nameSpec = parameters.getParameterSpec(ECGenParameterSpec.class);
+ } catch (InvalidParameterSpecException ipse) {
++ if (debug != null) {
++ debug.println("Invalid parameter specification: " + ipse);
++ }
+ return null;
+ }
+
diff --git a/pr3083-rh1346460.patch b/pr3083-rh1346460.patch
deleted file mode 100644
index d44ed1d..0000000
--- a/pr3083-rh1346460.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1467652889 -3600
-# Mon Jul 04 18:21:29 2016 +0100
-# Node ID a4541d1d8609cadb08d3e31b40b9184ff32dd6c3
-# Parent bc6eab2038c603afb2eb2b4644f3b900c8fd0c46
-PR3083, RH1346460: Regression in SSL debug output without an ECC provider
-Summary: Return null rather than throwing an exception when there's no ECC provider.
-
-diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/Debug.java
---- openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 17:08:12 2016 +0100
-+++ openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 18:21:29 2016 +0100
-@@ -73,6 +73,7 @@
- System.err.println("certpath PKIX CertPathBuilder and");
- System.err.println(" CertPathValidator debugging");
- System.err.println("combiner SubjectDomainCombiner debugging");
-+ System.err.println("ecc Elliptic Curve Cryptography debugging");
- System.err.println("gssloginconfig");
- System.err.println(" GSS LoginConfigImpl debugging");
- System.err.println("configfile JAAS ConfigFile loading");
-diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/ECUtil.java
---- openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 17:08:12 2016 +0100
-+++ openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 18:21:29 2016 +0100
-@@ -41,6 +41,9 @@
-
- public class ECUtil {
-
-+ /* Are we debugging ? */
-+ private static final Debug debug = Debug.getInstance("ecc");
-+
- // Used by SunPKCS11 and SunJSSE.
- public static ECPoint decodePoint(byte[] data, EllipticCurve curve)
- throws IOException {
-@@ -90,6 +93,10 @@
- }
-
- private static AlgorithmParameters getECParameters(Provider p) {
-+ return getECParameters(p, false);
-+ }
-+
-+ private static AlgorithmParameters getECParameters(Provider p, boolean throwException) {
- try {
- if (p != null) {
- return AlgorithmParameters.getInstance("EC", p);
-@@ -97,13 +104,21 @@
-
- return AlgorithmParameters.getInstance("EC");
- } catch (NoSuchAlgorithmException nsae) {
-- throw new RuntimeException(nsae);
-+ if (throwException) {
-+ throw new RuntimeException(nsae);
-+ } else {
-+ // ECC provider is optional so just return null
-+ if (debug != null) {
-+ debug.println("Provider unavailable: " + nsae);
-+ }
-+ return null;
-+ }
- }
- }
-
- public static byte[] encodeECParameterSpec(Provider p,
- ECParameterSpec spec) {
-- AlgorithmParameters parameters = getECParameters(p);
-+ AlgorithmParameters parameters = getECParameters(p, true);
-
- try {
- parameters.init(spec);
-@@ -122,11 +137,16 @@
- public static ECParameterSpec getECParameterSpec(Provider p,
- ECParameterSpec spec) {
- AlgorithmParameters parameters = getECParameters(p);
-+ if (parameters == null)
-+ return null;
-
- try {
- parameters.init(spec);
- return parameters.getParameterSpec(ECParameterSpec.class);
- } catch (InvalidParameterSpecException ipse) {
-+ if (debug != null) {
-+ debug.println("Invalid parameter specification: " + ipse);
-+ }
- return null;
- }
- }
-@@ -135,34 +155,49 @@
- byte[] params)
- throws IOException {
- AlgorithmParameters parameters = getECParameters(p);
-+ if (parameters == null)
-+ return null;
-
- parameters.init(params);
-
- try {
- return parameters.getParameterSpec(ECParameterSpec.class);
- } catch (InvalidParameterSpecException ipse) {
-+ if (debug != null) {
-+ debug.println("Invalid parameter specification: " + ipse);
-+ }
- return null;
- }
- }
-
- public static ECParameterSpec getECParameterSpec(Provider p, String name) {
- AlgorithmParameters parameters = getECParameters(p);
-+ if (parameters == null)
-+ return null;
-
- try {
- parameters.init(new ECGenParameterSpec(name));
- return parameters.getParameterSpec(ECParameterSpec.class);
- } catch (InvalidParameterSpecException ipse) {
-+ if (debug != null) {
-+ debug.println("Invalid parameter specification: " + ipse);
-+ }
- return null;
- }
- }
-
- public static ECParameterSpec getECParameterSpec(Provider p, int keySize) {
- AlgorithmParameters parameters = getECParameters(p);
-+ if (parameters == null)
-+ return null;
-
- try {
- parameters.init(new ECKeySizeParameterSpec(keySize));
- return parameters.getParameterSpec(ECParameterSpec.class);
- } catch (InvalidParameterSpecException ipse) {
-+ if (debug != null) {
-+ debug.println("Invalid parameter specification: " + ipse);
-+ }
- return null;
- }
-
-@@ -171,11 +206,16 @@
- public static String getCurveName(Provider p, ECParameterSpec spec) {
- ECGenParameterSpec nameSpec;
- AlgorithmParameters parameters = getECParameters(p);
-+ if (parameters == null)
-+ return null;
-
- try {
- parameters.init(spec);
- nameSpec = parameters.getParameterSpec(ECGenParameterSpec.class);
- } catch (InvalidParameterSpecException ipse) {
-+ if (debug != null) {
-+ debug.println("Invalid parameter specification: " + ipse);
-+ }
- return null;
- }
-
diff --git a/pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch b/pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch
new file mode 100644
index 0000000..5a619b4
--- /dev/null
+++ b/pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch
@@ -0,0 +1,158 @@
+
+# HG changeset patch
+# User andrew
+# Date 1478057514 0
+# Node ID 1c4d5cb2096ae55106111da200b0bcad304f650c
+# Parent 3d53f19b48384e5252f4ec8891f7a3a82d77af2a
+PR3183: Support Fedora/RHEL system crypto policy
+
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/classes/java/security/Security.java
+--- openjdk/jdk/src/share/classes/java/security/Security.java Wed Oct 26 03:51:39 2016 +0100
++++ openjdk/jdk/src/share/classes/java/security/Security.java Wed Nov 02 03:31:54 2016 +0000
+@@ -43,6 +43,9 @@
+ * implementation-specific location, which is typically the properties file
+ * {@code lib/security/java.security} in the Java installation directory.
+ *
++ * <p>Additional default values of security properties are read from a
++ * system-specific location, if available.</p>
++ *
+ * @author Benjamin Renaud
+ */
+
+@@ -52,6 +55,10 @@
+ private static final Debug sdebug =
+ Debug.getInstance("properties");
+
++ /* System property file*/
++ private static final String SYSTEM_PROPERTIES =
++ "/etc/crypto-policies/back-ends/java.config";
++
+ /* The java.security properties */
+ private static Properties props;
+
+@@ -93,6 +100,7 @@
+ if (sdebug != null) {
+ sdebug.println("reading security properties file: " +
+ propFile);
++ sdebug.println(props.toString());
+ }
+ } catch (IOException e) {
+ if (sdebug != null) {
+@@ -114,6 +122,31 @@
+ }
+
+ if ("true".equalsIgnoreCase(props.getProperty
++ ("security.useSystemPropertiesFile"))) {
++
++ // now load the system file, if it exists, so its values
++ // will win if they conflict with the earlier values
++ try (BufferedInputStream bis =
++ new BufferedInputStream(new FileInputStream(SYSTEM_PROPERTIES))) {
++ props.load(bis);
++ loadedProps = true;
++
++ if (sdebug != null) {
++ sdebug.println("reading system security properties file " +
++ SYSTEM_PROPERTIES);
++ sdebug.println(props.toString());
++ }
++ } catch (IOException e) {
++ if (sdebug != null) {
++ sdebug.println
++ ("unable to load security properties from " +
++ SYSTEM_PROPERTIES);
++ e.printStackTrace();
++ }
++ }
++ }
++
++ if ("true".equalsIgnoreCase(props.getProperty
+ ("security.overridePropertiesFile"))) {
+
+ String extraPropFile = System.getProperty
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-aix
+--- openjdk/jdk/src/share/lib/security/java.security-aix Wed Oct 26 03:51:39 2016 +0100
++++ openjdk/jdk/src/share/lib/security/java.security-aix Wed Nov 02 03:31:54 2016 +0000
+@@ -276,6 +276,13 @@
+ security.overridePropertiesFile=true
+
+ #
++# Determines whether this properties file will be appended to
++# using the system properties file stored at
++# /etc/crypto-policies/back-ends/java.config
++#
++security.useSystemPropertiesFile=false
++
++#
+ # Determines the default key and trust manager factory algorithms for
+ # the javax.net.ssl package.
+ #
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-linux
+--- openjdk/jdk/src/share/lib/security/java.security-linux Wed Oct 26 03:51:39 2016 +0100
++++ openjdk/jdk/src/share/lib/security/java.security-linux Wed Nov 02 03:31:54 2016 +0000
+@@ -276,6 +276,13 @@
+ security.overridePropertiesFile=true
+
+ #
++# Determines whether this properties file will be appended to
++# using the system properties file stored at
++# /etc/crypto-policies/back-ends/java.config
++#
++security.useSystemPropertiesFile=true
++
++#
+ # Determines the default key and trust manager factory algorithms for
+ # the javax.net.ssl package.
+ #
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-macosx
+--- openjdk/jdk/src/share/lib/security/java.security-macosx Wed Oct 26 03:51:39 2016 +0100
++++ openjdk/jdk/src/share/lib/security/java.security-macosx Wed Nov 02 03:31:54 2016 +0000
+@@ -279,6 +279,13 @@
+ security.overridePropertiesFile=true
+
+ #
++# Determines whether this properties file will be appended to
++# using the system properties file stored at
++# /etc/crypto-policies/back-ends/java.config
++#
++security.useSystemPropertiesFile=false
++
++#
+ # Determines the default key and trust manager factory algorithms for
+ # the javax.net.ssl package.
+ #
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-solaris
+--- openjdk/jdk/src/share/lib/security/java.security-solaris Wed Oct 26 03:51:39 2016 +0100
++++ openjdk/jdk/src/share/lib/security/java.security-solaris Wed Nov 02 03:31:54 2016 +0000
+@@ -278,6 +278,13 @@
+ security.overridePropertiesFile=true
+
+ #
++# Determines whether this properties file will be appended to
++# using the system properties file stored at
++# /etc/crypto-policies/back-ends/java.config
++#
++security.useSystemPropertiesFile=false
++
++#
+ # Determines the default key and trust manager factory algorithms for
+ # the javax.net.ssl package.
+ #
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-windows
+--- openjdk/jdk/src/share/lib/security/java.security-windows Wed Oct 26 03:51:39 2016 +0100
++++ openjdk/jdk/src/share/lib/security/java.security-windows Wed Nov 02 03:31:54 2016 +0000
+@@ -279,6 +279,13 @@
+ security.overridePropertiesFile=true
+
+ #
++# Determines whether this properties file will be appended to
++# using the system properties file stored at
++# /etc/crypto-policies/back-ends/java.config
++#
++security.useSystemPropertiesFile=false
++
++#
+ # Determines the default key and trust manager factory algorithms for
+ # the javax.net.ssl package.
+ #
+
diff --git a/pr3183-rh1340845-system-crypto-policy.patch b/pr3183-rh1340845-system-crypto-policy.patch
deleted file mode 100644
index 5a619b4..0000000
--- a/pr3183-rh1340845-system-crypto-policy.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-
-# HG changeset patch
-# User andrew
-# Date 1478057514 0
-# Node ID 1c4d5cb2096ae55106111da200b0bcad304f650c
-# Parent 3d53f19b48384e5252f4ec8891f7a3a82d77af2a
-PR3183: Support Fedora/RHEL system crypto policy
-
-diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/classes/java/security/Security.java
---- openjdk/jdk/src/share/classes/java/security/Security.java Wed Oct 26 03:51:39 2016 +0100
-+++ openjdk/jdk/src/share/classes/java/security/Security.java Wed Nov 02 03:31:54 2016 +0000
-@@ -43,6 +43,9 @@
- * implementation-specific location, which is typically the properties file
- * {@code lib/security/java.security} in the Java installation directory.
- *
-+ * <p>Additional default values of security properties are read from a
-+ * system-specific location, if available.</p>
-+ *
- * @author Benjamin Renaud
- */
-
-@@ -52,6 +55,10 @@
- private static final Debug sdebug =
- Debug.getInstance("properties");
-
-+ /* System property file*/
-+ private static final String SYSTEM_PROPERTIES =
-+ "/etc/crypto-policies/back-ends/java.config";
-+
- /* The java.security properties */
- private static Properties props;
-
-@@ -93,6 +100,7 @@
- if (sdebug != null) {
- sdebug.println("reading security properties file: " +
- propFile);
-+ sdebug.println(props.toString());
- }
- } catch (IOException e) {
- if (sdebug != null) {
-@@ -114,6 +122,31 @@
- }
-
- if ("true".equalsIgnoreCase(props.getProperty
-+ ("security.useSystemPropertiesFile"))) {
-+
-+ // now load the system file, if it exists, so its values
-+ // will win if they conflict with the earlier values
-+ try (BufferedInputStream bis =
-+ new BufferedInputStream(new FileInputStream(SYSTEM_PROPERTIES))) {
-+ props.load(bis);
-+ loadedProps = true;
-+
-+ if (sdebug != null) {
-+ sdebug.println("reading system security properties file " +
-+ SYSTEM_PROPERTIES);
-+ sdebug.println(props.toString());
-+ }
-+ } catch (IOException e) {
-+ if (sdebug != null) {
-+ sdebug.println
-+ ("unable to load security properties from " +
-+ SYSTEM_PROPERTIES);
-+ e.printStackTrace();
-+ }
-+ }
-+ }
-+
-+ if ("true".equalsIgnoreCase(props.getProperty
- ("security.overridePropertiesFile"))) {
-
- String extraPropFile = System.getProperty
-diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-aix
---- openjdk/jdk/src/share/lib/security/java.security-aix Wed Oct 26 03:51:39 2016 +0100
-+++ openjdk/jdk/src/share/lib/security/java.security-aix Wed Nov 02 03:31:54 2016 +0000
-@@ -276,6 +276,13 @@
- security.overridePropertiesFile=true
-
- #
-+# Determines whether this properties file will be appended to
-+# using the system properties file stored at
-+# /etc/crypto-policies/back-ends/java.config
-+#
-+security.useSystemPropertiesFile=false
-+
-+#
- # Determines the default key and trust manager factory algorithms for
- # the javax.net.ssl package.
- #
-diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-linux
---- openjdk/jdk/src/share/lib/security/java.security-linux Wed Oct 26 03:51:39 2016 +0100
-+++ openjdk/jdk/src/share/lib/security/java.security-linux Wed Nov 02 03:31:54 2016 +0000
-@@ -276,6 +276,13 @@
- security.overridePropertiesFile=true
-
- #
-+# Determines whether this properties file will be appended to
-+# using the system properties file stored at
-+# /etc/crypto-policies/back-ends/java.config
-+#
-+security.useSystemPropertiesFile=true
-+
-+#
- # Determines the default key and trust manager factory algorithms for
- # the javax.net.ssl package.
- #
-diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-macosx
---- openjdk/jdk/src/share/lib/security/java.security-macosx Wed Oct 26 03:51:39 2016 +0100
-+++ openjdk/jdk/src/share/lib/security/java.security-macosx Wed Nov 02 03:31:54 2016 +0000
-@@ -279,6 +279,13 @@
- security.overridePropertiesFile=true
-
- #
-+# Determines whether this properties file will be appended to
-+# using the system properties file stored at
-+# /etc/crypto-policies/back-ends/java.config
-+#
-+security.useSystemPropertiesFile=false
-+
-+#
- # Determines the default key and trust manager factory algorithms for
- # the javax.net.ssl package.
- #
-diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-solaris
---- openjdk/jdk/src/share/lib/security/java.security-solaris Wed Oct 26 03:51:39 2016 +0100
-+++ openjdk/jdk/src/share/lib/security/java.security-solaris Wed Nov 02 03:31:54 2016 +0000
-@@ -278,6 +278,13 @@
- security.overridePropertiesFile=true
-
- #
-+# Determines whether this properties file will be appended to
-+# using the system properties file stored at
-+# /etc/crypto-policies/back-ends/java.config
-+#
-+security.useSystemPropertiesFile=false
-+
-+#
- # Determines the default key and trust manager factory algorithms for
- # the javax.net.ssl package.
- #
-diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-windows
---- openjdk/jdk/src/share/lib/security/java.security-windows Wed Oct 26 03:51:39 2016 +0100
-+++ openjdk/jdk/src/share/lib/security/java.security-windows Wed Nov 02 03:31:54 2016 +0000
-@@ -279,6 +279,13 @@
- security.overridePropertiesFile=true
-
- #
-+# Determines whether this properties file will be appended to
-+# using the system properties file stored at
-+# /etc/crypto-policies/back-ends/java.config
-+#
-+security.useSystemPropertiesFile=false
-+
-+#
- # Determines the default key and trust manager factory algorithms for
- # the javax.net.ssl package.
- #
-
diff --git a/pr3479-rh1486025-sunec_provider_can_have_multiple_instances_leading_to_premature_nss_shutdown.patch b/pr3479-rh1486025-sunec_provider_can_have_multiple_instances_leading_to_premature_nss_shutdown.patch
new file mode 100644
index 0000000..14c693b
--- /dev/null
+++ b/pr3479-rh1486025-sunec_provider_can_have_multiple_instances_leading_to_premature_nss_shutdown.patch
@@ -0,0 +1,67 @@
+# HG changeset patch
+# User andrew
+# Date 1508194072 -3600
+# Mon Oct 16 23:47:52 2017 +0100
+# Node ID 5dcb55da00c1531264934559c9f10c2e0ae46420
+# Parent bf62c56e3604fee0018b19f65fd56c76dc156630
+PR3479, RH1486025: ECC and NSS JVM crash
+Summary: SunEC provider can have multiple instances, leading to premature NSS shutdown
+Contributed-by: Martin Balao <mbalao(a)redhat.com>
+
+diff --git a/make/mapfiles/libsunec/mapfile-vers b/make/mapfiles/libsunec/mapfile-vers
+--- openjdk/jdk/make/mapfiles/libsunec/mapfile-vers
++++ openjdk/jdk/make/mapfiles/libsunec/mapfile-vers
+@@ -32,7 +32,6 @@
+ Java_sun_security_ec_ECDSASignature_verifySignedDigest;
+ Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
+ Java_sun_security_ec_SunEC_initialize;
+- Java_sun_security_ec_SunEC_cleanup;
+ local:
+ *;
+ };
+diff --git a/src/share/classes/sun/security/ec/SunEC.java b/src/share/classes/sun/security/ec/SunEC.java
+--- openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java
++++ openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java
+@@ -83,21 +83,8 @@
+ }
+
+ /**
+- * Cleanup native resources during finalisation.
+- */
+- @Override
+- protected void finalize() {
+- cleanup();
+- }
+-
+- /**
+ * Initialize the native code.
+ */
+ private static native void initialize();
+
+- /**
+- * Cleanup in the native layer.
+- */
+- private static native void cleanup();
+-
+ }
+diff --git a/src/share/native/sun/security/ec/ECC_JNI.cpp b/src/share/native/sun/security/ec/ECC_JNI.cpp
+--- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
++++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
+@@ -525,14 +525,12 @@
+ }
+
+ JNIEXPORT void
+-JNICALL Java_sun_security_ec_SunEC_cleanup
+- (JNIEnv *env, jclass UNUSED(clazz))
++JNICALL JNI_OnUnload
++ (JavaVM *vm, void *reserved)
+ {
+ #ifdef SYSTEM_NSS
+ RNG_RNGShutdown();
+- if (SECOID_Shutdown() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- }
++ SECOID_Shutdown();
+ #endif
+ }
+
diff --git a/pr3479-rh1486025.patch b/pr3479-rh1486025.patch
deleted file mode 100644
index 14c693b..0000000
--- a/pr3479-rh1486025.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1508194072 -3600
-# Mon Oct 16 23:47:52 2017 +0100
-# Node ID 5dcb55da00c1531264934559c9f10c2e0ae46420
-# Parent bf62c56e3604fee0018b19f65fd56c76dc156630
-PR3479, RH1486025: ECC and NSS JVM crash
-Summary: SunEC provider can have multiple instances, leading to premature NSS shutdown
-Contributed-by: Martin Balao <mbalao(a)redhat.com>
-
-diff --git a/make/mapfiles/libsunec/mapfile-vers b/make/mapfiles/libsunec/mapfile-vers
---- openjdk/jdk/make/mapfiles/libsunec/mapfile-vers
-+++ openjdk/jdk/make/mapfiles/libsunec/mapfile-vers
-@@ -32,7 +32,6 @@
- Java_sun_security_ec_ECDSASignature_verifySignedDigest;
- Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
- Java_sun_security_ec_SunEC_initialize;
-- Java_sun_security_ec_SunEC_cleanup;
- local:
- *;
- };
-diff --git a/src/share/classes/sun/security/ec/SunEC.java b/src/share/classes/sun/security/ec/SunEC.java
---- openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java
-+++ openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java
-@@ -83,21 +83,8 @@
- }
-
- /**
-- * Cleanup native resources during finalisation.
-- */
-- @Override
-- protected void finalize() {
-- cleanup();
-- }
--
-- /**
- * Initialize the native code.
- */
- private static native void initialize();
-
-- /**
-- * Cleanup in the native layer.
-- */
-- private static native void cleanup();
--
- }
-diff --git a/src/share/native/sun/security/ec/ECC_JNI.cpp b/src/share/native/sun/security/ec/ECC_JNI.cpp
---- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
-+++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
-@@ -525,14 +525,12 @@
- }
-
- JNIEXPORT void
--JNICALL Java_sun_security_ec_SunEC_cleanup
-- (JNIEnv *env, jclass UNUSED(clazz))
-+JNICALL JNI_OnUnload
-+ (JavaVM *vm, void *reserved)
- {
- #ifdef SYSTEM_NSS
- RNG_RNGShutdown();
-- if (SECOID_Shutdown() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- }
-+ SECOID_Shutdown();
- #endif
- }
-
diff --git a/pr3519-fix_further_functions_with_a_missing_return_value.patch b/pr3519-fix_further_functions_with_a_missing_return_value.patch
new file mode 100644
index 0000000..51ca7f1
--- /dev/null
+++ b/pr3519-fix_further_functions_with_a_missing_return_value.patch
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User andrew
+# Date 1518669922 0
+# Thu Feb 15 04:45:22 2018 +0000
+# Node ID adaf109718c10888cce5b6e73af7f3e15a7ab0db
+# Parent 3ade0115344b77e6d00462044e0cf68722685bfe
+PR3519: Fix further functions with a missing return value.
+
+diff --git openjdk.orig/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
+--- openjdk.orig/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
++++ openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
+@@ -205,6 +205,7 @@
+ return Address(base, tmp, Address::lsl(addr->scale()));
+ }
+ }
++ return Address();
+ }
+
+ Address LIR_Assembler::as_Address_hi(LIR_Address* addr) {
diff --git a/pr3559-use_ldrexd_for_atomic_reads_on_armv7_zero.patch b/pr3559-use_ldrexd_for_atomic_reads_on_armv7_zero.patch
new file mode 100644
index 0000000..1c322fa
--- /dev/null
+++ b/pr3559-use_ldrexd_for_atomic_reads_on_armv7_zero.patch
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User aph
+# Date 1338206478 14400
+# Mon May 28 08:01:18 2012 -0400
+# Node ID 6275d7b419091092752d5a1854194c98897892ba
+# Parent be1379a186ba527b32c93a83e04c9600735fe44b
+PR3559: Use ldrexd for atomic reads on ARMv7.
+
+2012-05-28 Andrew Haley <aph(a)redhat.com>
+
+ * os_linux_zero.hpp (atomic_copy64): Use ldrexd for atomic reads
+ on ARMv7.
+
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
+@@ -54,6 +54,12 @@
+ "std %0, %1\n"
+ : "=&f"(tmp), "=Q"(*(volatile double*)dst)
+ : "Q"(*(volatile double*)src));
++#elif defined(__ARM_ARCH_7A__)
++ jlong tmp;
++ asm volatile ("ldrexd %0, [%1]\n"
++ : "=r"(tmp)
++ : "r"(src), "m"(src));
++ *(jlong *) dst = tmp;
+ #else
+ *(jlong *) dst = *(jlong *) src;
+ #endif
diff --git a/pr3559.patch b/pr3559.patch
deleted file mode 100644
index 48211dc..0000000
--- a/pr3559.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# HG changeset patch
-# User aph
-# Date 1338206478 14400
-# Mon May 28 08:01:18 2012 -0400
-# Node ID 6275d7b419091092752d5a1854194c98897892ba
-# Parent be1379a186ba527b32c93a83e04c9600735fe44b
-PR3559: Use ldrexd for atomic reads on ARMv7.
-
-2012-05-28 Andrew Haley <aph(a)redhat.com>
-
- * os_linux_zero.hpp (atomic_copy64): Use ldrexd for atomic reads
- on ARMv7.
-
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-@@ -54,6 +54,12 @@
- "std %0, 0(%2)\n"
- : "=r"(tmp)
- : "a"(src), "a"(dst));
-+#elif defined(__ARM_ARCH_7A__)
-+ jlong tmp;
-+ asm volatile ("ldrexd %0, [%1]\n"
-+ : "=r"(tmp)
-+ : "r"(src), "m"(src));
-+ *(jlong *) dst = tmp;
- #else
- *(jlong *) dst = *(jlong *) src;
- #endif
diff --git a/pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch b/pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch
new file mode 100644
index 0000000..ce24c59
--- /dev/null
+++ b/pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch
@@ -0,0 +1,42 @@
+# HG changeset patch
+# User andrew
+# Date 1525111445 -3600
+# Mon Apr 30 19:04:05 2018 +0100
+# Node ID 388fc8da23044317c160678ffa8ff541c216a255
+# Parent 556adf3a76aa81bf3918d7d46554dae7cc1d5c5c
+PR3575: System cacerts database handling should not affect jssecacerts
+
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
++++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
+@@ -162,7 +162,7 @@
+ * Try:
+ * javax.net.ssl.trustStore (if this variable exists, stop)
+ * jssecacerts
+- * cacerts
++ * cacerts (system and local)
+ *
+ * If none exists, we use an empty keystore.
+ */
+@@ -174,14 +174,14 @@
+ storeFile = new File(storeFileName);
+ fis = getFileInputStream(storeFile);
+ } else {
+- /* Check system cacerts DB first; /etc/pki/java/cacerts */
+- storeFile = new File(sep + "etc" + sep + "pki" + sep
+- + "java" + sep + "cacerts");
++ String javaHome = props.get("javaHome");
++ storeFile = new File(javaHome + sep + "lib" + sep
++ + "security" + sep +
++ "jssecacerts");
+ if ((fis = getFileInputStream(storeFile)) == null) {
+- String javaHome = props.get("javaHome");
+- storeFile = new File(javaHome + sep + "lib" + sep
+- + "security" + sep +
+- "jssecacerts");
++ /* Check system cacerts DB first; /etc/pki/java/cacerts */
++ storeFile = new File(sep + "etc" + sep + "pki" + sep
++ + "java" + sep + "cacerts");
+ if ((fis = getFileInputStream(storeFile)) == null) {
+ storeFile = new File(javaHome + sep + "lib" + sep
+ + "security" + sep +
diff --git a/pr3575-rh1567204.patch b/pr3575-rh1567204.patch
deleted file mode 100644
index ce24c59..0000000
--- a/pr3575-rh1567204.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1525111445 -3600
-# Mon Apr 30 19:04:05 2018 +0100
-# Node ID 388fc8da23044317c160678ffa8ff541c216a255
-# Parent 556adf3a76aa81bf3918d7d46554dae7cc1d5c5c
-PR3575: System cacerts database handling should not affect jssecacerts
-
-diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
---- openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
-+++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
-@@ -162,7 +162,7 @@
- * Try:
- * javax.net.ssl.trustStore (if this variable exists, stop)
- * jssecacerts
-- * cacerts
-+ * cacerts (system and local)
- *
- * If none exists, we use an empty keystore.
- */
-@@ -174,14 +174,14 @@
- storeFile = new File(storeFileName);
- fis = getFileInputStream(storeFile);
- } else {
-- /* Check system cacerts DB first; /etc/pki/java/cacerts */
-- storeFile = new File(sep + "etc" + sep + "pki" + sep
-- + "java" + sep + "cacerts");
-+ String javaHome = props.get("javaHome");
-+ storeFile = new File(javaHome + sep + "lib" + sep
-+ + "security" + sep +
-+ "jssecacerts");
- if ((fis = getFileInputStream(storeFile)) == null) {
-- String javaHome = props.get("javaHome");
-- storeFile = new File(javaHome + sep + "lib" + sep
-- + "security" + sep +
-- "jssecacerts");
-+ /* Check system cacerts DB first; /etc/pki/java/cacerts */
-+ storeFile = new File(sep + "etc" + sep + "pki" + sep
-+ + "java" + sep + "cacerts");
- if ((fis = getFileInputStream(storeFile)) == null) {
- storeFile = new File(javaHome + sep + "lib" + sep
- + "security" + sep +
diff --git a/pr3591.patch b/pr3591.patch
deleted file mode 100644
index e287590..0000000
--- a/pr3591.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1526489197 -3600
-# Wed May 16 17:46:37 2018 +0100
-# Node ID 64e87a408afd2b56d59dad73dee28d4b99463810
-# Parent 00ccc73498628a51a45301322e64ce2ad06e49be
-PR3591: Fix for bug 3533 doesn't add -mstackrealign to JDK code
-
-diff --git openjdk.orig///common/autoconf/toolchain.m4 openjdk///common/autoconf/toolchain.m4
---- openjdk.orig///common/autoconf/toolchain.m4
-+++ openjdk///common/autoconf/toolchain.m4
-@@ -794,6 +794,8 @@
- TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([$REALIGN_CFLAG -Werror], [],
- AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.])
- )
-+ CFLAGS_JDK="${CFLAGS_JDK} ${REALIGN_CFLAG}"
-+ CXXFLAGS_JDK="${CXXFLAGS_JDK} ${REALIGN_CFLAG}"
- AC_SUBST([REALIGN_CFLAG])
- fi
-
diff --git a/pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_equals_to_int.patch b/pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_equals_to_int.patch
new file mode 100644
index 0000000..2700f3c
--- /dev/null
+++ b/pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_equals_to_int.patch
@@ -0,0 +1,143 @@
+diff --git openjdk.orig/hotspot/src/share/vm/asm/codeBuffer.cpp openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp
+--- openjdk.orig/hotspot/src/share/vm/asm/codeBuffer.cpp
++++ openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp
+@@ -977,7 +977,7 @@
+ for (int n = (int) CodeBuffer::SECT_FIRST; n < (int) CodeBuffer::SECT_LIMIT; n++) {
+ CodeSection* sect = code_section(n);
+ if (!sect->is_allocated() || sect->is_empty()) continue;
+- xtty->print_cr("<sect index='%d' size='" SIZE_FORMAT "' free='" SIZE_FORMAT "'/>",
++ xtty->print_cr("<sect index='%d' size='" INTX_FORMAT "' free='" INTX_FORMAT "'/>",
+ n, sect->limit() - sect->start(), sect->limit() - sect->end());
+ }
+ xtty->print_cr("</blob>");
+diff --git openjdk.orig/hotspot/src/share/vm/code/codeCache.cpp openjdk/hotspot/src/share/vm/code/codeCache.cpp
+--- openjdk.orig/hotspot/src/share/vm/code/codeCache.cpp
++++ openjdk/hotspot/src/share/vm/code/codeCache.cpp
+@@ -192,7 +192,7 @@
+ }
+ if (PrintCodeCacheExtension) {
+ ResourceMark rm;
+- tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" SSIZE_FORMAT " bytes)",
++ tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" INTX_FORMAT " bytes)",
+ (intptr_t)_heap->low_boundary(), (intptr_t)_heap->high(),
+ (address)_heap->high() - (address)_heap->low_boundary());
+ }
+diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
+@@ -598,7 +598,7 @@
+ " [Table]\n"
+ " [Memory Usage: " G1_STRDEDUP_BYTES_FORMAT_NS "]\n"
+ " [Size: " SIZE_FORMAT ", Min: " SIZE_FORMAT ", Max: " SIZE_FORMAT "]\n"
+- " [Entries: " UINTX_FORMAT ", Load: " G1_STRDEDUP_PERCENT_FORMAT_NS ", Cached: " UINTX_FORMAT ", Added: " UINTX_FORMAT ", Removed: " UINTX_FORMAT "]\n"
++ " [Entries: " UINTX_FORMAT ", Load: " G1_STRDEDUP_PERCENT_FORMAT_NS ", Cached: " SIZE_FORMAT ", Added: " UINTX_FORMAT ", Removed: " UINTX_FORMAT "]\n"
+ " [Resize Count: " UINTX_FORMAT ", Shrink Threshold: " UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS "), Grow Threshold: " UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS ")]\n"
+ " [Rehash Count: " UINTX_FORMAT ", Rehash Threshold: " UINTX_FORMAT ", Hash Seed: 0x%x]\n"
+ " [Age Threshold: " UINTX_FORMAT "]",
+diff --git openjdk.orig/hotspot/src/share/vm/memory/blockOffsetTable.cpp openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp
+--- openjdk.orig/hotspot/src/share/vm/memory/blockOffsetTable.cpp
++++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp
+@@ -57,7 +57,7 @@
+ gclog_or_tty->print_cr("BlockOffsetSharedArray::BlockOffsetSharedArray: ");
+ gclog_or_tty->print_cr(" "
+ " rs.base(): " INTPTR_FORMAT
+- " rs.size(): " INTPTR_FORMAT
++ " rs.size(): " SIZE_FORMAT
+ " rs end(): " INTPTR_FORMAT,
+ p2i(rs.base()), rs.size(), p2i(rs.base() + rs.size()));
+ gclog_or_tty->print_cr(" "
+diff --git openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
+--- openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp
++++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
+@@ -1055,7 +1055,8 @@
+ size_t expected = msp.scale_by_NewRatio_aligned(initial_heap_size);
+ assert(msp.initial_gen0_size() == expected, err_msg("%zu != %zu", msp.initial_gen0_size(), expected));
+ assert(FLAG_IS_ERGO(NewSize) && NewSize == expected,
+- err_msg("NewSize should have been set ergonomically to %zu, but was %zu", expected, NewSize));
++ err_msg("NewSize should have been set ergonomically to " SIZE_FORMAT ", but was " UINTX_FORMAT,
++ expected, NewSize));
+ }
+
+ private:
+diff --git openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+@@ -1291,14 +1291,14 @@
+ }
+ if (PrintGCDetails && Verbose) {
+ // Too early to use gclog_or_tty
+- tty->print_cr("CMS ergo set MaxNewSize: " SIZE_FORMAT, MaxNewSize);
++ tty->print_cr("CMS ergo set MaxNewSize: " UINTX_FORMAT, MaxNewSize);
+ }
+
+ // Code along this path potentially sets NewSize and OldSize
+ if (PrintGCDetails && Verbose) {
+ // Too early to use gclog_or_tty
+- tty->print_cr("CMS set min_heap_size: " SIZE_FORMAT
+- " initial_heap_size: " SIZE_FORMAT
++ tty->print_cr("CMS set min_heap_size: " UINTX_FORMAT
++ " initial_heap_size: " UINTX_FORMAT
+ " max_heap: " SIZE_FORMAT,
+ min_heap_size(), InitialHeapSize, max_heap);
+ }
+@@ -1314,7 +1314,7 @@
+ 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);
++ tty->print_cr("CMS ergo set NewSize: " UINTX_FORMAT, NewSize);
+ }
+ }
+ // Unless explicitly requested otherwise, size old gen
+@@ -1324,7 +1324,7 @@
+ FLAG_SET_ERGO(uintx, OldSize, MIN2((size_t)(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);
++ tty->print_cr("CMS ergo set OldSize: " UINTX_FORMAT, OldSize);
+ }
+ }
+ }
+@@ -2043,7 +2043,7 @@
+
+ if (PrintGCDetails && Verbose) {
+ // Cannot use gclog_or_tty yet.
+- tty->print_cr(" Initial heap size " SIZE_FORMAT, (uintx)reasonable_initial);
++ tty->print_cr(" Initial heap size " SIZE_FORMAT, (size_t)reasonable_initial);
+ }
+ FLAG_SET_ERGO(uintx, InitialHeapSize, (uintx)reasonable_initial);
+ }
+@@ -2053,7 +2053,7 @@
+ set_min_heap_size(MIN2((uintx)reasonable_minimum, InitialHeapSize));
+ if (PrintGCDetails && Verbose) {
+ // Cannot use gclog_or_tty yet.
+- tty->print_cr(" Minimum heap size " SIZE_FORMAT, min_heap_size());
++ tty->print_cr(" Minimum heap size " UINTX_FORMAT, min_heap_size());
+ }
+ }
+ }
+diff --git openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp
++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+@@ -1389,12 +1389,21 @@
+
+ #define INTPTR_FORMAT_W(width) "%" #width PRIxPTR
+
++#if defined(S390) && !defined(_LP64)
++#define SSIZE_FORMAT "%z" PRIdPTR
++#define SIZE_FORMAT "%z" PRIuPTR
++#define SIZE_FORMAT_HEX "0x%z" PRIxPTR
++#define SSIZE_FORMAT_W(width) "%" #width "z" PRIdPTR
++#define SIZE_FORMAT_W(width) "%" #width "z" PRIuPTR
++#define SIZE_FORMAT_HEX_W(width) "0x%" #width "z" PRIxPTR
++#else // !S390
+ #define SSIZE_FORMAT "%" PRIdPTR
+ #define SIZE_FORMAT "%" PRIuPTR
+ #define SIZE_FORMAT_HEX "0x%" PRIxPTR
+ #define SSIZE_FORMAT_W(width) "%" #width PRIdPTR
+ #define SIZE_FORMAT_W(width) "%" #width PRIuPTR
+ #define SIZE_FORMAT_HEX_W(width) "0x%" #width PRIxPTR
++#endif // S390
+
+ #define INTX_FORMAT "%" PRIdPTR
+ #define UINTX_FORMAT "%" PRIuPTR
diff --git a/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch b/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
new file mode 100644
index 0000000..d1e9576
--- /dev/null
+++ b/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
@@ -0,0 +1,38 @@
+# HG changeset patch
+# User andrew
+# Date 1529475043 -3600
+# Wed Jun 20 07:10:43 2018 +0100
+# Node ID f6341f4635dacb56678264d29a88cd052b74036b
+# Parent 30520d5018b509b0ae68f5fcc9a5c540e3e5b2de
+PR3601: Fix additional -Wreturn-type issues introduced by 8061651
+
+diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
+--- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
++++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
+@@ -835,7 +835,7 @@
+ JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname))
+ JVMWrapper("JVM_KnownToNotExist");
+ #if INCLUDE_CDS
+- return ClassLoaderExt::known_to_not_exist(env, loader, classname, CHECK_(false));
++ return ClassLoaderExt::known_to_not_exist(env, loader, classname, THREAD);
+ #else
+ return false;
+ #endif
+@@ -845,7 +845,7 @@
+ JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader))
+ JVMWrapper("JVM_GetResourceLookupCacheURLs");
+ #if INCLUDE_CDS
+- return ClassLoaderExt::get_lookup_cache_urls(env, loader, CHECK_NULL);
++ return ClassLoaderExt::get_lookup_cache_urls(env, loader, THREAD);
+ #else
+ return NULL;
+ #endif
+@@ -855,7 +855,7 @@
+ JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name))
+ JVMWrapper("JVM_GetResourceLookupCache");
+ #if INCLUDE_CDS
+- return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, CHECK_NULL);
++ return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, THREAD);
+ #else
+ return NULL;
+ #endif
diff --git a/pr3601.patch b/pr3601.patch
deleted file mode 100644
index d1e9576..0000000
--- a/pr3601.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1529475043 -3600
-# Wed Jun 20 07:10:43 2018 +0100
-# Node ID f6341f4635dacb56678264d29a88cd052b74036b
-# Parent 30520d5018b509b0ae68f5fcc9a5c540e3e5b2de
-PR3601: Fix additional -Wreturn-type issues introduced by 8061651
-
-diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
---- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
-+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
-@@ -835,7 +835,7 @@
- JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname))
- JVMWrapper("JVM_KnownToNotExist");
- #if INCLUDE_CDS
-- return ClassLoaderExt::known_to_not_exist(env, loader, classname, CHECK_(false));
-+ return ClassLoaderExt::known_to_not_exist(env, loader, classname, THREAD);
- #else
- return false;
- #endif
-@@ -845,7 +845,7 @@
- JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader))
- JVMWrapper("JVM_GetResourceLookupCacheURLs");
- #if INCLUDE_CDS
-- return ClassLoaderExt::get_lookup_cache_urls(env, loader, CHECK_NULL);
-+ return ClassLoaderExt::get_lookup_cache_urls(env, loader, THREAD);
- #else
- return NULL;
- #endif
-@@ -855,7 +855,7 @@
- JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name))
- JVMWrapper("JVM_GetResourceLookupCache");
- #if INCLUDE_CDS
-- return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, CHECK_NULL);
-+ return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, THREAD);
- #else
- return NULL;
- #endif
diff --git a/pr3634-fix_shenandoah_for_size_t_on_s390.patch b/pr3634-fix_shenandoah_for_size_t_on_s390.patch
new file mode 100644
index 0000000..20a4625
--- /dev/null
+++ b/pr3634-fix_shenandoah_for_size_t_on_s390.patch
@@ -0,0 +1,14 @@
+diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp
+@@ -524,8 +524,8 @@
+ region_size = max_heap_size / ShenandoahTargetNumRegions;
+
+ // Now make sure that we don't go over or under our limits.
+- region_size = MAX2(ShenandoahMinRegionSize, region_size);
+- region_size = MIN2(ShenandoahMaxRegionSize, region_size);
++ region_size = MAX2<size_t>(ShenandoahMinRegionSize, region_size);
++ region_size = MIN2<size_t>(ShenandoahMaxRegionSize, region_size);
+
+ } else {
+ if (ShenandoahHeapRegionSize > initial_heap_size / MIN_NUM_REGIONS) {
diff --git a/repackReproduciblePolycies.sh b/repackReproduciblePolycies.sh
index 271cb74..f356bd3 100644
--- a/repackReproduciblePolycies.sh
+++ b/repackReproduciblePolycies.sh
@@ -1,13 +1,17 @@
#!/bin/sh
+set -e
# https://bugzilla.redhat.com/show_bug.cgi?id=1142153
M=META-INF/MANIFEST.MF
-#P=/usr/lib/jvm/java/jre/lib/security
-P=$1/lib/security
+#P=/usr/lib/jvm/java/jre/lib/security/policy
+P=$1/lib/security/policy
+ERRORS=0
+ for type in unlimited limited ; do
for f in local_policy.jar US_export_policy.jar ; do
-ORIG=$P/$f
+ORIG=$P/$type/$f
echo "processing $f ($ORIG)"
if [ ! -f $ORIG ]; then
echo "File not found! $ORIG"
+ let ERRORS=$ERRORS+1
continue
fi
d=`mktemp -d`
@@ -35,3 +39,6 @@ NW=$d/$f
touch -t 201401010000 $ORIG
rm -rfv $d
done
+ done
+
+exit $ERRORS
diff --git a/rh1163501-increase_2048_bit_dh_upper_bound_fedora_infrastructure_in_dhparametergenerator.patch b/rh1163501-increase_2048_bit_dh_upper_bound_fedora_infrastructure_in_dhparametergenerator.patch
new file mode 100644
index 0000000..d9cbac4
--- /dev/null
+++ b/rh1163501-increase_2048_bit_dh_upper_bound_fedora_infrastructure_in_dhparametergenerator.patch
@@ -0,0 +1,66 @@
+diff --git a/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java b/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
+--- openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
++++ openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
+@@ -1,5 +1,6 @@
+ /*
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2014 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
+@@ -61,13 +62,13 @@
+
+ private static void checkKeySize(int keysize)
+ throws InvalidParameterException {
+- boolean supported = ((keysize == 2048) || (keysize == 3072) ||
++ boolean supported = ((keysize == 2048) || (keysize == 3072) || (keysize == 4096) ||
+ ((keysize >= 512) && (keysize <= 1024) && ((keysize & 0x3F) == 0)));
+
+ if (!supported) {
+ throw new InvalidParameterException(
+ "DH key size must be multiple of 64 and range " +
+- "from 512 to 1024 (inclusive), or 2048, 3072. " +
++ "from 512 to 1024 (inclusive), or 2048, 3072, 4096. " +
+ "The specific key size " + keysize + " is not supported");
+ }
+ }
+diff --git a/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java b/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
+--- openjdk/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
++++ openjdk/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
+@@ -1,5 +1,6 @@
+ /*
+ * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2014 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
+@@ -58,7 +59,7 @@
+ */
+ private enum Sizes {
+ two56(256), three84(384), five12(512), seven68(768), ten24(1024),
+- twenty48(2048);
++ twenty48(2048), forty96(4096);
+
+ private final int intSize;
+ private final BigInteger bigIntValue;
+@@ -130,6 +131,19 @@
+ kp = kpg.generateKeyPair();
+ checkKeyPair(kp, Sizes.twenty48, Sizes.five12);
+
++ kpg.initialize(Sizes.forty96.getIntSize());
++ kp = kpg.generateKeyPair();
++ checkKeyPair(kp, Sizes.forty96, Sizes.twenty48);
++
++ publicKey = (DHPublicKey)kp.getPublic();
++ p = publicKey.getParams().getP();
++ g = publicKey.getParams().getG();
++
++ // test w/ all values specified
++ kpg.initialize(new DHParameterSpec(p, g, Sizes.ten24.getIntSize()));
++ kp = kpg.generateKeyPair();
++ checkKeyPair(kp, Sizes.forty96, Sizes.ten24);
++
+ System.out.println("OK");
+ }
+
+
diff --git a/rh1163501.patch b/rh1163501.patch
deleted file mode 100644
index d9cbac4..0000000
--- a/rh1163501.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java b/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
---- openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
-+++ openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
-@@ -1,5 +1,6 @@
- /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2014 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
-@@ -61,13 +62,13 @@
-
- private static void checkKeySize(int keysize)
- throws InvalidParameterException {
-- boolean supported = ((keysize == 2048) || (keysize == 3072) ||
-+ boolean supported = ((keysize == 2048) || (keysize == 3072) || (keysize == 4096) ||
- ((keysize >= 512) && (keysize <= 1024) && ((keysize & 0x3F) == 0)));
-
- if (!supported) {
- throw new InvalidParameterException(
- "DH key size must be multiple of 64 and range " +
-- "from 512 to 1024 (inclusive), or 2048, 3072. " +
-+ "from 512 to 1024 (inclusive), or 2048, 3072, 4096. " +
- "The specific key size " + keysize + " is not supported");
- }
- }
-diff --git a/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java b/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
---- openjdk/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
-+++ openjdk/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
-@@ -1,5 +1,6 @@
- /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2014 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
-@@ -58,7 +59,7 @@
- */
- private enum Sizes {
- two56(256), three84(384), five12(512), seven68(768), ten24(1024),
-- twenty48(2048);
-+ twenty48(2048), forty96(4096);
-
- private final int intSize;
- private final BigInteger bigIntValue;
-@@ -130,6 +131,19 @@
- kp = kpg.generateKeyPair();
- checkKeyPair(kp, Sizes.twenty48, Sizes.five12);
-
-+ kpg.initialize(Sizes.forty96.getIntSize());
-+ kp = kpg.generateKeyPair();
-+ checkKeyPair(kp, Sizes.forty96, Sizes.twenty48);
-+
-+ publicKey = (DHPublicKey)kp.getPublic();
-+ p = publicKey.getParams().getP();
-+ g = publicKey.getParams().getG();
-+
-+ // test w/ all values specified
-+ kpg.initialize(new DHParameterSpec(p, g, Sizes.ten24.getIntSize()));
-+ kp = kpg.generateKeyPair();
-+ checkKeyPair(kp, Sizes.forty96, Sizes.ten24);
-+
- System.out.println("OK");
- }
-
-
diff --git a/rh1176206-jdk.patch b/rh1176206-jdk.patch
deleted file mode 100644
index 23b8e52..0000000
--- a/rh1176206-jdk.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- openjdk/jdk/make/lib/Awt2dLibraries.gmk 2016-02-29 17:11:00.497484904 +0100
-+++ openjdk/jdk/make/lib/Awt2dLibraries.gmk 2016-02-29 17:11:00.402486574 +0100
-@@ -618,7 +618,7 @@
- XRSurfaceData.c \
- XRBackendNative.c
-
-- LIBAWT_XAWT_LDFLAGS_SUFFIX := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc
-+ LIBAWT_XAWT_LDFLAGS_SUFFIX := $(LIBM) -lawt -lXext -lX11 -lXrender -lXcomposite $(LIBDL) -lXtst -lXi -ljava -ljvm -lc
-
- ifeq ($(OPENJDK_TARGET_OS), linux)
- # To match old build, add this to LDFLAGS instead of suffix.
---- openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c 2016-02-29 17:11:00.777479982 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c 2016-02-29 17:11:00.677481740 +0100
-@@ -38,6 +38,7 @@
- #include <X11/extensions/XTest.h>
- #include <X11/extensions/XInput.h>
- #include <X11/extensions/XI.h>
-+#include <X11/extensions/Xcomposite.h>
- #include <jni.h>
- #include <sizecalc.h>
- #include "robot_common.h"
-@@ -88,6 +89,32 @@
- return isXTestAvailable;
- }
-
-+static Bool hasXCompositeOverlayExtension(Display *display) {
-+
-+ int xoverlay = False;
-+ int eventBase, errorBase;
-+ if (XCompositeQueryExtension(display, &eventBase, &errorBase)) {
-+ int major = 0;
-+ int minor = 0;
-+
-+ XCompositeQueryVersion(display, &major, &minor);
-+ if (major > 0 || minor >= 3)
-+ xoverlay = True;
-+ }
-+
-+ return xoverlay;
-+}
-+
-+static jboolean isXCompositeDisplay(Display *display, int screenNumber) {
-+
-+ char NET_WM_CM_Sn[25];
-+ snprintf(NET_WM_CM_Sn, sizeof(NET_WM_CM_Sn), "_NET_WM_CM_S%d\0", screenNumber);
-+
-+ Atom managerSelection = XInternAtom(display, NET_WM_CM_Sn, 0);
-+ Window owner = XGetSelectionOwner(display, managerSelection);
-+
-+ return owner != 0;
-+}
-
- static XImage *getWindowImage(Display * display, Window window,
- int32_t x, int32_t y,
-@@ -232,6 +259,12 @@
- DASSERT(adata != NULL);
-
- rootWindow = XRootWindow(awt_display, adata->awt_visInfo.screen);
-+ if (isXCompositeDisplay(awt_display, adata->awt_visInfo.screen) &&
-+ hasXCompositeOverlayExtension(awt_display))
-+ {
-+ rootWindow = XCompositeGetOverlayWindow(awt_display, rootWindow);
-+ }
-+
- image = getWindowImage(awt_display, rootWindow, x, y, width, height);
-
- /* Array to use to crunch around the pixel values */
diff --git a/rh1176206-root.patch b/rh1176206-root.patch
deleted file mode 100644
index db1061c..0000000
--- a/rh1176206-root.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- openjdk/common/autoconf/help.m4 2016-02-29 17:10:45.542747800 +0100
-+++ openjdk/common/autoconf/help.m4 2016-02-29 17:10:45.500748539 +0100
-@@ -112,7 +112,7 @@
- pulse)
- PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
- x11)
-- PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;;
-+ PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev libXcomposite-dev" ;;
- ccache)
- PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
- esac
---- openjdk/common/autoconf/libraries.m4 2016-02-29 17:10:45.716744742 +0100
-+++ openjdk/common/autoconf/libraries.m4 2016-02-29 17:10:45.675745462 +0100
-@@ -153,7 +153,7 @@
- CFLAGS="$CFLAGS $X_CFLAGS"
-
- # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
-- AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h],
-+ AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h X11/extensions/Xcomposite.h],
- [X11_A_OK=yes],
- [X11_A_OK=no; break],
- [
-@@ -167,7 +167,7 @@
-
- if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then
- HELP_MSG_MISSING_DEPENDENCY([x11])
-- AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG])
-+ AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h Xcomposite.h). $HELP_MSG])
- fi
-
- AC_SUBST(X_CFLAGS)
diff --git a/rh1566890_embargoed20180521.patch b/rh1566890_embargoed20180521.patch
deleted file mode 100644
index e29bdb9..0000000
--- a/rh1566890_embargoed20180521.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-# ssbd2.patch
---- ./openjdk/hotspot/src/os/linux/vm/os_linux.cpp~ 2018-05-02 13:02:51.924489199 -0400
-+++ ./openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2018-05-02 13:04:57.274216581 -0400
-@@ -102,6 +102,8 @@
- # include <inttypes.h>
- # include <sys/ioctl.h>
-
-+#include <sys/prctl.h>
-+
- PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
- #ifndef _GNU_SOURCE
-@@ -4892,6 +4894,31 @@
- }
- }
-
-+/* Per task speculation control */
-+#ifndef PR_GET_SPECULATION_CTRL
-+#define PR_GET_SPECULATION_CTRL 52
-+#endif
-+#ifndef PR_SET_SPECULATION_CTRL
-+#define PR_SET_SPECULATION_CTRL 53
-+#endif
-+/* Speculation control variants */
-+# undef PR_SPEC_STORE_BYPASS
-+# define PR_SPEC_STORE_BYPASS 0
-+/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
-+# undef PR_SPEC_NOT_AFFECTED
-+# undef PR_SPEC_PRCTL
-+# undef PR_SPEC_ENABLE
-+# undef PR_SPEC_DISABLE
-+# define PR_SPEC_NOT_AFFECTED 0
-+# define PR_SPEC_PRCTL (1UL << 0)
-+# define PR_SPEC_ENABLE (1UL << 1)
-+# define PR_SPEC_DISABLE (1UL << 2)
-+
-+static void set_speculation() __attribute__((constructor));
-+static void set_speculation() {
-+ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
-+}
-+
- // this is called _before_ the most of global arguments have been parsed
- void os::init(void) {
- char dummy; /* used to get a guess on initial stack address */
diff --git a/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch b/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch
new file mode 100644
index 0000000..d8f3a5a
--- /dev/null
+++ b/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch
@@ -0,0 +1,44 @@
+diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -103,6 +103,8 @@
+ # include <inttypes.h>
+ # include <sys/ioctl.h>
+
++#include <sys/prctl.h>
++
+ PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
+
+ #ifndef _GNU_SOURCE
+@@ -4997,6 +4999,31 @@
+ }
+ }
+
++/* Per task speculation control */
++#ifndef PR_GET_SPECULATION_CTRL
++#define PR_GET_SPECULATION_CTRL 52
++#endif
++#ifndef PR_SET_SPECULATION_CTRL
++#define PR_SET_SPECULATION_CTRL 53
++#endif
++/* Speculation control variants */
++# undef PR_SPEC_STORE_BYPASS
++# define PR_SPEC_STORE_BYPASS 0
++/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
++# undef PR_SPEC_NOT_AFFECTED
++# undef PR_SPEC_PRCTL
++# undef PR_SPEC_ENABLE
++# undef PR_SPEC_DISABLE
++# define PR_SPEC_NOT_AFFECTED 0
++# define PR_SPEC_PRCTL (1UL << 0)
++# define PR_SPEC_ENABLE (1UL << 1)
++# define PR_SPEC_DISABLE (1UL << 2)
++
++static void set_speculation() __attribute__((constructor));
++static void set_speculation() {
++ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
++}
++
+ // this is called _before_ most of the global arguments have been parsed
+ void os::init(void) {
+ char dummy; /* used to get a guess on initial stack address */
diff --git a/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch b/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
new file mode 100644
index 0000000..bddd702
--- /dev/null
+++ b/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
@@ -0,0 +1,16 @@
+diff -uNr openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java jdk8/jdk/src/share/classes/java/awt/Toolkit.java
+--- openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 11:59:47.000000000 -0500
++++ jdk8/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 12:05:20.000000000 -0500
+@@ -883,7 +883,11 @@
+ return null;
+ }
+ });
+- loadAssistiveTechnologies();
++ try {
++ loadAssistiveTechnologies();
++ } catch ( AWTError error) {
++ // ignore silently
++ }
+ }
+ return toolkit;
+ }
diff --git a/rh1648246-always_instruct_vm_to_assume_multiple_processors_are_available.patch b/rh1648246-always_instruct_vm_to_assume_multiple_processors_are_available.patch
new file mode 100644
index 0000000..b0a874d
--- /dev/null
+++ b/rh1648246-always_instruct_vm_to_assume_multiple_processors_are_available.patch
@@ -0,0 +1,12 @@
+diff --git a/src/share/vm/runtime/globals.hpp b/src/share/vm/runtime/globals.hpp
+--- openjdk/hotspot/src/share/vm/runtime/globals.hpp
++++ openjdk/hotspot/src/share/vm/runtime/globals.hpp
+@@ -530,7 +530,7 @@
+ lp64_product(intx, ObjectAlignmentInBytes, 8, \
+ "Default object alignment in bytes, 8 is minimum") \
+ \
+- product(bool, AssumeMP, false, \
++ product(bool, AssumeMP, true, \
+ "Instruct the VM to assume multiple processors are available") \
+ \
+ /* UseMembar is theoretically a temp flag used for memory barrier \
diff --git a/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch b/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
new file mode 100644
index 0000000..febd87e
--- /dev/null
+++ b/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
@@ -0,0 +1,11 @@
+diff -r 5b86f66575b7 src/share/lib/security/java.security-linux
+--- openjdk/jdk/src/share/lib/security/java.security-linux Tue May 16 13:29:05 2017 -0700
++++ openjdk/jdk/src/share/lib/security/java.security-linux Tue Jun 06 14:05:12 2017 +0200
+@@ -74,6 +74,7 @@
+ security.provider.7=com.sun.security.sasl.Provider
+ security.provider.8=org.jcp.xml.dsig.internal.dom.XMLDSigRI
+ security.provider.9=sun.security.smartcardio.SunPCSC
++#security.provider.10=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/nss.cfg
+
+ #
+ # Sun Provider SecureRandom seed source.
diff --git a/rh1648644-java_access_bridge_privileged_security.patch b/rh1648644-java_access_bridge_privileged_security.patch
new file mode 100644
index 0000000..538468a
--- /dev/null
+++ b/rh1648644-java_access_bridge_privileged_security.patch
@@ -0,0 +1,24 @@
+--- jdk8/jdk/src/share/lib/security/java.security-linux.orig
++++ jdk8/jdk/src/share/lib/security/java.security-linux
+@@ -223,7 +223,9 @@
+ jdk.nashorn.internal.,\
+ jdk.nashorn.tools.,\
+ jdk.xml.internal.,\
+- com.sun.activation.registries.
++ com.sun.activation.registries.,\
++ org.GNOME.Accessibility.,\
++ org.GNOME.Bonobo.
+
+ #
+ # List of comma-separated packages that start with or equal this string
+@@ -273,7 +275,9 @@
+ jdk.nashorn.internal.,\
+ jdk.nashorn.tools.,\
+ jdk.xml.internal.,\
+- com.sun.activation.registries.
++ com.sun.activation.registries.,\
++ org.GNOME.Accessibility.,\
++ org.GNOME.Bonobo.
+
+ #
+ # Determines whether this properties file can be appended to
diff --git a/rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch b/rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch
new file mode 100644
index 0000000..e319492
--- /dev/null
+++ b/rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch
@@ -0,0 +1,16 @@
+diff --git openjdk.orig/jdk/make/lib/Awt2dLibraries.gmk openjdk/jdk/make/lib/Awt2dLibraries.gmk
+--- openjdk.orig/jdk/make/lib/Awt2dLibraries.gmk
++++ openjdk/jdk/make/lib/Awt2dLibraries.gmk
+@@ -891,6 +891,12 @@
+ BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
+ endif
+
++# Turn off strict overflow with GCC for IndicRearrangementProcessor.cpp
++ifeq ($(OPENJDK_TARGET_OS), linux)
++ BUILD_LIBFONTMANAGER_IndicRearrangementProcessor.cpp_CXXFLAGS := -fno-strict-overflow
++ BUILD_LIBFONTMANAGER_IndicRearrangementProcessor2.cpp_CXXFLAGS := -fno-strict-overflow
++endif
++
+ # LDFLAGS clarification:
+ # Filter relevant linker flags disallowing unresolved symbols as we cannot
+ # build-time decide to which library to link against (libawt_headless or
diff --git a/s390-size_t_format_flags.patch b/s390-size_t_format_flags.patch
deleted file mode 100644
index 451c806..0000000
--- a/s390-size_t_format_flags.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -r cf43a852f486 src/share/vm/asm/codeBuffer.cpp
---- openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp Wed Jan 13 05:30:26 2016 +0000
-@@ -977,7 +977,7 @@
- for (int n = (int) CodeBuffer::SECT_FIRST; n < (int) CodeBuffer::SECT_LIMIT; n++) {
- CodeSection* sect = code_section(n);
- if (!sect->is_allocated() || sect->is_empty()) continue;
-- xtty->print_cr("<sect index='%d' size='" SIZE_FORMAT "' free='" SIZE_FORMAT "'/>",
-+ xtty->print_cr("<sect index='%d' size='" INTX_FORMAT "' free='" INTX_FORMAT "'/>",
- n, sect->limit() - sect->start(), sect->limit() - sect->end());
- }
- xtty->print_cr("</blob>");
-diff -r cf43a852f486 src/share/vm/code/codeCache.cpp
---- openjdk/hotspot/src/share/vm/code/codeCache.cpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/code/codeCache.cpp Wed Jan 13 05:30:26 2016 +0000
-@@ -191,7 +191,7 @@
- }
- if (PrintCodeCacheExtension) {
- ResourceMark rm;
-- tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" SSIZE_FORMAT " bytes)",
-+ tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" INTX_FORMAT " bytes)",
- (intptr_t)_heap->low_boundary(), (intptr_t)_heap->high(),
- (address)_heap->high() - (address)_heap->low_boundary());
- }
-diff -r cf43a852f486 src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp Wed Jan 13 05:30:26 2016 +0000
-@@ -556,7 +556,7 @@
- " [Table]\n"
- " [Memory Usage: "G1_STRDEDUP_BYTES_FORMAT_NS"]\n"
- " [Size: "SIZE_FORMAT", Min: "SIZE_FORMAT", Max: "SIZE_FORMAT"]\n"
-- " [Entries: "UINTX_FORMAT", Load: "G1_STRDEDUP_PERCENT_FORMAT_NS", Cached: " UINTX_FORMAT ", Added: "UINTX_FORMAT", Removed: "UINTX_FORMAT"]\n"
-+ " [Entries: "UINTX_FORMAT", Load: "G1_STRDEDUP_PERCENT_FORMAT_NS", Cached: " SIZE_FORMAT ", Added: "UINTX_FORMAT", Removed: "UINTX_FORMAT"]\n"
- " [Resize Count: "UINTX_FORMAT", Shrink Threshold: "UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS"), Grow Threshold: "UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS")]\n"
- " [Rehash Count: "UINTX_FORMAT", Rehash Threshold: "UINTX_FORMAT", Hash Seed: 0x%x]\n"
- " [Age Threshold: "UINTX_FORMAT"]",
-diff -r cf43a852f486 src/share/vm/memory/blockOffsetTable.cpp
---- openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp Wed Jan 13 05:30:26 2016 +0000
-@@ -57,7 +57,7 @@
- gclog_or_tty->print_cr("BlockOffsetSharedArray::BlockOffsetSharedArray: ");
- gclog_or_tty->print_cr(" "
- " rs.base(): " INTPTR_FORMAT
-- " rs.size(): " INTPTR_FORMAT
-+ " rs.size(): " SIZE_FORMAT
- " rs end(): " INTPTR_FORMAT,
- p2i(rs.base()), rs.size(), p2i(rs.base() + rs.size()));
- gclog_or_tty->print_cr(" "
-diff -r cf43a852f486 src/share/vm/runtime/arguments.cpp
---- openjdk/hotspot/src/share/vm/runtime/arguments.cpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp Wed Jan 13 05:30:26 2016 +0000
-@@ -1285,14 +1285,14 @@
- }
- if (PrintGCDetails && Verbose) {
- // Too early to use gclog_or_tty
-- tty->print_cr("CMS ergo set MaxNewSize: " SIZE_FORMAT, MaxNewSize);
-+ tty->print_cr("CMS ergo set MaxNewSize: " UINTX_FORMAT, MaxNewSize);
- }
-
- // Code along this path potentially sets NewSize and OldSize
- if (PrintGCDetails && Verbose) {
- // Too early to use gclog_or_tty
-- tty->print_cr("CMS set min_heap_size: " SIZE_FORMAT
-- " initial_heap_size: " SIZE_FORMAT
-+ tty->print_cr("CMS set min_heap_size: " UINTX_FORMAT
-+ " initial_heap_size: " UINTX_FORMAT
- " max_heap: " SIZE_FORMAT,
- min_heap_size(), InitialHeapSize, max_heap);
- }
-@@ -1308,7 +1308,7 @@
- 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);
-+ tty->print_cr("CMS ergo set NewSize: " UINTX_FORMAT, NewSize);
- }
- }
- // Unless explicitly requested otherwise, size old gen
-@@ -1318,7 +1318,7 @@
- FLAG_SET_ERGO(uintx, OldSize, MIN2((size_t)(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);
-+ tty->print_cr("CMS ergo set OldSize: " UINTX_FORMAT, OldSize);
- }
- }
- }
-@@ -1834,7 +1834,7 @@
-
- if (PrintGCDetails && Verbose) {
- // Cannot use gclog_or_tty yet.
-- tty->print_cr(" Initial heap size " SIZE_FORMAT, (uintx)reasonable_initial);
-+ tty->print_cr(" Initial heap size " SIZE_FORMAT, (size_t)reasonable_initial);
- }
- FLAG_SET_ERGO(uintx, InitialHeapSize, (uintx)reasonable_initial);
- }
-@@ -1844,7 +1844,7 @@
- set_min_heap_size(MIN2((uintx)reasonable_minimum, InitialHeapSize));
- if (PrintGCDetails && Verbose) {
- // Cannot use gclog_or_tty yet.
-- tty->print_cr(" Minimum heap size " SIZE_FORMAT, min_heap_size());
-+ tty->print_cr(" Minimum heap size " UINTX_FORMAT, min_heap_size());
- }
- }
- }
-diff -r cf43a852f486 src/share/vm/utilities/globalDefinitions.hpp
---- openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp Wed Jan 13 05:30:26 2016 +0000
-@@ -1382,12 +1382,21 @@
-
- #define INTPTR_FORMAT_W(width) "%" #width PRIxPTR
-
-+#if defined(S390) && !defined(_LP64)
-+#define SSIZE_FORMAT "%z" PRIdPTR
-+#define SIZE_FORMAT "%z" PRIuPTR
-+#define SIZE_FORMAT_HEX "0x%z" PRIxPTR
-+#define SSIZE_FORMAT_W(width) "%" #width "z" PRIdPTR
-+#define SIZE_FORMAT_W(width) "%" #width "z" PRIuPTR
-+#define SIZE_FORMAT_HEX_W(width) "0x%" #width "z" PRIxPTR
-+#else // !S390
- #define SSIZE_FORMAT "%" PRIdPTR
- #define SIZE_FORMAT "%" PRIuPTR
- #define SIZE_FORMAT_HEX "0x%" PRIxPTR
- #define SSIZE_FORMAT_W(width) "%" #width PRIdPTR
- #define SIZE_FORMAT_W(width) "%" #width PRIuPTR
- #define SIZE_FORMAT_HEX_W(width) "0x%" #width PRIxPTR
-+#endif // S390
-
- #define INTX_FORMAT "%" PRIdPTR
- #define UINTX_FORMAT "%" PRIuPTR
diff --git a/soundFontPatch.patch b/soundFontPatch.patch
deleted file mode 100644
index 2009642..0000000
--- a/soundFontPatch.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-# HG changeset patch
-# User omajid
-# Date 1445973555 14400
-# Node ID 3e006ea10d21a7fcf15725c51f2ab7ededce53ab
-# Parent dfeaf40df80032570558c031f37f6630dc729e3f
-8140620: Find and load default.sf2 as the default soundbank on Linux
-Reviewed-by: serb
-
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java
---- openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java
-@@ -671,6 +671,40 @@
- actions.add(new PrivilegedAction<InputStream>() {
- public InputStream run() {
- if (System.getProperties().getProperty("os.name")
-+ .startsWith("Linux")) {
-+
-+ File[] systemSoundFontsDir = new File[] {
-+ /* Arch, Fedora, Mageia */
-+ new File("/usr/share/soundfonts/"),
-+ new File("/usr/local/share/soundfonts/"),
-+ /* Debian, Gentoo, OpenSUSE, Ubuntu */
-+ new File("/usr/share/sounds/sf2/"),
-+ new File("/usr/local/share/sounds/sf2/"),
-+ };
-+
-+ /*
-+ * Look for a default.sf2
-+ */
-+ for (File systemSoundFontDir : systemSoundFontsDir) {
-+ if (systemSoundFontDir.exists()) {
-+ File defaultSoundFont = new File(systemSoundFontDir, "default.sf2");
-+ if (defaultSoundFont.exists()) {
-+ try {
-+ return new FileInputStream(defaultSoundFont);
-+ } catch (IOException e) {
-+ // continue with lookup
-+ }
-+ }
-+ }
-+ }
-+ }
-+ return null;
-+ }
-+ });
-+
-+ actions.add(new PrivilegedAction<InputStream>() {
-+ public InputStream run() {
-+ if (System.getProperties().getProperty("os.name")
- .startsWith("Windows")) {
- File gm_dls = new File(System.getenv("SystemRoot")
- + "\\system32\\drivers\\gm.dls");
-
-
diff --git a/sources b/sources
index 4f77f62..107fb21 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (aarch32-port-jdk8u-jdk8u191-b12-aarch32-181022.tar.xz) = fa2de38295c71c3eddbfdf41983804dd65419ad94deb362a838cda6ea29fb6e6e6c78addd3b877007c875a1ab8d457b02914d4e0b6d078b1e93f497999b3c543
-SHA512 (systemtap-tapset-3.4.0pre01.tar.xz) = 4446fa20f88bbce53b583484bf06cb2b476c9372beb898dc2b7739eaa5c98b9979fbd72e12474fb344833d831a19366b82216ee03b452411745e6cd3527faa4e
+SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = d2a1e463487982fff24c398d51b4549dbf4bb5da89bb145238313185373164a57ce9a05de352624d196d129f5a6d52518fee9d792205298fa7a663827eb5c230
+SHA512 (aarch32-port-jdk8u-jdk8u201-b09-aarch32-190124.tar.xz) = 4cfb62206d0f66f0c579e5512786b07fd0598f5403dad69d6d07e09fc184681880584f629e09f9ef23b86b12d1b3cb64eaa6bd0095c252a5d505e2c3cb840d99
diff --git a/system-lcms.patch b/system-lcms.patch
deleted file mode 100644
index 6f39b57..0000000
--- a/system-lcms.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
---- openjdk/common/autoconf/libraries.m4 2013-11-14 22:04:38.039440136 -0500
-+++ openjdk/common/autoconf/libraries.m4 2013-11-14 22:05:11.474356424 -0500
-@@ -676,6 +676,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
- #
-
-diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.gmk
---- openjdk/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 22:04:38.040440133 -0500
-+++ openjdk/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 22:05:11.475356411 -0500
-@@ -666,18 +666,35 @@
-
- ##########################################################################################
-
-+LIBLCMS_DIR := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms
-+
-+ifeq ($(USE_EXTERNAL_LCMS), true)
-+ # If we're using an external library, we'll just need the wrapper part.
-+ # By including it explicitely, all other files will be excluded.
-+ BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c
-+ BUILD_LIBLCMS_HEADERS :=
-+else
-+ BUILD_LIBLCMS_INCLUDE_FILES :=
-+ # If we're using the bundled library, we'll need to include it in the
-+ # include path explicitly. Otherwise the system headers will be used.
-+ BUILD_LIBLCMS_HEADERS := -I$(LIBLCMS_DIR)
-+endif
-+
- # TODO: Update awt lib path when awt is converted
- $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
- LIBRARY := lcms, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-- SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
-+ SRC := $(LIBLCMS_DIR), \
-+ INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
- LANG := C, \
- OPTIMIZATION := HIGHEST, \
- CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
- -DCMS_DONT_USE_FAST_FLOOR \
- $(SHARED_LIBRARY_FLAGS) \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
-- -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
-+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
-+ $(BUILD_LIBLCMS_HEADERS) \
-+ $(LCMS_CFLAGS), \
- CFLAGS_solaris := -xc99=no_lib, \
- CFLAGS_windows := -DCMS_IS_WINDOWS_, \
- MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
-@@ -685,10 +702,10 @@
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
- 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_aix := -lm -lawt -ljava -ljvm,\
-+ LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc $(LCMS_LIBS), \
-+ LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm $(LCMS_LIBS), \
-+ LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm $(LCMS_LIBS), \
-+ LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm $(LCMS_LIBS),\
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=lcms.dll" \
-diff -r 3d1c3b0b73a3 src/share/native/sun/java2d/cmm/lcms/LCMS.c
---- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Tue Sep 08 22:31:26 2015 +0300
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Thu Oct 15 05:29:28 2015 +0100
-@@ -30,7 +30,7 @@
- #include "jni_util.h"
- #include "Trace.h"
- #include "Disposer.h"
--#include "lcms2.h"
-+#include <lcms2.h>
- #include "jlong.h"
-
-
diff --git a/system-libjpeg.patch b/system-libjpeg.patch
deleted file mode 100644
index fa01115..0000000
--- a/system-libjpeg.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
---- jdk8/common/autoconf/libraries.m4 2013-10-31 19:24:33.000000000 -0400
-+++ jdk8/common/autoconf/libraries.m4 2013-11-14 21:55:20.249903347 -0500
-@@ -601,12 +601,42 @@
- #
-
- 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])
-- ])
-+ AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg],
-+ [use libjpeg from build system or OpenJDK sources (system, bundled) @<:@bundled@:>@])])
-+
-+ AC_CHECK_LIB(jpeg, jpeg_destroy_compress,
-+ [ LIBJPEG_FOUND=yes ],
-+ [ LIBJPEG_FOUND=no ])
-+
-+ 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
-+
-+ if test "x${with_libjpeg}" = "xbundled"; then
-+ USE_EXTERNAL_LIBJPEG=false
-+ AC_MSG_RESULT([bundled])
-+ elif test "x${with_libjpeg}" = "xsystem"; then
-+ if test "x${LIBJPEG_FOUND}" = "xyes"; then
-+ USE_EXTERNAL_LIBJPEG=true
-+ AC_MSG_RESULT([system])
-+ else
-+ AC_MSG_RESULT([system not found])
-+ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])
-+ fi
-+ else
-+ AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled'])
-+ fi
- AC_SUBST(USE_EXTERNAL_LIBJPEG)
-
-+
- ###############################################################################
- #
- # Check for the gif library
-diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.gmk
---- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-10-31 19:44:18.000000000 -0400
-+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 21:56:01.020796703 -0500
-@@ -696,17 +696,17 @@
- ##########################################################################################
-
- 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_LIBJPEG_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
-
-@@ -721,37 +721,37 @@
- # $(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, \
-+$(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \
-+ LIBRARY := javajpeg, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-- SRC := $(BUILD_LIBJPEG_CLOSED_SRC) \
-+ SRC := $(BUILD_LIBJAVAJPEG_CLOSED_SRC) \
- $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
- LANG := C, \
- OPTIMIZATION := HIGHEST, \
- CFLAGS := $(CFLAGS_JDKLIB) \
-- $(BUILD_LIBJPEG_CLOSED_INCLUDES) \
-+ $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
-- MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \
-- LDFLAGS := $(LDFLAGS_JDKLIB) \
-+ MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
-+ LDFLAGS := $(LDFLAGS_JDKLIB) -ljpeg \
- $(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), \
-- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \
-+ REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
-+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavajpeg, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
--$(BUILD_LIBJPEG): $(BUILD_LIBJAVA)
-+$(BUILD_LIBJAVAJPEG): $(BUILD_LIBJAVA)
-
--BUILD_LIBRARIES += $(BUILD_LIBJPEG)
-+BUILD_LIBRARIES += $(BUILD_LIBJAVAJPEG)
-
- ##########################################################################################
-
-@@ -1183,7 +1183,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
-
-@@ -1194,6 +1193,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/jpeg
-+ endif
-+
- ifneq ($(OPENJDK_TARGET_OS), macosx)
- LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
- else
-@@ -1256,11 +1262,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) \
-diff -ruN jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
---- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2013-10-31 19:44:18.000000000 -0400
-+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2013-11-14 21:55:20.250903340 -0500
-@@ -89,7 +89,7 @@
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction<Void>() {
- public Void run() {
-- System.loadLibrary("jpeg");
-+ System.loadLibrary("javajpeg");
- return null;
- }
- });
-diff -ruN jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
---- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2013-10-31 19:44:18.000000000 -0400
-+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2013-11-14 21:55:20.250903340 -0500
-@@ -179,7 +179,7 @@
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction<Void>() {
- public Void run() {
-- System.loadLibrary("jpeg");
-+ System.loadLibrary("javajpeg");
- return null;
- }
- });
-diff -ruN jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java
---- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2013-10-31 19:44:18.000000000 -0400
-+++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2013-11-14 21:55:20.251903376 -0500
-@@ -56,7 +56,7 @@
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction<Void>() {
- public Void run() {
-- System.loadLibrary("jpeg");
-+ System.loadLibrary("javajpeg");
- return null;
- }
- });
-diff -ruN jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
---- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-10-31 19:44:18.000000000 -0400
-+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-11-14 21:55:20.251903376 -0500
-@@ -25,7 +25,6 @@
-
- #include "splashscreen_impl.h"
-
--#include "jinclude.h"
- #include "jpeglib.h"
- #include "jerror.h"
-
-@@ -107,11 +106,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;
diff --git a/system-libpng.patch b/system-libpng.patch
deleted file mode 100644
index 53661d8..0000000
--- a/system-libpng.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
---- jdk8/common/autoconf/libraries.m4 2013-11-14 20:08:01.845065585 -0500
-+++ jdk8/common/autoconf/libraries.m4 2013-11-14 20:10:56.186553066 -0500
-@@ -676,6 +676,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
- #
-
-diff -ruN jdk8/common/autoconf/spec.gmk.in jdk8/common/autoconf/spec.gmk.in
---- jdk8/common/autoconf/spec.gmk.in 2013-10-31 19:24:33.000000000 -0400
-+++ jdk8/common/autoconf/spec.gmk.in 2013-11-14 21:10:56.365976518 -0500
-@@ -548,6 +548,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@
-diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.gmk
---- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 20:08:01.845065585 -0500
-+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 20:14:10.791982343 -0500
-@@ -1183,7 +1183,6 @@
-
- ifndef BUILD_HEADLESS_ONLY
- LIBSPLASHSCREEN_DIRS := \
-- $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
- $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
-
- ifeq ($(USE_EXTERNAL_LIBGIF), true)
-@@ -1200,6 +1199,13 @@
- LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/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
-@@ -1263,12 +1269,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), \
-+ $(LIBZ) $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(LIBPNG_LDFLAGS), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
-diff -ruN jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
---- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2013-10-31 19:44:18.000000000 -0400
-+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2013-11-14 20:14:41.363892797 -0500
-@@ -25,8 +25,7 @@
-
- #include "splashscreen_impl.h"
-
--#include "../libpng/png.h"
--
-+#include <png.h>
- #include <setjmp.h>
-
- #define SIG_BYTES 8
diff --git a/update_main_sources.sh b/update_main_sources.sh
new file mode 100755
index 0000000..5f78b8d
--- /dev/null
+++ b/update_main_sources.sh
@@ -0,0 +1,95 @@
+#!/bin/bash -x
+# Generates the 'source tarball' for JDK 8 projects and update spec infrastructure
+# By default, this script regenerate source as they are currently used.
+# so if the version of sources change, this file changes and is pushed
+#
+# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
+# PROJECT_NAME=jdk8u OR aarch64-port
+# REPO_NAME=jdk8u60 OR jdk8u60
+# VERSION=jdk8u60-b27 OR aarch64-jdk8u65-b17 OR for head, keyword 'tip' should do the job there
+#
+# If you don't, default are used and so already uploaded tarball regenerated
+# They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set)
+#
+# For other useful variables see generate_source_tarball.sh
+#
+# the used values are then substituted to spec and sources
+
+if [ ! "x$PR2126" = "x" ] ; then
+ if [ ! -f "$PR2126" ] ; then
+ echo "You have specified PR2126 as $PR2126 but it does not exists. exiting"
+ exit 1
+ fi
+fi
+
+set -e
+
+if [ "x$PROJECT_NAME" = "x" ] ; then
+ PROJECT_NAME="aarch64-port"
+fi
+if [ "x$REPO_NAME" = "x" ] ; then
+ REPO_NAME="jdk8u-shenandoah"
+fi
+if [ "x$VERSION" = "x" ] ; then
+ VERSION="aarch64-shenandoah-jdk8u181-b15"
+fi
+
+if [ "x$COMPRESSION" = "x" ] ; then
+# rhel 5 needs tar.gz
+ COMPRESSION=xz
+fi
+if [ "x$FILE_NAME_ROOT" = "x" ] ; then
+ FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
+fi
+if [ "x$PKG" = "x" ] ; then
+ URL=`cat .git/config | grep url`
+ PKG=${URL##*/}
+fi
+if [ "x$SPEC" = "x" ] ; then
+ SPEC=${PKG}.spec
+fi
+if [ "x$RELEASE" = "x" ] ; then
+ RELEASE=1
+fi
+
+FILENAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
+
+if [ ! -f ${FILENAME} ] ; then
+echo "Generating ${FILENAME}"
+. ./generate_source_tarball.sh
+else
+echo "${FILENAME} already exists, using"
+fi
+
+
+echo "Touching spec: $SPEC"
+echo sed -i "s/^%global\s\+project.*/%global project ${PROJECT_NAME}/" $SPEC
+echo sed -i "s/^%global\s\+repo.*/%global repo ${REPO_NAME}/" $SPEC
+echo sed -i "s/^%global\s\+revision.*/%global revision ${VERSION}/" $SPEC
+# updated sources, resetting release
+echo sed -i "s/^Release:.*/Release: $RELEASE.%{buildver}%{?dist}/" $SPEC
+
+echo "New sources"
+cat sources
+a_sources=`cat sources | sed "s/.*(//g" | sed "s/).*//g" | sed "s/.*\s\+//g"`
+echo " you can get inspired by following %changelog template:"
+user_name=`whoami`
+user_record=$(getent passwd $user_name)
+user_gecos_field=$(echo "$user_record" | cut -d ':' -f 5)
+user_full_name=$(echo "$user_gecos_field" | cut -d ',' -f 1)
+spec_date=`date +"%a %b %d %Y"`
+# See spec:
+revision_helper=`echo ${MAIN_VERSION%-*}`
+updatever=`echo ${revision_helper##*u}`
+buildver=`echo ${MAIN_VERSION##*-}`
+echo "* $spec_date $user_full_name <$user_name(a)redhat.com> - 1:1.8.0.$updatever-$RELEASE.$buildver"
+echo "- updated to $MAIN_VERSION (from $PROJECT_NAME/$MAIN_REPO_NAME)"
+echo "- updated to $VERSION (from $PROJECT_NAME/$REPO_NAME) of hotspot"
+echo "- used $FILENAME as new sources"
+echo "- used $FILENAME_SH as new sources for hotspot"
+
+echo " execute:"
+echo "fedpkg/rhpkg new-sources "$a_sources
+echo " to upload sources"
+echo "you can verify by fedpkg/rhpkg prep --arch XXXX on all architectures: x86_64 i386 i586 i686 ppc ppc64 ppc64le s390 s390x aarch64 armv7hl"
+
diff --git a/update_systemtap.sh b/update_systemtap.sh
new file mode 100644
index 0000000..1a3e3c8
--- /dev/null
+++ b/update_systemtap.sh
@@ -0,0 +1,32 @@
+#!/bin/bash -x
+# this file contains defaults for currently generated source tarball of systemtap
+
+set -e
+
+# TAPSET
+export PROJECT_NAME="hg"
+export REPO_NAME="icedtea8"
+export VERSION="9d464368e06d"
+export COMPRESSION=xz
+export OPENJDK_URL=http://icedtea.classpath.org
+export FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
+export TO_COMPRESS="*/tapset"
+# warning, filename and filenameroot creation is duplicated here from generate_source_tarball.sh
+CLONED_FILENAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
+TAPSET_VERSION=3.2
+TAPSET=systemtap_"$TAPSET_VERSION"_tapsets_$CLONED_FILENAME
+if [ ! -f ${TAPSET} ] ; then
+ if [ ! -f ${CLONED_FILENAME} ] ; then
+ echo "Generating ${CLONED_FILENAME}"
+ sh ./generate_singlerepo_source_tarball.sh
+ else
+ echo "exists exists exists exists exists exists exists "
+ echo "reusing reusing reusing reusing reusing reusing "
+ echo ${CLONED_FILENAME}
+ fi
+ mv -v $CLONED_FILENAME $TAPSET
+else
+ echo "exists exists exists exists exists exists exists "
+ echo "reusing reusing reusing reusing reusing reusing "
+ echo ${TAPSET}
+fi
commit abbccaeb6f9143378b89e29d455dfe3f0d1251dd
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 1 03:51:39 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/java-1.8.0-openjdk-aarch32.spec b/java-1.8.0-openjdk-aarch32.spec
index 06969c7..14e81e7 100644
--- a/java-1.8.0-openjdk-aarch32.spec
+++ b/java-1.8.0-openjdk-aarch32.spec
@@ -1016,7 +1016,7 @@ OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release
Name: java-%{javaver}-%{origin}-aarch32
Version: %{javaver}.%{updatever}.%{buildver}
-Release: 1%{?dist}
+Release: 2%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -2377,6 +2377,9 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.8.0.191.181022-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Tue Oct 30 2018 Alex Kashchenko <akashche(a)redhat.com> - 1:1.8.0.191-1.181022
- update sources to 8u191
- sync with mainline package
commit 3c39e42f1661d553f9147ff12e53c0419c6e5a88
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Jan 28 20:17:49 2019 +0100
Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
diff --git a/java-1.8.0-openjdk-aarch32.spec b/java-1.8.0-openjdk-aarch32.spec
index cd02842..06969c7 100644
--- a/java-1.8.0-openjdk-aarch32.spec
+++ b/java-1.8.0-openjdk-aarch32.spec
@@ -1029,7 +1029,6 @@ Release: 1%{?dist}
Epoch: 1
Summary: OpenJDK Runtime Environment in a preview of the OpenJDK AArch32 project
-Group: Development/Languages
# HotSpot code is licensed under GPLv2
# JDK library code is licensed under GPLv2 with the Classpath exception
@@ -1349,7 +1348,6 @@ The OpenJDK runtime environment.
%if %{include_debug_build}
%package slowdebug
Summary: %{origin_nice} Runtime Environment %{majorver} %{debug_on}
-Group: Development/Languages
%{java_rpo -- %{debug_suffix_unquoted}}
%description slowdebug
@@ -1360,7 +1358,6 @@ The %{origin_nice} runtime environment %{majorver}.
%if %{include_normal_build}
%package headless
Summary: %{origin_nice} Headless Runtime Environment %{majorver}
-Group: Development/Languages
%{java_headless_rpo %{nil}}
@@ -1371,7 +1368,6 @@ The %{origin_nice} runtime environment %{majorver} without audio and video suppo
%if %{include_debug_build}
%package headless-slowdebug
Summary: %{origin_nice} Runtime Environment %{majorver} %{debug_on}
-Group: Development/Languages
%{java_headless_rpo -- %{debug_suffix_unquoted}}
@@ -1383,7 +1379,6 @@ The %{origin_nice} runtime environment %{majorver} without audio and video suppo
%if %{include_normal_build}
%package devel
Summary: %{origin_nice} Development Environment %{majorver}
-Group: Development/Tools
%{java_devel_rpo %{nil}}
@@ -1394,7 +1389,6 @@ The %{origin_nice} development tools %{majorver}.
%if %{include_debug_build}
%package devel-slowdebug
Summary: %{origin_nice} Development Environment %{majorver} %{debug_on}
-Group: Development/Tools
%{java_devel_rpo -- %{debug_suffix_unquoted}}
@@ -1406,7 +1400,6 @@ The %{origin_nice} development tools %{majorver}.
%if %{include_normal_build}
%package demo
Summary: %{origin_nice} Demos %{majorver}
-Group: Development/Languages
%{java_demo_rpo %{nil}}
@@ -1417,7 +1410,6 @@ The %{origin_nice} demos %{majorver}.
%if %{include_debug_build}
%package demo-slowdebug
Summary: %{origin_nice} Demos %{majorver} %{debug_on}
-Group: Development/Languages
%{java_demo_rpo -- %{debug_suffix_unquoted}}
@@ -1429,7 +1421,6 @@ The %{origin_nice} demos %{majorver}.
%if %{include_normal_build}
%package src
Summary: %{origin_nice} Source Bundle %{majorver}
-Group: Development/Languages
%{java_src_rpo %{nil}}
@@ -1441,7 +1432,6 @@ class library source code for use by IDE indexers and debuggers.
%if %{include_debug_build}
%package src-slowdebug
Summary: %{origin_nice} Source Bundle %{majorver} %{for_debug}
-Group: Development/Languages
%{java_src_rpo -- %{debug_suffix_unquoted}}
@@ -1453,7 +1443,6 @@ The java-%{origin}-src-slowdebug sub-package contains the complete %{origin_nice
%if %{include_normal_build}
%package javadoc
Summary: %{origin_nice} %{majorver} API documentation
-Group: Documentation
Requires: javapackages-filesystem
BuildArch: noarch
@@ -1466,7 +1455,6 @@ The %{origin_nice} %{majorver} API documentation.
%if %{include_normal_build}
%package javadoc-zip
Summary: %{origin_nice} %{majorver} API documentation compressed in single archive
-Group: Documentation
Requires: javapackages-filesystem
BuildArch: noarch
@@ -1479,7 +1467,6 @@ The %{origin_nice} %{majorver} API documentation compressed in single archive.
%if %{include_debug_build}
%package javadoc-slowdebug
Summary: %{origin_nice} %{majorver} API documentation %{for_debug}
-Group: Documentation
Requires: javapackages-filesystem
BuildArch: noarch
@@ -1492,7 +1479,6 @@ The %{origin_nice} %{majorver} API documentation %{for_debug}.
%if %{include_debug_build}
%package javadoc-zip-slowdebug
Summary: %{origin_nice} %{majorver} API documentation compressed in single archive %{for_debug}
-Group: Documentation
Requires: javapackages-filesystem
BuildArch: noarch
5 years, 3 months
Architecture specific change in rpms/java-1.8.0-openjdk-aarch32.git
by githook-noreply@fedoraproject.org
The package rpms/java-1.8.0-openjdk-aarch32.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-1.8.0-openjdk-aarch32.git/co....
Change:
+%ifarch %{ix86}
Thanks.
Full change:
============
commit af80df107c065146ddfaa568284d2398dcc7d215
Author: Alex Kashchenko <akashche(a)redhat.com>
Date: Thu Feb 14 17:05:27 2019 -0500
8u201 update
diff --git a/.gitignore b/.gitignore
index f0901ad..f2590e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@
/aarch32-port-jdk8u-jdk8u171-b11-aarch32-180511.tar.xz
/aarch32-port-jdk8u-jdk8u181-b13-aarch32-180802.tar.xz
/aarch32-port-jdk8u-jdk8u191-b12-aarch32-181022.tar.xz
+/aarch32-port-jdk8u-jdk8u201-b09-aarch32-190124.tar.xz
+/systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
diff --git a/6260348-pr3066.patch b/6260348-pr3066.patch
deleted file mode 100644
index 06be502..0000000
--- a/6260348-pr3066.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-# HG changeset patch
-# User ssadetsky
-# Date 1467220169 -3600
-# Wed Jun 29 18:09:29 2016 +0100
-# Node ID 9fffaa63c49d93bff70b96af9a86b7635bce44be
-# Parent d0462c26152fc8bd5f79db7f1670777e807ef2b3
-6260348, PR3066: GTK+ L&F JTextComponent not respecting desktop caret blink rate
-Reviewed-by: alexsch, azvegint
-
-diff -r d0462c26152f -r 9fffaa63c49d src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java
---- openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java Tue Jun 28 19:44:50 2016 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java Wed Jun 29 18:09:29 2016 +0100
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2005, 2015, 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
-@@ -93,7 +93,9 @@
- */
- static enum Settings {
- GTK_FONT_NAME,
-- GTK_ICON_SIZES
-+ GTK_ICON_SIZES,
-+ GTK_CURSOR_BLINK,
-+ GTK_CURSOR_BLINK_TIME
- }
-
- /* Custom regions are needed for representing regions that don't exist
-diff -r d0462c26152f -r 9fffaa63c49d src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
---- openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Tue Jun 28 19:44:50 2016 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Wed Jun 29 18:09:29 2016 +0100
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2002, 2015, 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
-@@ -371,7 +371,17 @@
- int vProgWidth = 22 - (progXThickness * 2);
- int vProgHeight = 80 - (progYThickness * 2);
-
-- Integer caretBlinkRate = Integer.valueOf(500);
-+ Integer caretBlinkRate;
-+ if (Boolean.FALSE.equals(GTKEngine.INSTANCE.getSetting(
-+ GTKEngine.Settings.GTK_CURSOR_BLINK))) {
-+ caretBlinkRate = Integer.valueOf(0);
-+ } else {
-+ caretBlinkRate = (Integer) GTKEngine.INSTANCE.getSetting(
-+ GTKEngine.Settings.GTK_CURSOR_BLINK_TIME);
-+ if (caretBlinkRate == null) {
-+ caretBlinkRate = Integer.valueOf(500);
-+ }
-+ }
- Insets zeroInsets = new InsetsUIResource(0, 0, 0, 0);
-
- Double defaultCaretAspectRatio = new Double(0.025);
-diff -r d0462c26152f -r 9fffaa63c49d src/solaris/native/sun/awt/gtk2_interface.c
---- openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.c Tue Jun 28 19:44:50 2016 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.c Wed Jun 29 18:09:29 2016 +0100
-@@ -1316,9 +1316,6 @@
- {
- result = gtk2_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE] =
- (*fp_gtk_entry_new)();
--
-- GtkSettings* settings = fp_gtk_widget_get_settings(result);
-- fp_g_object_set(settings, "gtk-cursor-blink", FALSE, NULL);
- }
- result = gtk2_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE];
- break;
-@@ -1363,10 +1360,6 @@
- {
- gtk2_widgets[_GTK_ENTRY_TYPE] =
- (*fp_gtk_entry_new)();
--
-- GtkSettings* settings =
-- fp_gtk_widget_get_settings(gtk2_widgets[_GTK_ENTRY_TYPE]);
-- fp_g_object_set(settings, "gtk-cursor-blink", FALSE, NULL);
- }
- result = gtk2_widgets[_GTK_ENTRY_TYPE];
- break;
-@@ -1558,9 +1551,6 @@
- {
- result = gtk2_widgets[_GTK_SPIN_BUTTON_TYPE] =
- (*fp_gtk_spin_button_new)(NULL, 0, 0);
--
-- GtkSettings* settings = fp_gtk_widget_get_settings(result);
-- fp_g_object_set(settings, "gtk-cursor-blink", FALSE, NULL);
- }
- result = gtk2_widgets[_GTK_SPIN_BUTTON_TYPE];
- break;
-@@ -2510,14 +2500,20 @@
-
- return result;
- }
--/*
-+
- jobject get_integer_property(JNIEnv *env, GtkSettings* settings, const gchar* key)
- {
-- gint intval = NULL;
--
-+ gint intval = NULL;
- (*fp_g_object_get)(settings, key, &intval, NULL);
- return create_Integer(env, intval);
--}*/
-+}
-+
-+jobject get_boolean_property(JNIEnv *env, GtkSettings* settings, const gchar* key)
-+{
-+ gint intval = NULL;
-+ (*fp_g_object_get)(settings, key, &intval, NULL);
-+ return create_Boolean(env, intval);
-+}
-
- jobject gtk2_get_setting(JNIEnv *env, Setting property)
- {
-@@ -2529,6 +2525,10 @@
- return get_string_property(env, settings, "gtk-font-name");
- case GTK_ICON_SIZES:
- return get_string_property(env, settings, "gtk-icon-sizes");
-+ case GTK_CURSOR_BLINK:
-+ return get_boolean_property(env, settings, "gtk-cursor-blink");
-+ case GTK_CURSOR_BLINK_TIME:
-+ return get_integer_property(env, settings, "gtk-cursor-blink-time");
- }
-
- return NULL;
-diff -r d0462c26152f -r 9fffaa63c49d src/solaris/native/sun/awt/gtk2_interface.h
---- openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.h Tue Jun 28 19:44:50 2016 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.h Wed Jun 29 18:09:29 2016 +0100
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2005, 2015, 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
-@@ -140,7 +140,9 @@
- typedef enum _Setting
- {
- GTK_FONT_NAME,
-- GTK_ICON_SIZES
-+ GTK_ICON_SIZES,
-+ GTK_CURSOR_BLINK,
-+ GTK_CURSOR_BLINK_TIME
- } Setting;
-
- /* GTK types, here to eliminate need for GTK headers at compile time */
diff --git a/8031668-pr2842-01.patch b/8031668-pr2842-01.patch
deleted file mode 100644
index faaa309..0000000
--- a/8031668-pr2842-01.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# HG changeset patch
-# User mduigou
-# Date 1389723922 28800
-# Tue Jan 14 10:25:22 2014 -0800
-# Node ID 842cc183c9f6d29270ff002238248978c08f0a66
-# Parent f0635543beb309c4da1bb88c906a76ee4b75e16d
-8031668, PR2842: TOOLCHAIN_FIND_COMPILER unexpectedly resolves symbolic links
-Reviewed-by: erikj, ihse
-
-diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
---- openjdk///common/autoconf/toolchain.m4
-+++ openjdk///common/autoconf/toolchain.m4
-@@ -230,8 +230,8 @@
- $1="$PROPER_COMPILER_$1"
- else
- AC_MSG_RESULT([no, keeping $1])
-- $1="$TEST_COMPILER"
- fi
-+
- TOOLCHAIN_EXTRACT_COMPILER_VERSION([$1], [$COMPILER_NAME])
- ])
-
diff --git a/8036003-add-with-native-debug-symbols-configure-flag.patch b/8036003-add-with-native-debug-symbols-configure-flag.patch
deleted file mode 100644
index b7b8a05..0000000
--- a/8036003-add-with-native-debug-symbols-configure-flag.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-
-# HG changeset patch
-# User sgehwolf
-# Date 1531824954 -7200
-# Node ID 19e8754f5415cdda79904b9f21a4b8981505cb78
-# Parent 1380ce862bbd0b65c619bfcea454d612b240e332
-8036003: Add --with-native-debug-symbols=[none|internal|external|zipped]
-Reviewed-by: erikj
-
-diff -r 1380ce862bbd -r 19e8754f5415 common/autoconf/jdk-options.m4
---- openjdk/common/autoconf/jdk-options.m4 Mon Jul 16 15:37:08 2018 +0100
-+++ openjdk/common/autoconf/jdk-options.m4 Tue Jul 17 12:55:54 2018 +0200
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2011, 2018, 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
-@@ -606,11 +606,88 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
-
- if test "x${enable_zip_debug_info}" = "xno"; then
- ZIP_DEBUGINFO_FILES=false
-+ elif test "x${enable_zip_debug_info}" = "xyes"; then
-+ ZIP_DEBUGINFO_FILES=true
-+ fi
-+
-+ #
-+ # NATIVE_DEBUG_SYMBOLS
-+ # This must be done after the toolchain is setup, since we're looking at objcopy.
-+ # In addition, this must be done after ENABLE_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES
-+ # checking in order to preserve backwards compatibility post JDK-8207234.
-+ #
-+ AC_MSG_CHECKING([what type of native debug symbols to use (this will override previous settings)])
-+ AC_ARG_WITH([native-debug-symbols],
-+ [AS_HELP_STRING([--with-native-debug-symbols],
-+ [set the native debug symbol configuration (none, internal, external, zipped) @<:@varying@:>@])],
-+ [
-+ if test "x$OPENJDK_TARGET_OS" = xaix; then
-+ if test "x$with_native_debug_symbols" = xexternal || test "x$with_native_debug_symbols" = xzipped; then
-+ AC_MSG_ERROR([AIX only supports the parameters 'none' and 'internal' for --with-native-debug-symbols])
-+ fi
-+ fi
-+ ],
-+ [
-+ # Default to unset for backwards compatibility
-+ with_native_debug_symbols=""
-+ ])
-+ NATIVE_DEBUG_SYMBOLS=$with_native_debug_symbols
-+ if test "x$NATIVE_DEBUG_SYMBOLS" = x; then
-+ AC_MSG_RESULT([not specified])
- else
-+ AC_MSG_RESULT([$NATIVE_DEBUG_SYMBOLS])
-+ fi
-+ # Default is empty
-+ DEBUG_BINARIES=
-+ # Default is min_strip. Possible values are min_strip, all_strip, no_strip
-+ STRIP_POLICY=min_strip
-+
-+ if test "x$NATIVE_DEBUG_SYMBOLS" = xzipped; then
-+
-+ if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
-+ if test "x$OBJCOPY" = x; then
-+ # enabling of enable-debug-symbols and can't find objcopy
-+ # this is an error
-+ AC_MSG_ERROR([Unable to find objcopy, cannot enable native debug symbols])
-+ fi
-+ fi
-+
-+ ENABLE_DEBUG_SYMBOLS=true
-+ STRIP_POLICY=min_strip
- ZIP_DEBUGINFO_FILES=true
-+ elif test "x$NATIVE_DEBUG_SYMBOLS" = xnone; then
-+ ENABLE_DEBUG_SYMBOLS=false
-+ STRIP_POLICY=min_strip
-+ ZIP_DEBUGINFO_FILES=false
-+ elif test "x$NATIVE_DEBUG_SYMBOLS" = xinternal; then
-+ ENABLE_DEBUG_SYMBOLS=true
-+ STRIP_POLICY=no_strip
-+ ZIP_DEBUGINFO_FILES=false
-+ POST_STRIP_CMD=
-+ DEBUG_BINARIES=true
-+ elif test "x$NATIVE_DEBUG_SYMBOLS" = xexternal; then
-+
-+ if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
-+ if test "x$OBJCOPY" = x; then
-+ # enabling of enable-debug-symbols and can't find objcopy
-+ # this is an error
-+ AC_MSG_ERROR([Unable to find objcopy, cannot enable native debug symbols])
-+ fi
-+ fi
-+
-+ ENABLE_DEBUG_SYMBOLS=true
-+ STRIP_POLICY=min_strip
-+ ZIP_DEBUGINFO_FILES=false
-+ elif test "x$NATIVE_DEBUG_SYMBOLS" != x; then
-+ AC_MSG_ERROR([Allowed native debug symbols are: none, internal, external, zipped])
-+ else
-+ AC_MSG_NOTICE([--with-native-debug-symbols not specified. Using values from --disable-debug-symbols and --disable-zip-debug-info])
- fi
-
- AC_SUBST(ENABLE_DEBUG_SYMBOLS)
-+ AC_SUBST(STRIP_POLICY)
-+ AC_SUBST(POST_STRIP_CMD)
-+ AC_SUBST(DEBUG_BINARIES)
- AC_SUBST(ZIP_DEBUGINFO_FILES)
- AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
- AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
-diff -r 1380ce862bbd -r 19e8754f5415 common/autoconf/spec.gmk.in
---- openjdk/common/autoconf/spec.gmk.in Mon Jul 16 15:37:08 2018 +0100
-+++ openjdk/common/autoconf/spec.gmk.in Tue Jul 17 12:55:54 2018 +0200
-@@ -416,6 +416,8 @@
- CFLAGS_DEBUG_SYMBOLS:=@CFLAGS_DEBUG_SYMBOLS@
- CXXFLAGS_DEBUG_SYMBOLS:=@CXXFLAGS_DEBUG_SYMBOLS@
- ZIP_DEBUGINFO_FILES:=@ZIP_DEBUGINFO_FILES@
-+STRIP_POLICY:=@STRIP_POLICY@
-+DEBUG_BINARIES:=@DEBUG_BINARIES@
-
- #
- # Compress (or not) jars
-diff -r 1380ce862bbd -r 19e8754f5415 make/common/NativeCompilation.gmk
---- openjdk/make/common/NativeCompilation.gmk Mon Jul 16 15:37:08 2018 +0100
-+++ openjdk/make/common/NativeCompilation.gmk Tue Jul 17 12:55:54 2018 +0200
-@@ -260,6 +260,10 @@
- $1_CC:=$(CC)
- endif
-
-+ ifeq ($$($1_STRIP_POLICY),)
-+ $1_STRIP_POLICY:=$$(STRIP_POLICY)
-+ endif
-+
- # Make sure the dirs exist.
- $$(eval $$(call MakeDir,$$($1_OBJECT_DIR) $$($1_OUTPUT_DIR)))
- $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d)))
-@@ -455,28 +459,34 @@
- ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X
- ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows
- ifeq ($(OPENJDK_TARGET_OS), solaris)
-- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-- # empty section headers until a fixed $(OBJCOPY) is available.
-- # An empty section header has sh_addr == 0 and sh_size == 0.
-- # This problem has only been seen on Solaris X64, but we call this tool
-- # on all Solaris builds just in case.
-- #
-- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-+ # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-+ # empty section headers until a fixed $(OBJCOPY) is available.
-+ # An empty section header has sh_addr == 0 and sh_size == 0.
-+ # This problem has only been seen on Solaris X64, but we call this tool
-+ # on all Solaris builds just in case.
-+ #
-+ # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-+ # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-+ $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
- $(RM) $$@
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
- $(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
-+ endif
- else # not solaris
-- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
- $(RM) $$@
- $(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
-+ endif
- endif # Touch to not retrigger rule on rebuild
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
- $(TOUCH) $$@
-+ endif
- endif # !windows
- endif # !macosx
-
-@@ -500,7 +510,9 @@
- $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \
- $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb
- else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
-- $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
-+ endif
- endif
- endif
- endif
-@@ -539,28 +551,34 @@
- ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X
- ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows
- ifeq ($(OPENJDK_TARGET_OS), solaris)
-- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-- # empty section headers until a fixed $(OBJCOPY) is available.
-- # An empty section header has sh_addr == 0 and sh_size == 0.
-- # This problem has only been seen on Solaris X64, but we call this tool
-- # on all Solaris builds just in case.
-- #
-- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-+ # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-+ # empty section headers until a fixed $(OBJCOPY) is available.
-+ # An empty section header has sh_addr == 0 and sh_size == 0.
-+ # This problem has only been seen on Solaris X64, but we call this tool
-+ # on all Solaris builds just in case.
-+ #
-+ # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-+ # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-+ $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
- $(RM) $$@
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
- $(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
-+ endif
- else # not solaris
-- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
- $(RM) $$@
- $(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
-+ endif
- endif
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
- $(TOUCH) $$@
-+ endif
- endif # !windows
- endif # !macosx
-
-@@ -584,7 +602,9 @@
- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \
- $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb
- else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
-- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo
-+ endif
- endif
- endif
- endif
-
diff --git a/8044235-include-all-srcs.patch b/8044235-include-all-srcs.patch
deleted file mode 100644
index 1beda6d..0000000
--- a/8044235-include-all-srcs.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-# HG changeset patch
-# User omajid
-# Date 1401638044 14400
-# Sun Jun 01 11:54:04 2014 -0400
-# Node ID fd78f7e83f3f1ce7d363b681b97583138218afcb
-# Parent 8d0af21b5b9789f97b05edacc221a63f851d13b8
-8044235: src.zip should include all sources
-Reviewed-by: andrew, dholmes
-
-diff --git a/make/CreateJars.gmk b/make/CreateJars.gmk
---- openjdk/jdk/make/CreateJars.gmk
-+++ openjdk/jdk/make/CreateJars.gmk
-@@ -584,40 +584,53 @@
-
- ##########################################################################################
-
--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 \
-- 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 \
-- #
-+ifdef OPENJDK
-+ SRC_ZIP_INCLUDES = \
-+ com \
-+ java \
-+ javax \
-+ jdk \
-+ org \
-+ sun \
-+ #
-+ SRC_ZIP_EXCLUDES =
-+else
-+ 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 \
-+ 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 \
-+ #
-+ SRC_ZIP_EXCLUDES = javax/swing/beaninfo
-+endif
-
- SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes
- SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc
-@@ -648,7 +661,7 @@
- $(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
- SRC := $(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src, \
- INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \
-- EXCLUDES := javax/swing/beaninfo, \
-+ EXCLUDES := $(SRC_ZIP_EXCLUDES), \
- SUFFIXES := .java .c .h, \
- ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
- EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))
diff --git a/8044762-pr2960.patch b/8044762-pr2960.patch
deleted file mode 100644
index af5b606..0000000
--- a/8044762-pr2960.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-# HG changeset patch
-# User dsamersoff
-# Date 1403087398 25200
-# Wed Jun 18 03:29:58 2014 -0700
-# Node ID 13411144d46b50d0087f35eca2b8e827aae558f1
-# Parent 10c9f8461c297a200ef57970c1f4c32d4081d790
-8044762, PR2960: com/sun/jdi/OptionTest.java test time out
-Summary: gdata could be NULL in debugInit_exit
-Reviewed-by: dcubed
-
-diff -r 10c9f8461c29 -r 13411144d46b src/share/back/debugInit.c
---- openjdk/jdk/src/share/back/debugInit.c Fri May 20 19:42:05 2016 +0100
-+++ openjdk/jdk/src/share/back/debugInit.c Wed Jun 18 03:29:58 2014 -0700
-@@ -1307,22 +1307,26 @@
- if ( error != JVMTI_ERROR_NONE ) {
- exit_code = 1;
- if ( docoredump ) {
-+ LOG_MISC(("Dumping core as requested by command line"));
- finish_logging(exit_code);
- abort();
- }
- }
-+
- if ( msg==NULL ) {
- msg = "";
- }
-
- LOG_MISC(("Exiting with error %s(%d): %s", jvmtiErrorText(error), error, msg));
-
-- gdata->vmDead = JNI_TRUE;
-+ if (gdata != NULL) {
-+ gdata->vmDead = JNI_TRUE;
-
-- /* Let's try and cleanup the JVMTI, if we even have one */
-- if ( gdata->jvmti != NULL ) {
-- /* Dispose of jvmti (gdata->jvmti becomes NULL) */
-- disposeEnvironment(gdata->jvmti);
-+ /* Let's try and cleanup the JVMTI, if we even have one */
-+ if ( gdata->jvmti != NULL ) {
-+ /* Dispose of jvmti (gdata->jvmti becomes NULL) */
-+ disposeEnvironment(gdata->jvmti);
-+ }
- }
-
- /* Finish up logging. We reach here if JDWP is doing the exiting. */
diff --git a/8049226-pr2960.patch b/8049226-pr2960.patch
deleted file mode 100644
index 0f6bdf8..0000000
--- a/8049226-pr2960.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-# HG changeset patch
-# User dsamersoff
-# Date 1409228402 25200
-# Thu Aug 28 05:20:02 2014 -0700
-# Node ID f4c9545cd8a56a5fab74c95de3573623ba2b83c4
-# Parent 13411144d46b50d0087f35eca2b8e827aae558f1
-8049226, PR2960: com/sun/jdi/OptionTest.java test times out again
-Summary: Don't call jni_FatalError if transport initialization fails
-Reviewed-by: sspitsyn, sla
-
-diff -r 13411144d46b -r f4c9545cd8a5 src/share/back/debugInit.c
---- openjdk/jdk/src/share/back/debugInit.c Wed Jun 18 03:29:58 2014 -0700
-+++ openjdk/jdk/src/share/back/debugInit.c Thu Aug 28 05:20:02 2014 -0700
-@@ -1013,7 +1013,7 @@
- atexit_finish_logging(void)
- {
- /* Normal exit(0) (not _exit()) may only reach here */
-- finish_logging(0); /* Only first call matters */
-+ finish_logging(); /* Only first call matters */
- }
-
- static jboolean
-@@ -1301,43 +1301,49 @@
- void
- debugInit_exit(jvmtiError error, const char *msg)
- {
-- int exit_code = 0;
-+ enum exit_codes { EXIT_NO_ERRORS = 0, EXIT_JVMTI_ERROR = 1, EXIT_TRANSPORT_ERROR = 2 };
-
-- /* Pick an error code */
-- if ( error != JVMTI_ERROR_NONE ) {
-- exit_code = 1;
-- if ( docoredump ) {
-- LOG_MISC(("Dumping core as requested by command line"));
-- finish_logging(exit_code);
-- abort();
-- }
-+ // Prepare to exit. Log error and finish logging
-+ LOG_MISC(("Exiting with error %s(%d): %s", jvmtiErrorText(error), error,
-+ ((msg == NULL) ? "" : msg)));
-+
-+ // coredump requested by command line. Keep JVMTI data dirty
-+ if (error != JVMTI_ERROR_NONE && docoredump) {
-+ LOG_MISC(("Dumping core as requested by command line"));
-+ finish_logging();
-+ abort();
- }
-
-- if ( msg==NULL ) {
-- msg = "";
-- }
-+ finish_logging();
-
-- LOG_MISC(("Exiting with error %s(%d): %s", jvmtiErrorText(error), error, msg));
--
-+ // Cleanup the JVMTI if we have one
- if (gdata != NULL) {
- gdata->vmDead = JNI_TRUE;
--
-- /* Let's try and cleanup the JVMTI, if we even have one */
-- if ( gdata->jvmti != NULL ) {
-- /* Dispose of jvmti (gdata->jvmti becomes NULL) */
-+ if (gdata->jvmti != NULL) {
-+ // Dispose of jvmti (gdata->jvmti becomes NULL)
- disposeEnvironment(gdata->jvmti);
- }
- }
-
-- /* Finish up logging. We reach here if JDWP is doing the exiting. */
-- finish_logging(exit_code); /* Only first call matters */
--
-- /* Let's give the JNI a FatalError if non-exit 0, which is historic way */
-- if ( exit_code != 0 ) {
-- JNIEnv *env = NULL;
-- jniFatalError(env, msg, error, exit_code);
-+ // We are here with no errors. Kill entire process and exit with zero exit code
-+ if (error == JVMTI_ERROR_NONE) {
-+ forceExit(EXIT_NO_ERRORS);
-+ return;
- }
-
-- /* Last chance to die, this kills the entire process. */
-- forceExit(exit_code);
-+ // No transport initilized.
-+ // As we don't have any details here exiting with separate exit code
-+ if (error == AGENT_ERROR_TRANSPORT_INIT) {
-+ forceExit(EXIT_TRANSPORT_ERROR);
-+ return;
-+ }
-+
-+ // We have JVMTI error. Call hotspot jni_FatalError handler
-+ jniFatalError(NULL, msg, error, EXIT_JVMTI_ERROR);
-+
-+ // hotspot calls os:abort() so we should never reach code below,
-+ // but guard against possible hotspot changes
-+
-+ // Last chance to die, this kills the entire process.
-+ forceExit(EXIT_JVMTI_ERROR);
- }
-diff -r 13411144d46b -r f4c9545cd8a5 src/share/back/log_messages.c
---- openjdk/jdk/src/share/back/log_messages.c Wed Jun 18 03:29:58 2014 -0700
-+++ openjdk/jdk/src/share/back/log_messages.c Thu Aug 28 05:20:02 2014 -0700
-@@ -230,7 +230,7 @@
-
- /* Finish up logging, flush output to the logfile. */
- void
--finish_logging(int exit_code)
-+finish_logging()
- {
- #ifdef JDWP_LOGGING
- MUTEX_LOCK(my_mutex);
-diff -r 13411144d46b -r f4c9545cd8a5 src/share/back/log_messages.h
---- openjdk/jdk/src/share/back/log_messages.h Wed Jun 18 03:29:58 2014 -0700
-+++ openjdk/jdk/src/share/back/log_messages.h Thu Aug 28 05:20:02 2014 -0700
-@@ -29,7 +29,7 @@
- /* LOG: Must be called like: LOG_category(("anything")) or LOG_category((format,args)) */
-
- void setup_logging(const char *, unsigned);
--void finish_logging(int);
-+void finish_logging();
-
- #define LOG_NULL ((void)0)
-
diff --git a/8061305-pr3335-rh1423421.patch b/8061305-pr3335-rh1423421.patch
deleted file mode 100644
index 384c52a..0000000
--- a/8061305-pr3335-rh1423421.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# HG changeset patch
-# User ksrini
-# Date 1414764176 25200
-# Fri Oct 31 07:02:56 2014 -0700
-# Node ID 9fd9a50e7994a9659c5ef21296d0baee4c2eecff
-# Parent fd59a2d4313440077fce3fbf39174755a15d285a
-8061305: Javadoc crashes when method name ends with "Property"
-Reviewed-by: jjg
-
-diff --git jdk8/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java jdk8/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
---- jdk8/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
-+++ jdk8/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
-@@ -656,6 +656,9 @@
- // properties aren't named setA* or getA*
- private final Pattern pattern = Pattern.compile("[sg]et\\p{Upper}.*");
- private boolean isPropertyMethod(MethodDoc method) {
-+ if (!configuration.javafx) {
-+ return false;
-+ }
- if (!method.name().endsWith("Property")) {
- return false;
- }
-@@ -667,7 +670,9 @@
- if (pattern.matcher(method.name()).matches()) {
- return false;
- }
--
-+ if (method.typeParameters().length > 0) {
-+ return false;
-+ }
- return 0 == method.parameters().length
- && !"void".equals(method.returnType().simpleTypeName());
- }
diff --git a/8062808-pr3548.patch b/8062808-pr3548.patch
deleted file mode 100644
index e91abd3..0000000
--- a/8062808-pr3548.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-# HG changeset patch
-# User stefank
-# Date 1525453613 -3600
-# Fri May 04 18:06:53 2018 +0100
-# Node ID 07a1135a327362f157955d470fad5df07cc35164
-# Parent de79964656fc652f2085dac4fe99bcc128b5a3b1
-8062808, PR3548: Turn on the -Wreturn-type warning
-Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make
-@@ -210,7 +210,7 @@
- WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body
- endif
-
--WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value
-+WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value -Wreturn-type
-
- ifeq ($(USE_CLANG),)
- # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
-diff --git openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
---- openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad
-+++ openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
-@@ -1250,6 +1250,7 @@
-
-
- Unimplemented();
-+ return 0; // Mute compiler
- }
-
- #ifndef PRODUCT
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
-@@ -541,6 +541,7 @@
- err.report_and_die();
-
- ShouldNotReachHere();
-+ return true; // Mute compiler
- }
-
- void os::Linux::init_thread_fpu_state(void) {
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
-@@ -506,7 +506,7 @@
- ss.write((const char*)name->bytes(), name->utf8_length());
- ss.write((const char*)signature->bytes(), signature->utf8_length());
- ss.print(" is abstract");
-- return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
-+ return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
- }
-
- Symbol* MethodFamily::generate_conflicts_message(GrowableArray<Method*>* methods, TRAPS) const {
-@@ -521,7 +521,7 @@
- ss.print(".");
- ss.write((const char*)name->bytes(), name->utf8_length());
- }
-- return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
-+ return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
- }
-
-
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
-@@ -249,7 +249,7 @@
- MutexLocker ml(SymbolTable_lock, THREAD);
-
- // Otherwise, add to symbol to table
-- return the_table()->basic_add(index, (u1*)name, len, hashValue, true, CHECK_NULL);
-+ return the_table()->basic_add(index, (u1*)name, len, hashValue, true, THREAD);
- }
-
- Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) {
-@@ -288,7 +288,7 @@
- // Grab SymbolTable_lock first.
- MutexLocker ml(SymbolTable_lock, THREAD);
-
-- return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, CHECK_NULL);
-+ return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, THREAD);
- }
-
- Symbol* SymbolTable::lookup_only(const char* name, int len,
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
-@@ -229,15 +229,15 @@
- class_name->as_C_string(),
- class_loader.is_null() ? "null" : class_loader->klass()->name()->as_C_string()));
- if (FieldType::is_array(class_name)) {
-- return resolve_array_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
-+ return resolve_array_class_or_null(class_name, class_loader, protection_domain, THREAD);
- } else if (FieldType::is_obj(class_name)) {
- ResourceMark rm(THREAD);
- // Ignore wrapping L and ;.
- TempNewSymbol name = SymbolTable::new_symbol(class_name->as_C_string() + 1,
- class_name->utf8_length() - 2, CHECK_NULL);
-- return resolve_instance_class_or_null(name, class_loader, protection_domain, CHECK_NULL);
-+ return resolve_instance_class_or_null(name, class_loader, protection_domain, THREAD);
- } else {
-- return resolve_instance_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
-+ return resolve_instance_class_or_null(class_name, class_loader, protection_domain, THREAD);
- }
- }
-
-diff --git openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
---- openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp
-+++ openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
-@@ -367,7 +367,7 @@
- _csv_format(csv_format), _print_help(print_help),
- _print_class_stats(print_class_stats), _columns(columns) {}
- void heap_inspection(outputStream* st) NOT_SERVICES_RETURN;
-- size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN;
-+ size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN_(0);
- static void find_instances_at_safepoint(Klass* k, GrowableArray<oop>* result) NOT_SERVICES_RETURN;
- private:
- void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL);
-diff --git openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
---- openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp
-+++ openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
-@@ -93,7 +93,7 @@
- static void preload_and_dump(TRAPS) NOT_CDS_RETURN;
- static int preload_and_dump(const char * class_list_path,
- GrowableArray<Klass*>* class_promote_order,
-- TRAPS) NOT_CDS_RETURN;
-+ TRAPS) NOT_CDS_RETURN_(0);
-
- static ReservedSpace* shared_rs() {
- CDS_ONLY(return _shared_rs);
-diff --git openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp openjdk/hotspot/src/share/vm/oops/constantPool.hpp
---- openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp
-+++ openjdk/hotspot/src/share/vm/oops/constantPool.hpp
-@@ -352,7 +352,7 @@
-
- Klass* klass_at(int which, TRAPS) {
- constantPoolHandle h_this(THREAD, this);
-- return klass_at_impl(h_this, which, CHECK_NULL);
-+ return klass_at_impl(h_this, which, THREAD);
- }
-
- Symbol* klass_name_at(int which); // Returns the name, w/o resolving.
-diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
---- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
-+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
-@@ -4244,7 +4244,7 @@
- JVM_DTraceProvider* providers))
- JVMWrapper("JVM_DTraceActivate");
- return DTraceJSDT::activate(
-- version, module_name, providers_count, providers, CHECK_0);
-+ version, module_name, providers_count, providers, THREAD);
- JVM_END
-
- JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method))
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp openjdk/hotspot/src/share/vm/runtime/reflection.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/reflection.cpp
-@@ -1093,7 +1093,7 @@
- } else {
- if (rtype == T_BOOLEAN || rtype == T_BYTE || rtype == T_CHAR || rtype == T_SHORT)
- narrow((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
-- return box((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
-+ return box((jvalue*) result.get_value_addr(), rtype, THREAD);
- }
- }
-
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
-@@ -1046,7 +1046,7 @@
- // last java frame on stack (which includes native call frames)
- vframeStream vfst(thread, true); // Do not skip and javaCalls
-
-- return find_callee_info_helper(thread, vfst, bc, callinfo, CHECK_(Handle()));
-+ return find_callee_info_helper(thread, vfst, bc, callinfo, THREAD);
- }
-
-
-diff --git openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp openjdk/hotspot/src/share/vm/services/memTracker.hpp
---- openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp
-+++ openjdk/hotspot/src/share/vm/services/memTracker.hpp
-@@ -64,7 +64,7 @@
- const NativeCallStack& stack, MEMFLAGS flag = mtNone) { }
- static inline void record_virtual_memory_commit(void* addr, size_t size, const NativeCallStack& stack) { }
- static inline Tracker get_virtual_memory_uncommit_tracker() { return Tracker(); }
-- static inline Tracker get_virtual_memory_release_tracker() { }
-+ static inline Tracker get_virtual_memory_release_tracker() { return Tracker(); }
- static inline void record_virtual_memory_type(void* addr, MEMFLAGS flag) { }
- static inline void record_thread_stack(void* addr, size_t size) { }
- static inline void release_thread_stack(void* addr, size_t size) { }
diff --git a/8064786-pr3599.patch b/8064786-pr3599.patch
deleted file mode 100644
index 790ee0d..0000000
--- a/8064786-pr3599.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# HG changeset patch
-# User goetz
-# Date 1415873641 -3600
-# Thu Nov 13 11:14:01 2014 +0100
-# Node ID 1878c4c1d04e1f3c6f67a19d36c35863d6b5f906
-# Parent 533473c67de6ff767710594639033c8e83523fe5
-8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning
-Reviewed-by: stefank, tschatzl
-
-diff --git openjdk.orig/hotspot/src/share/vm/prims/jni.cpp openjdk/hotspot/src/share/vm/prims/jni.cpp
---- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp
-+++ openjdk/hotspot/src/share/vm/prims/jni.cpp
-@@ -708,6 +708,7 @@
-
- THROW_OOP_(JNIHandles::resolve(obj), JNI_OK);
- ShouldNotReachHere();
-+ return 0; // Mute compiler.
- JNI_END
-
- #ifndef USDT2
-@@ -734,6 +735,7 @@
- Handle protection_domain (THREAD, k->protection_domain());
- THROW_MSG_LOADER_(name, (char *)message, class_loader, protection_domain, JNI_OK);
- ShouldNotReachHere();
-+ return 0; // Mute compiler.
- JNI_END
-
-
diff --git a/8075942-pr3602-rh1582032.patch b/8075942-pr3602-rh1582032.patch
deleted file mode 100644
index bd2a40e..0000000
--- a/8075942-pr3602-rh1582032.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-# HG changeset patch
-# User prr
-# Date 1429299166 25200
-# Fri Apr 17 12:32:46 2015 -0700
-# Node ID 1f4b038b9550afaf88a70cee4cf9c1422ecd86d6
-# Parent 533117ae5b7587c8d9c0612581682ab984475430
-8075942, PR3602: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo
-Reviewed-by: flar, lbourges
-
-diff --git openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/Dasher.java openjdk/jdk/src/share/classes/sun/java2d/pisces/Dasher.java
---- openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/Dasher.java
-+++ openjdk/jdk/src/share/classes/sun/java2d/pisces/Dasher.java
-@@ -146,7 +146,7 @@
- if (dashOn) {
- if (starting) {
- firstSegmentsBuffer = Helpers.widenArray(firstSegmentsBuffer,
-- firstSegidx, type - 2);
-+ firstSegidx, type - 2 + 1);
- firstSegmentsBuffer[firstSegidx++] = type;
- System.arraycopy(pts, off, firstSegmentsBuffer, firstSegidx, type - 2);
- firstSegidx += type - 2;
-diff --git a/test/javopenjdk.orig/jdk/awt/BasicStroke/DashStrokeTest.java openjdk/jdk/test/java/awt/BasicStroke/DashStrokeTest.java
-new file mode 100644
---- /dev/null
-+++ openjdk/jdk/test/java/awt/BasicStroke/DashStrokeTest.java
-@@ -0,0 +1,69 @@
-+/*
-+ * Copyright (c) 2015, 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.
-+ *
-+ * 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.
-+ *
-+ * @test
-+ * @bug 8075942
-+ * @summary test there is no exception rendering a dashed stroke
-+ * @run DashStrokeTest
-+ * @run -Dsun.java2d.renderer=sun.java2d.pisces.PiscesRenderingEngine
-+ */
-+
-+import java.awt.BasicStroke;
-+import java.awt.Color;
-+import java.awt.Graphics2D;
-+import java.awt.Stroke;
-+import java.awt.geom.GeneralPath;
-+import java.awt.image.BufferedImage;
-+
-+
-+public class DashStrokeTest {
-+
-+ public static void main(String[] args) {
-+
-+ GeneralPath shape = new GeneralPath();
-+ int[] pointTypes = {0, 0, 1, 1, 0, 1, 1, 0};
-+ double[] xpoints = {428, 420, 400, 400, 400, 400, 420, 733};
-+ double[] ypoints = {180, 180, 180, 160, 30, 10, 10, 10};
-+ shape.moveTo(xpoints[0], ypoints[0]);
-+ for (int i = 1; i < pointTypes.length; i++) {
-+ if (pointTypes[i] == 1 && i < pointTypes.length - 1) {
-+ shape.quadTo(xpoints[i], ypoints[i],
-+ xpoints[i + 1], ypoints[i + 1]);
-+ } else {
-+ shape.lineTo(xpoints[i], ypoints[i]);
-+ }
-+ }
-+
-+ BufferedImage image = new
-+ BufferedImage(1000, 1000, BufferedImage.TYPE_INT_ARGB);
-+ Graphics2D g2 = image.createGraphics();
-+
-+ Color color = new Color(124, 0, 124, 255);
-+ g2.setColor(color);
-+ Stroke stroke = new BasicStroke(1.0f,
-+ BasicStroke.CAP_BUTT,
-+ BasicStroke.JOIN_BEVEL,
-+ 10.0f, new float[] {9, 6}, 0.0f);
-+ g2.setStroke(stroke);
-+ g2.draw(shape);
-+ }
-+}
diff --git a/8141570-pr3548.patch b/8141570-pr3548.patch
deleted file mode 100644
index f1e3215..0000000
--- a/8141570-pr3548.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-# HG changeset patch
-# User coleenp
-# Date 1525713256 -3600
-# Mon May 07 18:14:16 2018 +0100
-# Node ID bcbc64dfb629c5f188bbf59b8f986ad95963ed60
-# Parent 07a1135a327362f157955d470fad5df07cc35164
-8141570, PR3548: Fix Zero interpreter build for --disable-precompiled-headers
-Summary: change to include atomic.inline.hpp and allocation.inline.hpp only in .cpp files and some build fixes from Kim to build on ubuntu without devkits
-Reviewed-by: kbarrett, sgehwolf, erikj
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
---- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
-+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- # Copyright 2007, 2008 Red Hat, Inc.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- #
-@@ -25,8 +25,15 @@
-
- # Setup common to Zero (non-Shark) and Shark versions of VM
-
--# override this from the main file because some version of llvm do not like -Wundef
--WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wunused-function -Wunused-value
-+# Some versions of llvm do not like -Wundef
-+ifeq ($(USE_CLANG), true)
-+ WARNING_FLAGS += -Wno-undef
-+endif
-+# Suppress some warning flags that are normally turned on for hotspot,
-+# because some of the zero code has not been updated accordingly.
-+WARNING_FLAGS += -Wno-return-type \
-+ -Wno-format-nonliteral -Wno-format-security \
-+ -Wno-maybe-uninitialized
-
- # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
- OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-@@ -42,5 +49,3 @@
- ifeq ($(ARCH_DATA_MODEL), 64)
- CFLAGS += -D_LP64=1
- endif
--
--OPT_CFLAGS/compactingPermGenGen.o = -O1
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/java.cpp openjdk/hotspot/src/share/vm/runtime/java.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/java.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/java.cpp
-@@ -45,6 +45,7 @@
- #include "runtime/arguments.hpp"
- #include "runtime/biasedLocking.hpp"
- #include "runtime/compilationPolicy.hpp"
-+#include "runtime/deoptimization.hpp"
- #include "runtime/fprofiler.hpp"
- #include "runtime/init.hpp"
- #include "runtime/interfaceSupport.hpp"
diff --git a/8143245-pr3548.patch b/8143245-pr3548.patch
deleted file mode 100644
index eccb110..0000000
--- a/8143245-pr3548.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-# HG changeset patch
-# User sgehwolf
-# Date 1525714161 -3600
-# Mon May 07 18:29:21 2018 +0100
-# Node ID afb31413c73cbc06420fdb447aa90a7a38258904
-# Parent bcbc64dfb629c5f188bbf59b8f986ad95963ed60
-8143245, PR3548: Zero build requires disabled warnings
-Reviewed-by: dholmes, coleenp
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
---- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
-+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
- # Copyright 2007, 2008 Red Hat, Inc.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- #
-@@ -29,11 +29,6 @@
- ifeq ($(USE_CLANG), true)
- WARNING_FLAGS += -Wno-undef
- endif
--# Suppress some warning flags that are normally turned on for hotspot,
--# because some of the zero code has not been updated accordingly.
--WARNING_FLAGS += -Wno-return-type \
-- -Wno-format-nonliteral -Wno-format-security \
-- -Wno-maybe-uninitialized
-
- # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
- OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-diff --git openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
---- openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
-+++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
-@@ -100,7 +100,7 @@
- case T_DOUBLE:
- case T_VOID:
- return result;
-- default : ShouldNotReachHere();
-+ default : ShouldNotReachHere(); return NULL_WORD;
- }
- }
-
-diff --git openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
---- openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
-+++ openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2007, 2008, 2010 Red Hat, Inc.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-@@ -62,7 +62,7 @@
- }
-
- void InterpreterRuntime::SignatureHandlerGeneratorBase::push(BasicType type) {
-- ffi_type *ftype;
-+ ffi_type *ftype = NULL;
- switch (type) {
- case T_VOID:
- ftype = &ffi_type_void;
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-@@ -1,6 +1,6 @@
- /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
-- * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
-+ * Copyright 2016 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
-@@ -61,6 +61,7 @@
-
- frame os::get_sender_for_C_frame(frame* fr) {
- ShouldNotCallThis();
-+ return frame(NULL, NULL); // silence compile warning.
- }
-
- frame os::current_frame() {
-@@ -98,16 +99,19 @@
-
- address os::Linux::ucontext_get_pc(ucontext_t* uc) {
- ShouldNotCallThis();
-+ return NULL; // silence compile warnings
- }
-
- ExtendedPC os::fetch_frame_from_context(void* ucVoid,
- intptr_t** ret_sp,
- intptr_t** ret_fp) {
- ShouldNotCallThis();
-+ return NULL; // silence compile warnings
- }
-
- frame os::fetch_frame_from_context(void* ucVoid) {
- ShouldNotCallThis();
-+ return frame(NULL, NULL); // silence compile warnings
- }
-
- extern "C" JNIEXPORT int
-@@ -247,11 +251,16 @@
- }
- #endif // !PRODUCT
-
-- const char *fmt = "caught unhandled signal %d";
- char buf[64];
-
-- sprintf(buf, fmt, sig);
-+ sprintf(buf, "caught unhandled signal %d", sig);
-+
-+// Silence -Wformat-security warning for fatal()
-+PRAGMA_DIAG_PUSH
-+PRAGMA_FORMAT_NONLITERAL_IGNORED
- fatal(buf);
-+PRAGMA_DIAG_POP
-+ return true; // silence compiler warnings
- }
-
- void os::Linux::init_thread_fpu_state(void) {
-@@ -260,6 +269,7 @@
-
- int os::Linux::get_fpu_control_word() {
- ShouldNotCallThis();
-+ return -1; // silence compile warnings
- }
-
- void os::Linux::set_fpu_control_word(int fpu) {
-@@ -408,6 +418,7 @@
-
- extern "C" {
- int SpinPause() {
-+ return -1; // silence compile warnings
- }
-
-
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-@@ -110,6 +110,7 @@
- void* ucontext,
- bool isInJava) {
- ShouldNotCallThis();
-+ return false; // silence compile warning
- }
-
- // These routines are only used on cpu architectures that
diff --git a/8148351-pr2842-02.patch b/8148351-pr2842-02.patch
deleted file mode 100644
index 1812e19..0000000
--- a/8148351-pr2842-02.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-# HG changeset patch
-# User ihse
-# Date 1454642639 0
-# Fri Feb 05 03:23:59 2016 +0000
-# Node ID 61798573efe5a9efa67e268a52cf61263abb4396
-# Parent 842cc183c9f6d29270ff002238248978c08f0a66
-8148351, PR2842: Only display resolved symlink for compiler, do not change path
-Reviewed-by: erikj
-
-diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
---- openjdk///common/autoconf/toolchain.m4
-+++ openjdk///common/autoconf/toolchain.m4
-@@ -198,38 +198,22 @@
- fi
- BASIC_FIXUP_EXECUTABLE($1)
- TEST_COMPILER="[$]$1"
-- # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links
-- # to 'xlc' but it is crucial that we invoke the compiler with the right name!
-- if test "x$OPENJDK_BUILD_OS" != xaix; then
-- AC_MSG_CHECKING([resolved symbolic links for $1])
-- BASIC_REMOVE_SYMBOLIC_LINKS(TEST_COMPILER)
-- AC_MSG_RESULT([$TEST_COMPILER])
-- fi
-- AC_MSG_CHECKING([if $1 is disguised ccache])
-
-- COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"`
-- if test "x$COMPILER_BASENAME" = "xccache"; then
-- AC_MSG_RESULT([yes, trying to find proper $COMPILER_NAME compiler])
-- # We /usr/lib/ccache in the path, so cc is a symlink to /usr/bin/ccache.
-- # We want to control ccache invocation ourselves, so ignore this cc and try
-- # searching again.
-+ AC_MSG_CHECKING([resolved symbolic links for $1])
-+ SYMLINK_ORIGINAL="$TEST_COMPILER"
-+ BASIC_REMOVE_SYMBOLIC_LINKS(SYMLINK_ORIGINAL)
-+ if test "x$TEST_COMPILER" = "x$SYMLINK_ORIGINAL"; then
-+ AC_MSG_RESULT([no symlink])
-+ else
-+ AC_MSG_RESULT([$SYMLINK_ORIGINAL])
-
-- # Remove the path to the fake ccache cc from the PATH
-- RETRY_COMPILER_SAVED_PATH="$PATH"
-- COMPILER_DIRNAME=`$DIRNAME [$]$1`
-- PATH="`$ECHO $PATH | $SED -e "s,$COMPILER_DIRNAME,,g" -e "s,::,:,g" -e "s,^:,,g"`"
--
-- # Try again looking for our compiler
-- AC_CHECK_TOOLS(PROPER_COMPILER_$1, $3)
-- BASIC_FIXUP_EXECUTABLE(PROPER_COMPILER_$1)
-- PATH="$RETRY_COMPILER_SAVED_PATH"
--
-- AC_MSG_CHECKING([for resolved symbolic links for $1])
-- BASIC_REMOVE_SYMBOLIC_LINKS(PROPER_COMPILER_$1)
-- AC_MSG_RESULT([$PROPER_COMPILER_$1])
-- $1="$PROPER_COMPILER_$1"
-- else
-- AC_MSG_RESULT([no, keeping $1])
-+ # We can't handle ccache by gcc wrappers, since we need to know if we're
-+ # using ccache. Instead ccache usage must be controlled by a configure option.
-+ COMPILER_BASENAME=`$BASENAME "$SYMLINK_ORIGINAL"`
-+ if test "x$COMPILER_BASENAME" = "xccache"; then
-+ AC_MSG_NOTICE([Please use --enable-ccache instead of providing a wrapped compiler.])
-+ AC_MSG_ERROR([$TEST_COMPILER is a symbolic link to ccache. This is not supported.])
-+ fi
- fi
-
- TOOLCHAIN_EXTRACT_COMPILER_VERSION([$1], [$COMPILER_NAME])
diff --git a/8150954-pr2866-rh1176206-screenshot-xcomposite-jdk.patch b/8150954-pr2866-rh1176206-screenshot-xcomposite-jdk.patch
deleted file mode 100644
index 8b62ae6..0000000
--- a/8150954-pr2866-rh1176206-screenshot-xcomposite-jdk.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-
-# HG changeset patch
-# User neugens
-# Date 1532089120 -7200
-# Node ID 7b30bb9b05bd2e8045bc693ea5be353ce6326396
-# Parent 3d8011a1e02179e5658110981e30274c605ceac8
-8150954: Taking screenshots on x11 composite desktop produce wrong result
-Summary: The AWT Robot X11 code that takes screenshots uses the default root window, which may not contain the final composited desktop.
-Reviewed-by: alexsch, ssadetsky, prr, dbuck
-
-diff -r 3d8011a1e021 -r 7b30bb9b05bd make/mapfiles/libawt_xawt/mapfile-vers
---- openjdk/jdk/make/mapfiles/libawt_xawt/mapfile-vers Thu Jul 19 03:31:37 2018 +0100
-+++ openjdk/jdk/make/mapfiles/libawt_xawt/mapfile-vers Fri Jul 20 14:18:40 2018 +0200
-@@ -158,6 +158,7 @@
- Java_sun_awt_X11_XRobotPeer_mouseReleaseImpl;
- Java_sun_awt_X11_XRobotPeer_mouseWheelImpl;
- Java_sun_awt_X11_XRobotPeer_setup;
-+ Java_sun_awt_X11_XRobotPeer_loadNativeLibraries;
- Java_sun_awt_X11_XToolkit_getNumberOfButtonsImpl;
- Java_java_awt_Component_initIDs;
- Java_java_awt_Container_initIDs;
-diff -r 3d8011a1e021 -r 7b30bb9b05bd src/solaris/classes/sun/awt/X11/XRobotPeer.java
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XRobotPeer.java Thu Jul 19 03:31:37 2018 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XRobotPeer.java Fri Jul 20 14:18:40 2018 +0200
-@@ -34,6 +34,10 @@
-
- class XRobotPeer implements RobotPeer {
-
-+ static {
-+ loadNativeLibraries();
-+ }
-+
- private X11GraphicsConfig xgc = null;
- /*
- * native implementation uses some static shared data (pipes, processes)
-@@ -98,4 +102,5 @@
- private static native synchronized void keyReleaseImpl(int keycode);
-
- private static native synchronized void getRGBPixelsImpl(X11GraphicsConfig xgc, int x, int y, int width, int height, int pixelArray[]);
-+ private static native void loadNativeLibraries();
- }
-diff -r 3d8011a1e021 -r 7b30bb9b05bd src/solaris/native/sun/awt/awt_Robot.c
---- openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c Thu Jul 19 03:31:37 2018 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c Fri Jul 20 14:18:40 2018 +0200
-@@ -27,6 +27,9 @@
- #error This file should not be included in headless library
- #endif
-
-+#include "jvm_md.h"
-+#include <dlfcn.h>
-+
- #include "awt_p.h"
- #include "awt_GraphicsEnv.h"
- #define XK_MISCELLANY
-@@ -49,11 +52,46 @@
- #include <sys/socket.h>
- #endif
-
-+static Bool (*compositeQueryExtension) (Display*, int*, int*);
-+static Status (*compositeQueryVersion) (Display*, int*, int*);
-+static Window (*compositeGetOverlayWindow) (Display *, Window);
-+
- extern struct X11GraphicsConfigIDs x11GraphicsConfigIDs;
-
- static jint * masks;
- static jint num_buttons;
-
-+static void *xCompositeHandle;
-+
-+static const char* XCOMPOSITE = JNI_LIB_NAME("Xcomposite");
-+static const char* XCOMPOSITE_VERSIONED = VERSIONED_JNI_LIB_NAME("Xcomposite", "1");
-+
-+static Bool checkXCompositeFunctions(void) {
-+ return (compositeQueryExtension != NULL &&
-+ compositeQueryVersion != NULL &&
-+ compositeGetOverlayWindow != NULL);
-+}
-+
-+static void initXCompositeFunctions(void) {
-+
-+ if (xCompositeHandle == NULL) {
-+ xCompositeHandle = dlopen(XCOMPOSITE, RTLD_LAZY | RTLD_GLOBAL);
-+ if (xCompositeHandle == NULL) {
-+ xCompositeHandle = dlopen(XCOMPOSITE_VERSIONED, RTLD_LAZY | RTLD_GLOBAL);
-+ }
-+ }
-+ //*(void **)(&asyncGetCallTraceFunction)
-+ if (xCompositeHandle != NULL) {
-+ *(void **)(&compositeQueryExtension) = dlsym(xCompositeHandle, "XCompositeQueryExtension");
-+ *(void **)(&compositeQueryVersion) = dlsym(xCompositeHandle, "XCompositeQueryVersion");
-+ *(void **)(&compositeGetOverlayWindow) = dlsym(xCompositeHandle, "XCompositeGetOverlayWindow");
-+ }
-+
-+ if (xCompositeHandle && !checkXCompositeFunctions()) {
-+ dlclose(xCompositeHandle);
-+ }
-+}
-+
- static int32_t isXTestAvailable() {
- int32_t major_opcode, first_event, first_error;
- int32_t event_basep, error_basep, majorp, minorp;
-@@ -88,6 +126,35 @@
- return isXTestAvailable;
- }
-
-+static Bool hasXCompositeOverlayExtension(Display *display) {
-+
-+ int xoverlay = False;
-+ int eventBase, errorBase;
-+ if (checkXCompositeFunctions() &&
-+ compositeQueryExtension(display, &eventBase, &errorBase))
-+ {
-+ int major = 0;
-+ int minor = 0;
-+
-+ compositeQueryVersion(display, &major, &minor);
-+ if (major > 0 || minor >= 3) {
-+ xoverlay = True;
-+ }
-+ }
-+
-+ return xoverlay;
-+}
-+
-+static jboolean isXCompositeDisplay(Display *display, int screenNumber) {
-+
-+ char NET_WM_CM_Sn[25];
-+ snprintf(NET_WM_CM_Sn, sizeof(NET_WM_CM_Sn), "_NET_WM_CM_S%d\0", screenNumber);
-+
-+ Atom managerSelection = XInternAtom(display, NET_WM_CM_Sn, 0);
-+ Window owner = XGetSelectionOwner(display, managerSelection);
-+
-+ return owner != 0;
-+}
-
- static XImage *getWindowImage(Display * display, Window window,
- int32_t x, int32_t y,
-@@ -232,6 +299,12 @@
- DASSERT(adata != NULL);
-
- rootWindow = XRootWindow(awt_display, adata->awt_visInfo.screen);
-+ if (hasXCompositeOverlayExtension(awt_display) &&
-+ isXCompositeDisplay(awt_display, adata->awt_visInfo.screen))
-+ {
-+ rootWindow = compositeGetOverlayWindow(awt_display, rootWindow);
-+ }
-+
- image = getWindowImage(awt_display, rootWindow, x, y, width, height);
-
- /* Array to use to crunch around the pixel values */
-@@ -412,3 +485,8 @@
-
- AWT_UNLOCK();
- }
-+
-+JNIEXPORT void JNICALL
-+Java_sun_awt_X11_XRobotPeer_loadNativeLibraries (JNIEnv *env, jclass cls) {
-+ initXCompositeFunctions();
-+}
-
diff --git a/8154313.patch b/8154313.patch
deleted file mode 100644
index 3a43c5f..0000000
--- a/8154313.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- jdk8/make/Javadoc.gmk 2016-04-01 16:53:41.069477682 +0200
-+++ jdk8/make/Javadoc.gmk 2016-04-01 16:53:41.014477059 +0200
-@@ -220,6 +220,12 @@
- JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
- PLATFORM_DOCSDIR = $(DOCSDIR)/platform
-
-+
-+JAVADOC_ARCHIVE_NAME := jdk-$(FULL_VERSION)-docs.zip
-+JAVADOC_ARCHIVE_ASSEMBLY_DIR := $(DOCSTMPDIR)/zip-docs
-+JAVADOC_ARCHIVE_DIR := $(OUTPUT_ROOT)/bundles
-+JAVADOC_ARCHIVE := $(JAVADOC_ARCHIVE_DIR)/$(JAVADOC_ARCHIVE_NAME)
-+
- # The non-core api javadocs need to be able to access the root of the core
- # api directory, so for jdk/api or jre/api to get to the core api/
- # directory we would use this:
-@@ -319,6 +325,37 @@
- all: docs
- docs: coredocs otherdocs
-
-+#
-+# Optional target which bundles all generated javadocs into a zip
-+# archive. The dependency on docs is handled in Main.gmk. Incremental
-+# building of docs is currently broken so if you invoke zip-docs after
-+# docs, the docs are always rebuilt.
-+#
-+
-+zip-docs: $(JAVADOC_ARCHIVE)
-+
-+#
-+# Add the core docs as prerequisite to the archive to trigger a rebuild
-+# if the core docs were rebuilt. Ideally any doc rebuild should trigger
-+# this, but the way prerequisites are currently setup in this file, that
-+# is hard to achieve.
-+#
-+
-+$(JAVADOC_ARCHIVE): $(COREAPI_INDEX_FILE)
-+ @$(ECHO) "Compressing javadoc to single $(JAVADOC_ARCHIVE_NAME)" ;
-+ $(MKDIR) -p $(JAVADOC_ARCHIVE_DIR) ;
-+ $(RM) -r $(JAVADOC_ARCHIVE_ASSEMBLY_DIR) ;
-+ $(MKDIR) -p $(JAVADOC_ARCHIVE_ASSEMBLY_DIR);
-+ all_roots=`$(FIND) $(DOCSDIR) | $(GREP) index.html `; \
-+ pushd $(JAVADOC_ARCHIVE_ASSEMBLY_DIR); \
-+ for index_file in $${all_roots} ; do \
-+ target_dir=`dirname $${index_file}`; \
-+ name=`$(ECHO) $${target_dir} | $(SED) "s;/spec;;" | $(SED) "s;.*/;;"`; \
-+ $(LN) -s $${target_dir} $${name}; \
-+ done; \
-+ $(ZIP) -q -r $(JAVADOC_ARCHIVE) * ; \
-+ popd ;
-+
- #################################################################
- # Production Targets -- USE THESE TARGETS WHEN:
- # a) You're generating docs outside of release engineering's
---- jdk8/make/Main.gmk 2016-04-01 16:53:41.311480424 +0200
-+++ jdk8/make/Main.gmk 2016-04-01 16:53:41.266479914 +0200
-@@ -165,6 +165,12 @@
- @($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
- @$(call TargetExit)
-
-+zip-docs: docs zip-docs-only
-+zip-docs-only: start-make
-+ @$(call TargetEnter)
-+ @($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk zip-docs)
-+ @$(call TargetExit)
-+
- sign-jars: jdk sign-jars-only
- sign-jars-only: start-make
- @$(call TargetEnter)
diff --git a/8164293-pr3412-rh1459641.patch b/8164293-pr3412-rh1459641.patch
deleted file mode 100644
index 3b08f8b..0000000
--- a/8164293-pr3412-rh1459641.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-# HG changeset patch
-# User jcm
-# Date 1484137609 28800
-# Wed Jan 11 04:26:49 2017 -0800
-# Node ID 1faf7c17089922f6f72b580253725f2ecb6ba2f8
-# Parent 3d07e14d65bc223dbfe94be9224e4aa8c6e63762
-8164293, PR3412, RH1459641: HotSpot leaking memory in long-running requests
-Summary: Applied RMs in sweep_code_cache and related codes.
-Reviewed-by: kvn, thartmann
-
-diff --git a/src/share/vm/code/nmethod.cpp b/src/share/vm/code/nmethod.cpp
---- openjdk/hotspot/src/share/vm/code/nmethod.cpp
-+++ openjdk/hotspot/src/share/vm/code/nmethod.cpp
-@@ -1172,6 +1172,7 @@
- // Clear ICStubs of all compiled ICs
- void nmethod::clear_ic_stubs() {
- assert_locked_or_safepoint(CompiledIC_lock);
-+ ResourceMark rm;
- RelocIterator iter(this);
- while(iter.next()) {
- if (iter.type() == relocInfo::virtual_call_type) {
-diff --git a/src/share/vm/runtime/sweeper.cpp b/src/share/vm/runtime/sweeper.cpp
---- openjdk/hotspot/src/share/vm/runtime/sweeper.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/sweeper.cpp
-@@ -319,6 +319,7 @@
- }
-
- void NMethodSweeper::sweep_code_cache() {
-+ ResourceMark rm;
- Ticks sweep_start_counter = Ticks::now();
-
- _flushed_count = 0;
-@@ -626,6 +627,7 @@
- // state of the code cache if it's requested.
- void NMethodSweeper::log_sweep(const char* msg, const char* format, ...) {
- if (PrintMethodFlushing) {
-+ ResourceMark rm;
- stringStream s;
- // Dump code cache state into a buffer before locking the tty,
- // because log_state() will use locks causing lock conflicts.
-@@ -643,6 +645,7 @@
- }
-
- if (LogCompilation && (xtty != NULL)) {
-+ ResourceMark rm;
- stringStream s;
- // Dump code cache state into a buffer before locking the tty,
- // because log_state() will use locks causing lock conflicts.
diff --git a/8165852-pr3468.patch b/8165852-pr3468.patch
deleted file mode 100644
index 6a9f643..0000000
--- a/8165852-pr3468.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java 2017-08-23 11:40:26.690809603 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java 2017-08-23 11:44:28.314815334 +0200
-@@ -74,8 +74,16 @@
- } catch (UnixException x) {
- x.rethrowAsIOException(parent);
- }
-- if (attrs.dev() != dev())
-- break;
-+ if (attrs.dev() != dev()) {
-+
-+ // step 3: lookup mounted file systems (use /proc/mounts to ensure we
-+ // find the file system even when not in /etc/mtab)
-+ byte[] dir = path.asByteArray();
-+ for (UnixMountEntry entry: fs.getMountEntries("/proc/mounts")) {
-+ if (Arrays.equals(dir, entry.dir()))
-+ return entry;
-+ }
-+ }
- path = parent;
- parent = parent.getParent();
- }
diff --git a/8171000-pr3542-rh1402819.patch b/8171000-pr3542-rh1402819.patch
deleted file mode 100644
index d831aa9..0000000
--- a/8171000-pr3542-rh1402819.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-# HG changeset patch
-# User kaddepalli
-# Date 1517818481 -19800
-# Mon Feb 05 13:44:41 2018 +0530
-# Node ID b77308735540644d4710244e3c88865067f2905a
-# Parent 39bfc94b1f4265b645c2970a58389acc779dafe9
-8171000, PR3542, RH1402819: Robot.createScreenCapture() crashes in wayland mode
-Reviewed-by: serb, mhalder
-
-diff --git openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
---- openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c
-+++ openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
-@@ -394,77 +394,48 @@
- XRectangle bbox; /* bounding box of grabbed area */
- list_ptr regions;/* list of regions to read from */
- {
-- image_region_type *reg;
-- int32_t dst_x, dst_y; /* where in pixmap to write (UL) */
-- int32_t diff;
--
-- XImage *reg_image,*ximage ;
-- int32_t srcRect_x,srcRect_y,srcRect_width,srcRect_height ;
-- int32_t rem ;
-- int32_t bytes_per_line;
-- int32_t bitmap_unit;
--
-- bitmap_unit = sizeof (long);
-- if (format == ZPixmap)
-- bytes_per_line = width*depth/8;
-- else
-- bytes_per_line = width/8;
--
--
-- /* Find out how many more bytes are required for padding so that
-- ** bytes per scan line will be multiples of bitmap_unit bits */
-- if (format == ZPixmap) {
-- rem = (bytes_per_line*8)%bitmap_unit;
-- if (rem)
-- bytes_per_line += (rem/8 + 1);
-- }
-+ XImage *ximage ;
-
- ximage = XCreateImage(disp,fakeVis,(uint32_t) depth,format,0,NULL,
- (uint32_t)width,(uint32_t)height,8,0);
-
-- bytes_per_line = ximage->bytes_per_line;
--
-- if (format == ZPixmap)
-- ximage->data = malloc(height*bytes_per_line);
-- else
-- ximage->data = malloc(height*bytes_per_line*depth);
--
-+ ximage->data = calloc(ximage->bytes_per_line*height*((format==ZPixmap)? 1 : depth), sizeof(char));
- ximage->bits_per_pixel = depth; /** Valid only if format is ZPixmap ***/
-
-- for (reg = (image_region_type *) first_in_list( regions); reg;
-+ for (image_region_type* reg = (image_region_type *) first_in_list( regions); reg;
- reg = (image_region_type *) next_in_list( regions))
- {
-- int32_t rect;
-- struct my_XRegion *vis_reg;
-- vis_reg = (struct my_XRegion *)(reg->visible_region);
-- for (rect = 0;
-- rect < vis_reg->numRects;
-- rect++)
-+ struct my_XRegion *vis_reg = (struct my_XRegion *)(reg->visible_region);
-+ for (int32_t rect = 0; rect < vis_reg->numRects; rect++)
- {
-- /** ------------------------------------------------------------------------
-- Intersect bbox with visible part of region giving src rect & output
-- location. Width is the min right side minus the max left side.
-- Similar for height. Offset src rect so x,y are relative to
-- origin of win, not the root-relative visible rect of win.
-- ------------------------------------------------------------------------ **/
-- srcRect_width = MIN( vis_reg->rects[rect].x2, bbox.width + bbox.x)
-- - MAX( vis_reg->rects[rect].x1, bbox.x);
-+ /** ------------------------------------------------------------------------
-+ Intersect bbox with visible part of region giving src rect & output
-+ location. Width is the min right side minus the max left side.
-+ Similar for height. Offset src rect so x,y are relative to
-+ origin of win, not the root-relative visible rect of win.
-+ ------------------------------------------------------------------------ **/
-+ int32_t srcRect_width = MIN( vis_reg->rects[rect].x2, bbox.width + bbox.x)
-+ - MAX( vis_reg->rects[rect].x1, bbox.x);
-+
-+ int32_t srcRect_height = MIN( vis_reg->rects[rect].y2, bbox.height + bbox.y)
-+ - MAX( vis_reg->rects[rect].y1, bbox.y);
-
-- srcRect_height = MIN( vis_reg->rects[rect].y2, bbox.height + bbox.y)
-- - MAX( vis_reg->rects[rect].y1, bbox.y);
-+ int32_t diff = bbox.x - vis_reg->rects[rect].x1;
-+ int32_t srcRect_x = MAX( 0, diff) + (vis_reg->rects[rect].x1 - reg->x_rootrel - reg->border);
-+ int32_t dst_x = MAX( 0, -diff) ;
-
-- diff = bbox.x - vis_reg->rects[rect].x1;
-- srcRect_x = MAX( 0, diff) + (vis_reg->rects[rect].x1 - reg->x_rootrel - reg->border);
-- dst_x = MAX( 0, -diff) ;
-- diff = bbox.y - vis_reg->rects[rect].y1;
-- srcRect_y = MAX( 0, diff) + (vis_reg->rects[rect].y1 - reg->y_rootrel - reg->border);
-- dst_y = MAX( 0, -diff) ;
-- reg_image = XGetImage(disp,reg->win,srcRect_x,srcRect_y,
-- (uint32_t) srcRect_width, (uint32_t) srcRect_height,AllPlanes,format) ;
-- TransferImage(disp,reg_image,srcRect_width,
-- srcRect_height,reg,ximage,dst_x,dst_y) ;
-- XDestroyImage(reg_image);
-- }
-+ diff = bbox.y - vis_reg->rects[rect].y1;
-+ int32_t srcRect_y = MAX( 0, diff) + (vis_reg->rects[rect].y1 - reg->y_rootrel - reg->border);
-+ int32_t dst_y = MAX( 0, -diff) ;
-+ XImage* reg_image = XGetImage(disp,reg->win,srcRect_x,srcRect_y,
-+ (uint32_t) srcRect_width, (uint32_t) srcRect_height,AllPlanes,format) ;
-+
-+ if (reg_image) {
-+ TransferImage(disp,reg_image,srcRect_width,
-+ srcRect_height,reg,ximage,dst_x,dst_y) ;
-+ XDestroyImage(reg_image);
-+ }
-+ }
- }
- return ximage ;
- }
diff --git a/8184309-pr3596.patch b/8184309-pr3596.patch
deleted file mode 100644
index 00b6125..0000000
--- a/8184309-pr3596.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User ysuenaga
-# Date 1527498573 -3600
-# Mon May 28 10:09:33 2018 +0100
-# Node ID ef176cb429c49d1c330d9575938f66b04e3fb730
-# Parent 6915dc9ae18cce5625d3a3fc74b37da70a5b4215
-8184309, PR3596: Build warnings from GCC 7.1 on Fedora 26
-Reviewed-by: kbarrett, vlivanov
-
-diff --git openjdk.orig/hotspot/src/share/vm/code/dependencies.cpp openjdk/hotspot/src/share/vm/code/dependencies.cpp
---- openjdk.orig/hotspot/src/share/vm/code/dependencies.cpp
-+++ openjdk/hotspot/src/share/vm/code/dependencies.cpp
-@@ -525,7 +525,7 @@
- xtty->object("x", arg.metadata_value());
- }
- } else {
-- char xn[10]; sprintf(xn, "x%d", j);
-+ char xn[12]; sprintf(xn, "x%d", j);
- if (arg.is_oop()) {
- xtty->object(xn, arg.oop_value());
- } else {
diff --git a/8185723-pr3553.patch b/8185723-pr3553.patch
deleted file mode 100644
index f8ee50a..0000000
--- a/8185723-pr3553.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# HG changeset patch
-# User aph
-# Date 1501690960 -3600
-# Wed Aug 02 17:22:40 2017 +0100
-# Node ID 91ab2eac9856ec86c16c0bedd32e0b87974ead6f
-# Parent 4e2adbc3d2b512f6b2bf318d2db60f4d1903f8c7
-8185723, PR3553: Zero: segfaults on Power PC 32-bit
-Reviewed-by: roland
-
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-@@ -38,10 +38,10 @@
- static void atomic_copy64(volatile void *src, volatile void *dst) {
- #if defined(PPC32)
- double tmp;
-- asm volatile ("lfd %0, 0(%1)\n"
-- "stfd %0, 0(%2)\n"
-- : "=f"(tmp)
-- : "b"(src), "b"(dst));
-+ asm volatile ("lfd %0, %2\n"
-+ "stfd %0, %1\n"
-+ : "=&f"(tmp), "=Q"(*(volatile double*)dst)
-+ : "Q"(*(volatile double*)src));
- #elif defined(S390) && !defined(_LP64)
- double tmp;
- asm volatile ("ld %0, 0(%1)\n"
diff --git a/8186461-pr3557.patch b/8186461-pr3557.patch
deleted file mode 100644
index cc8020c..0000000
--- a/8186461-pr3557.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User glaubitz
-# Date 1524889690 -3600
-# Sat Apr 28 05:28:10 2018 +0100
-# Node ID be1379a186ba527b32c93a83e04c9600735fe44b
-# Parent 91ab2eac9856ec86c16c0bedd32e0b87974ead6f
-8186461, PR3557: Zero's atomic_copy64() should use SPE instructions on linux-powerpcspe
-Reviewed-by: aph
-
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-@@ -36,12 +36,18 @@
-
- // Atomically copy 64 bits of data
- static void atomic_copy64(volatile void *src, volatile void *dst) {
--#if defined(PPC32)
-+#if defined(PPC32) && !defined(__SPE__)
- double tmp;
- asm volatile ("lfd %0, %2\n"
- "stfd %0, %1\n"
- : "=&f"(tmp), "=Q"(*(volatile double*)dst)
- : "Q"(*(volatile double*)src));
-+#elif defined(PPC32) && defined(__SPE__)
-+ long tmp;
-+ asm volatile ("evldd %0, %2\n"
-+ "evstdd %0, %1\n"
-+ : "=&r"(tmp), "=Q"(*(volatile long*)dst)
-+ : "Q"(*(volatile long*)src));
- #elif defined(S390) && !defined(_LP64)
- double tmp;
- asm volatile ("ld %0, 0(%1)\n"
diff --git a/8188030-pr3459-rh1484079.patch b/8188030-pr3459-rh1484079.patch
deleted file mode 100644
index 8564c81..0000000
--- a/8188030-pr3459-rh1484079.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User neugens
-# Date 1507735508 -3600
-# Wed Oct 11 16:25:08 2017 +0100
-# Node ID 5b91bf11d0f41a6124ffb0fcd8870507b50bd734
-# Parent 7b1a2f967cd8e950fe7dc47d716af13d36239a38
-8188030, PR3459, RH1484079: AWT java apps fail to start when some minimal fonts are present
-Summary: Handle CFF fonts
-Reviewed-by: andrew, prr
-
-diff --git a/src/solaris/native/sun/awt/fontpath.c b/src/solaris/native/sun/awt/fontpath.c
---- openjdk/jdk/src/solaris/native/sun/awt/fontpath.c
-+++ openjdk/jdk/src/solaris/native/sun/awt/fontpath.c
-@@ -1233,6 +1233,7 @@
- && (strcmp((char*)fontformat, "TrueType") != 0)
- #if defined(__linux__) || defined(_AIX)
- && (strcmp((char*)fontformat, "Type 1") != 0)
-+ && (strcmp((char*)fontformat, "CFF") != 0)
- #endif
- ) {
- continue;
diff --git a/8197429-pr3546-rh1536622.patch b/8197429-pr3546-rh1536622.patch
deleted file mode 100644
index fc60cd3..0000000
--- a/8197429-pr3546-rh1536622.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -r eecfc14e66ee src/os/linux/vm/os_linux.cpp
---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp Mon Jan 22 16:25:24 2018 +0000
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Wed Feb 21 13:52:31 2018 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 2018, 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
-@@ -674,6 +674,10 @@
- }
- }
-
-+void os::Linux::expand_stack_to(address bottom) {
-+ _expand_stack_to(bottom);
-+}
-+
- bool os::Linux::manually_expand_stack(JavaThread * t, address addr) {
- assert(t!=NULL, "just checking");
- assert(t->osthread()->expanding_stack(), "expand should be set");
-diff -r eecfc14e66ee src/os/linux/vm/os_linux.hpp
---- openjdk/hotspot/src/os/linux/vm/os_linux.hpp Mon Jan 22 16:25:24 2018 +0000
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.hpp Wed Feb 21 13:52:31 2018 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 2018, 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
-@@ -245,6 +245,8 @@
- static int safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime);
-
- private:
-+ static void expand_stack_to(address bottom);
-+
- typedef int (*sched_getcpu_func_t)(void);
- typedef int (*numa_node_to_cpus_func_t)(int node, unsigned long *buffer, int bufferlen);
- typedef int (*numa_max_node_func_t)(void);
-diff -r eecfc14e66ee src/os_cpu/linux_x86/vm/os_linux_x86.cpp
---- openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Mon Jan 22 16:25:24 2018 +0000
-+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Wed Feb 21 13:52:31 2018 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 2018, 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
-@@ -892,6 +892,25 @@
- void os::workaround_expand_exec_shield_cs_limit() {
- #if defined(IA32)
- size_t page_size = os::vm_page_size();
-+
-+ /*
-+ * JDK-8197429
-+ *
-+ * Expand the stack mapping to the end of the initial stack before
-+ * attempting to install the codebuf. This is needed because newer
-+ * Linux kernels impose a distance of a megabyte between stack
-+ * memory and other memory regions. If we try to install the
-+ * codebuf before expanding the stack the installation will appear
-+ * to succeed but we'll get a segfault later if we expand the stack
-+ * in Java code.
-+ *
-+ */
-+ if (os::Linux::is_initial_thread()) {
-+ address limit = Linux::initial_thread_stack_bottom();
-+ limit += (StackYellowPages + StackRedPages) * page_size;
-+ os::Linux::expand_stack_to(limit);
-+ }
-+
- /*
- * Take the highest VA the OS will give us and exec
- *
-@@ -910,6 +929,16 @@
- char* hint = (char*) (Linux::initial_thread_stack_bottom() -
- ((StackYellowPages + StackRedPages + 1) * page_size));
- char* codebuf = os::attempt_reserve_memory_at(page_size, hint);
-+
-+ if (codebuf == NULL) {
-+ // JDK-8197429: There may be a stack gap of one megabyte between
-+ // the limit of the stack and the nearest memory region: this is a
-+ // Linux kernel workaround for CVE-2017-1000364. If we failed to
-+ // map our codebuf, try again at an address one megabyte lower.
-+ hint -= 1 * M;
-+ codebuf = os::attempt_reserve_memory_at(page_size, hint);
-+ }
-+
- if ( (codebuf == NULL) || (!os::commit_memory(codebuf, page_size, true)) ) {
- return; // No matter, we tried, best effort.
- }
diff --git a/8197546-pr3542-rh1402819.patch b/8197546-pr3542-rh1402819.patch
deleted file mode 100644
index ba712ad..0000000
--- a/8197546-pr3542-rh1402819.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# HG changeset patch
-# User prr
-# Date 1518454604 28800
-# Mon Feb 12 08:56:44 2018 -0800
-# Node ID 556adf3a76aa81bf3918d7d46554dae7cc1d5c5c
-# Parent b77308735540644d4710244e3c88865067f2905a
-8197546: Fix for 8171000 breaks Solaris + Linux builds
-Reviewed-by: serb, jdv
-
-diff --git openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
---- openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c
-+++ openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
-@@ -395,6 +395,8 @@
- list_ptr regions;/* list of regions to read from */
- {
- XImage *ximage ;
-+ image_region_type* reg;
-+ int32_t rect;
-
- ximage = XCreateImage(disp,fakeVis,(uint32_t) depth,format,0,NULL,
- (uint32_t)width,(uint32_t)height,8,0);
-@@ -402,11 +404,11 @@
- ximage->data = calloc(ximage->bytes_per_line*height*((format==ZPixmap)? 1 : depth), sizeof(char));
- ximage->bits_per_pixel = depth; /** Valid only if format is ZPixmap ***/
-
-- for (image_region_type* reg = (image_region_type *) first_in_list( regions); reg;
-+ for (reg = (image_region_type *) first_in_list( regions); reg;
- reg = (image_region_type *) next_in_list( regions))
- {
- struct my_XRegion *vis_reg = (struct my_XRegion *)(reg->visible_region);
-- for (int32_t rect = 0; rect < vis_reg->numRects; rect++)
-+ for (rect = 0; rect < vis_reg->numRects; rect++)
- {
- /** ------------------------------------------------------------------------
- Intersect bbox with visible part of region giving src rect & output
diff --git a/8197981-pr3548.patch b/8197981-pr3548.patch
deleted file mode 100644
index 5f6d9ce..0000000
--- a/8197981-pr3548.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1518667645 0
-# Thu Feb 15 04:07:25 2018 +0000
-# Node ID 1d35411eb7bdf16191e220ffe3b1dc4d5d0c6041
-# Parent 999983606f5c61b093c6f6316a7b26c4cd4ca79e
-8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
-Summary: Fix issue discovered by -Wreturn-type on systems without LP64.
-Reviewed-by: aph
-
-diff --git openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-@@ -457,6 +457,7 @@
- long long unsigned int oldval,
- long long unsigned int newval) {
- ShouldNotCallThis();
-+ return 0;
- }
- };
- #endif // !_LP64
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-@@ -498,6 +498,7 @@
- long long unsigned int oldval,
- long long unsigned int newval) {
- ShouldNotCallThis();
-+ return 0;
- }
- };
- #endif // !_LP64
diff --git a/8199936-pr3533-workaround.patch b/8199936-pr3533-workaround.patch
deleted file mode 100644
index 900e0c3..0000000
--- a/8199936-pr3533-workaround.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1526122977 -3600
-# Sat May 12 12:02:57 2018 +0100
-# Node ID 00ccc73498628a51a45301322e64ce2ad06e49be
-# Parent aecf9f48f7b5c6148b62713a6b746301435b57cc
-PR3533: HotSpot generates code with unaligned stack, crashes on SSE operations
-Summary: Enable -mstackrealign on x86 Linux as well as x86 Mac OS X
-
-diff --git openjdk.orig///common/autoconf/hotspot-spec.gmk.in openjdk///common/autoconf/hotspot-spec.gmk.in
---- openjdk.orig///common/autoconf/hotspot-spec.gmk.in
-+++ openjdk///common/autoconf/hotspot-spec.gmk.in
-@@ -110,7 +110,8 @@
- RC:=@HOTSPOT_RC@
-
- EXTRA_CFLAGS=@LEGACY_EXTRA_CFLAGS@ $(NO_DELETE_NULL_POINTER_CHECKS_CFLAG) \
-- $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG)
-+ $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG) \
-+ $(REALIGN_CFLAG)
- EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@
- EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@
-
-diff --git openjdk.orig///common/autoconf/spec.gmk.in openjdk///common/autoconf/spec.gmk.in
---- openjdk.orig///common/autoconf/spec.gmk.in
-+++ openjdk///common/autoconf/spec.gmk.in
-@@ -333,6 +333,7 @@
-
- NO_DELETE_NULL_POINTER_CHECKS_CFLAG=@NO_DELETE_NULL_POINTER_CHECKS_CFLAG@
- NO_LIFETIME_DSE_CFLAG=@NO_LIFETIME_DSE_CFLAG@
-+REALIGN_CFLAG=@REALIGN_CFLAG@
- CXXSTD_CXXFLAG=@CXXSTD_CXXFLAG@
-
- CXX:=@FIXPATH@ @CCACHE@ @CXX@
-diff --git openjdk.orig///common/autoconf/toolchain.m4 openjdk///common/autoconf/toolchain.m4
---- openjdk.orig///common/autoconf/toolchain.m4
-+++ openjdk///common/autoconf/toolchain.m4
-@@ -796,20 +796,16 @@
- #
- # NOTE: check for -mstackrealign needs to be below potential addition of -m32
- #
-- if test "x$OPENJDK_TARGET_CPU_BITS" = x32 && test "x$OPENJDK_TARGET_OS" = xmacosx; then
-+ if test "x$OPENJDK_TARGET_CPU" = xx86 && test "x$OPENJDK_TARGET_OS" = xmacosx -o \
-+ "x$OPENJDK_TARGET_OS" = xlinux; then
- # On 32-bit MacOSX the OS requires C-entry points to be 16 byte aligned.
-- # While waiting for a better solution, the current workaround is to use -mstackrealign.
-- CFLAGS="$CFLAGS -mstackrealign"
-- AC_MSG_CHECKING([if 32-bit compiler supports -mstackrealign])
-- AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],
-- [
-- AC_MSG_RESULT([yes])
-- ],
-- [
-- AC_MSG_RESULT([no])
-- AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.])
-- ]
-+ # While waiting for a better solution, the current workaround is to use -mstackrealign
-+ # This is also required on Linux systems which use libraries compiled with SSE instructions
-+ REALIGN_CFLAG="-mstackrealign"
-+ TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([$REALIGN_CFLAG -Werror], [],
-+ AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.])
- )
-+ AC_SUBST([REALIGN_CFLAG])
- fi
-
- C_FLAG_DEPS="-MMD -MF"
diff --git a/8201509-pr3579.patch b/8201509-pr3579.patch
deleted file mode 100644
index 132c225..0000000
--- a/8201509-pr3579.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-# HG changeset patch
-# User mbalao
-# Date 1525317412 -3600
-# Thu May 03 04:16:52 2018 +0100
-# Node ID de79964656fc652f2085dac4fe99bcc128b5a3b1
-# Parent ffd5260fe5adcb26f87a14f1aaaf3e1a075d712a
-8201509, PR3579: Zero: S390 31bit atomic_copy64 inline assembler is wrong
-Summary: The inline assembler for the S390 (S390 and not _LP64) has src and dst reversed thereby corrupting data
-Reviewed-by: shade
-
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-@@ -1,6 +1,6 @@
- /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-- * Copyright 2007, 2008, 2010 Red Hat, Inc.
-+ * Copyright 2007, 2008, 2010, 2018, 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
-@@ -50,10 +50,10 @@
- : "Q"(*(volatile long*)src));
- #elif defined(S390) && !defined(_LP64)
- double tmp;
-- asm volatile ("ld %0, 0(%1)\n"
-- "std %0, 0(%2)\n"
-- : "=r"(tmp)
-- : "a"(src), "a"(dst));
-+ asm volatile ("ld %0, %2\n"
-+ "std %0, %1\n"
-+ : "=&f"(tmp), "=Q"(*(volatile double*)dst)
-+ : "Q"(*(volatile double*)src));
- #elif defined(__ARM_ARCH_7A__)
- jlong tmp;
- asm volatile ("ldrexd %0, [%1]\n"
diff --git a/8203182-pr3603-rh1568033.patch b/8203182-pr3603-rh1568033.patch
deleted file mode 100644
index 031a60c..0000000
--- a/8203182-pr3603-rh1568033.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-# HG changeset patch
-# User igerasim
-# Date 1528992969 25200
-# Thu Jun 14 09:16:09 2018 -0700
-# Node ID d9b0b4bd2526818afa73b60da77403245554caa8
-# Parent 1f4b038b9550afaf88a70cee4cf9c1422ecd86d6
-8203182, PR3603: Release session if initialization of SunPKCS11 Signature fails
-Summary: Ensure session is properly released in P11Signature class
-Reviewed-by: valeriep
-Contributed-by: Martin Balao <mbalao(a)redhat.com>
-
-diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java
---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java
-+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java
-@@ -309,47 +309,51 @@
- session = token.killSession(session);
- return;
- }
-- // "cancel" operation by finishing it
-- // XXX make sure all this always works correctly
-- if (mode == M_SIGN) {
-- try {
-- if (type == T_UPDATE) {
-- token.p11.C_SignFinal(session.id(), 0);
-- } else {
-- byte[] digest;
-- if (type == T_DIGEST) {
-- digest = md.digest();
-- } else { // T_RAW
-- digest = buffer;
-+ try {
-+ // "cancel" operation by finishing it
-+ // XXX make sure all this always works correctly
-+ if (mode == M_SIGN) {
-+ try {
-+ if (type == T_UPDATE) {
-+ token.p11.C_SignFinal(session.id(), 0);
-+ } else {
-+ byte[] digest;
-+ if (type == T_DIGEST) {
-+ digest = md.digest();
-+ } else { // T_RAW
-+ digest = buffer;
-+ }
-+ token.p11.C_Sign(session.id(), digest);
- }
-- token.p11.C_Sign(session.id(), digest);
-+ } catch (PKCS11Exception e) {
-+ throw new ProviderException("cancel failed", e);
- }
-- } catch (PKCS11Exception e) {
-- throw new ProviderException("cancel failed", e);
-+ } else { // M_VERIFY
-+ try {
-+ byte[] signature;
-+ if (keyAlgorithm.equals("DSA")) {
-+ signature = new byte[40];
-+ } else {
-+ signature = new byte[(p11Key.length() + 7) >> 3];
-+ }
-+ if (type == T_UPDATE) {
-+ token.p11.C_VerifyFinal(session.id(), signature);
-+ } else {
-+ byte[] digest;
-+ if (type == T_DIGEST) {
-+ digest = md.digest();
-+ } else { // T_RAW
-+ digest = buffer;
-+ }
-+ token.p11.C_Verify(session.id(), digest, signature);
-+ }
-+ } catch (PKCS11Exception e) {
-+ // will fail since the signature is incorrect
-+ // XXX check error code
-+ }
- }
-- } else { // M_VERIFY
-- try {
-- byte[] signature;
-- if (keyAlgorithm.equals("DSA")) {
-- signature = new byte[40];
-- } else {
-- signature = new byte[(p11Key.length() + 7) >> 3];
-- }
-- if (type == T_UPDATE) {
-- token.p11.C_VerifyFinal(session.id(), signature);
-- } else {
-- byte[] digest;
-- if (type == T_DIGEST) {
-- digest = md.digest();
-- } else { // T_RAW
-- digest = buffer;
-- }
-- token.p11.C_Verify(session.id(), digest, signature);
-- }
-- } catch (PKCS11Exception e) {
-- // will fail since the signature is incorrect
-- // XXX check error code
-- }
-+ } finally {
-+ session = token.releaseSession(session);
- }
- }
-
-@@ -368,6 +372,8 @@
- }
- initialized = true;
- } catch (PKCS11Exception e) {
-+ // release session when initialization failed
-+ session = token.releaseSession(session);
- throw new ProviderException("Initialization failed", e);
- }
- if (bytesProcessed != 0) {
-@@ -529,6 +535,8 @@
- }
- bytesProcessed += len;
- } catch (PKCS11Exception e) {
-+ initialized = false;
-+ session = token.releaseSession(session);
- throw new ProviderException(e);
- }
- break;
-@@ -576,6 +584,8 @@
- bytesProcessed += len;
- byteBuffer.position(ofs + len);
- } catch (PKCS11Exception e) {
-+ initialized = false;
-+ session = token.releaseSession(session);
- throw new ProviderException("Update failed", e);
- }
- break;
diff --git a/8205104-pr3539-rh1548475.patch b/8205104-pr3539-rh1548475.patch
deleted file mode 100644
index 9b40a7f..0000000
--- a/8205104-pr3539-rh1548475.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1526065930 -3600
-# Fri May 11 20:12:10 2018 +0100
-# Node ID b8fc1e640c4c7f38ca94131279cb67c4d3de6961
-# Parent afb31413c73cbc06420fdb447aa90a7a38258904
-PR3539, RH1548475: Pass EXTRA_LDFLAGS to HotSpot build
-
-diff --git openjdk.orig/hotspot/make/aix/makefiles/jsig.make openjdk/hotspot/make/aix/makefiles/jsig.make
---- openjdk.orig/hotspot/make/aix/makefiles/jsig.make
-+++ openjdk/hotspot/make/aix/makefiles/jsig.make
-@@ -45,7 +45,7 @@
- # cause problems with interposing. See CR: 6466665
- # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
-
--LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE)
-+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
-
- LFLAGS_JSIG += $(BIN_UTILS)
-
-diff --git openjdk.orig/hotspot/make/aix/makefiles/saproc.make openjdk/hotspot/make/aix/makefiles/saproc.make
---- openjdk.orig/hotspot/make/aix/makefiles/saproc.make
-+++ openjdk/hotspot/make/aix/makefiles/saproc.make
-@@ -66,7 +66,7 @@
- endif
-
-
--SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
-+SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
-
- $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
- $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
-diff --git openjdk.orig/hotspot/make/aix/makefiles/vm.make openjdk/hotspot/make/aix/makefiles/vm.make
---- openjdk.orig/hotspot/make/aix/makefiles/vm.make
-+++ openjdk/hotspot/make/aix/makefiles/vm.make
-@@ -117,7 +117,7 @@
-
- # Extra flags from gnumake's invocation or environment
- CFLAGS += $(EXTRA_CFLAGS)
--LFLAGS += $(EXTRA_CFLAGS)
-+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
-
- # Don't set excutable bit on stack segment
- # the same could be done by separate execstack command
-diff --git openjdk.orig/hotspot/make/bsd/makefiles/jsig.make openjdk/hotspot/make/bsd/makefiles/jsig.make
---- openjdk.orig/hotspot/make/bsd/makefiles/jsig.make
-+++ openjdk/hotspot/make/bsd/makefiles/jsig.make
-@@ -52,7 +52,7 @@
- # cause problems with interposing. See CR: 6466665
- # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
-
--LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE)
-+LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
-
- # DEBUG_BINARIES overrides everything, use full -g debug information
- ifeq ($(DEBUG_BINARIES), true)
-diff --git openjdk.orig/hotspot/make/bsd/makefiles/saproc.make openjdk/hotspot/make/bsd/makefiles/saproc.make
---- openjdk.orig/hotspot/make/bsd/makefiles/saproc.make
-+++ openjdk/hotspot/make/bsd/makefiles/saproc.make
-@@ -114,7 +114,7 @@
- # bring in minimum version argument or we'll fail on OSX 10.10
- SA_LFLAGS = $(LFLAGS)
- endif
--SA_LFLAGS += $(LDFLAGS_HASH_STYLE)
-+SA_LFLAGS += $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
-
- BOOT_JAVA_INCLUDES = -I$(BOOT_JAVA_HOME)/include \
- -I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]" "[:lower:]")
-diff --git openjdk.orig/hotspot/make/bsd/makefiles/vm.make openjdk/hotspot/make/bsd/makefiles/vm.make
---- openjdk.orig/hotspot/make/bsd/makefiles/vm.make
-+++ openjdk/hotspot/make/bsd/makefiles/vm.make
-@@ -119,7 +119,7 @@
-
- # Extra flags from gnumake's invocation or environment
- CFLAGS += $(EXTRA_CFLAGS)
--LFLAGS += $(EXTRA_CFLAGS)
-+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
-
- # Don't set excutable bit on stack segment
- # the same could be done by separate execstack command
-diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
---- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
-+++ openjdk/hotspot/make/linux/makefiles/jsig.make
-@@ -44,7 +44,7 @@
- # cause problems with interposing. See CR: 6466665
- # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
-
--LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK)
-+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK) $(EXTRA_LDFLAGS)
-
- # DEBUG_BINARIES overrides everything, use full -g debug information
- ifeq ($(DEBUG_BINARIES), true)
-diff --git openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
---- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
-+++ openjdk/hotspot/make/linux/makefiles/saproc.make
-@@ -73,7 +73,7 @@
- else
- ALT_SAINCDIR=
- endif
--SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
-+SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
-
- SAARCH ?= $(BUILDARCH)
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
---- openjdk.orig/hotspot/make/linux/makefiles/vm.make
-+++ openjdk/hotspot/make/linux/makefiles/vm.make
-@@ -122,7 +122,7 @@
-
- # Extra flags from gnumake's invocation or environment
- CFLAGS += $(EXTRA_CFLAGS)
--LFLAGS += $(EXTRA_CFLAGS)
-+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
-
- # Don't set excutable bit on stack segment
- # the same could be done by separate execstack command
diff --git a/8206406-pr3610-rh1597825.patch b/8206406-pr3610-rh1597825.patch
deleted file mode 100644
index 0f38126..0000000
--- a/8206406-pr3610-rh1597825.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-# HG changeset patch
-# User aph
-# Date 1531146945 -3600
-# Mon Jul 09 15:35:45 2018 +0100
-# Node ID 95b72537801cc9946c27ad27f07e3f0790a21b08
-# Parent f6341f4635dacb56678264d29a88cd052b74036b
-8206406, PR3610, RH1597825: StubCodeDesc constructor publishes partially-constructed objects on StubCodeDesc::_list
-Reviewed-by: dholmes
-
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp
-@@ -34,12 +34,12 @@
-
- // Implementation of StubCodeDesc
-
--StubCodeDesc* StubCodeDesc::_list = NULL;
--int StubCodeDesc::_count = 0;
-+StubCodeDesc* volatile StubCodeDesc::_list = NULL;
-+int StubCodeDesc::_count = 0;
-
-
- StubCodeDesc* StubCodeDesc::desc_for(address pc) {
-- StubCodeDesc* p = _list;
-+ StubCodeDesc* p = (StubCodeDesc*)OrderAccess::load_ptr_acquire(&_list);
- while (p != NULL && !p->contains(pc)) p = p->_next;
- // p == NULL || p->contains(pc)
- return p;
-@@ -47,7 +47,7 @@
-
-
- StubCodeDesc* StubCodeDesc::desc_for_index(int index) {
-- StubCodeDesc* p = _list;
-+ StubCodeDesc* p = (StubCodeDesc*)OrderAccess::load_ptr_acquire(&_list);
- while (p != NULL && p->index() != index) p = p->_next;
- return p;
- }
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp
---- openjdk.orig/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp
-+++ openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp
-@@ -38,7 +38,7 @@
-
- class StubCodeDesc: public CHeapObj<mtCode> {
- protected:
-- static StubCodeDesc* _list; // the list of all descriptors
-+ static StubCodeDesc* volatile _list; // the list of all descriptors
- static int _count; // length of list
-
- StubCodeDesc* _next; // the next element in the linked list
-@@ -69,13 +69,13 @@
-
- StubCodeDesc(const char* group, const char* name, address begin) {
- assert(name != NULL, "no name specified");
-- _next = _list;
-+ _next = (StubCodeDesc*)OrderAccess::load_ptr_acquire(&_list);
- _group = group;
- _name = name;
- _index = ++_count; // (never zero)
- _begin = begin;
- _end = NULL;
-- _list = this;
-+ OrderAccess::release_store_ptr(&_list, this);
- };
-
- const char* group() const { return _group; }
diff --git a/8206425-hotspot-remove-debuglink.patch b/8206425-hotspot-remove-debuglink.patch
deleted file mode 100644
index adbf1f0..0000000
--- a/8206425-hotspot-remove-debuglink.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-# HG changeset patch
-# User sgehwolf
-# Date 1530808022 -7200
-# Thu Jul 05 18:27:02 2018 +0200
-# Node ID 5ba59d58d976db456c4455640111e8107b8d80e8
-# Parent ad057f2e3211cd18bc56550d8a2c400d92ec35b1
-8206425: .gnu_debuglink sections added unconditionally when no debuginfo is stripped
-Summary: Only add .gnu_debuglink sections when there is some stripping done.
-Reviewed-by: erikj, dholmes
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
---- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
-+++ openjdk/hotspot/make/linux/makefiles/jsig.make
-@@ -57,14 +57,15 @@
- $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
-+ ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
-- ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(STRIP) $@
- else
- ifeq ($(STRIP_POLICY),min_strip)
-+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
- $(QUIETLY) $(STRIP) -g $@
-+ endif
- # implied else here is no stripping at all
-- endif
- endif
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- $(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO)
-diff --git openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
---- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
-+++ openjdk/hotspot/make/linux/makefiles/saproc.make
-@@ -100,14 +100,15 @@
- -lthread_db
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
-+ ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
-- ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(STRIP) $@
- else
- ifeq ($(STRIP_POLICY),min_strip)
-+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
- $(QUIETLY) $(STRIP) -g $@
-+ endif
- # implied else here is no stripping at all
-- endif
- endif
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- $(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO)
-diff --git openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
---- openjdk.orig/hotspot/make/linux/makefiles/vm.make
-+++ openjdk/hotspot/make/linux/makefiles/vm.make
-@@ -358,14 +358,15 @@
-
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
-+ ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
-- ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(STRIP) $@
- else
- ifeq ($(STRIP_POLICY),min_strip)
-+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
- $(QUIETLY) $(STRIP) -g $@
-+ endif
- # implied else here is no stripping at all
-- endif
- endif
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
diff --git a/8207057-pr3613-assembler-debuginfo-hotspot.patch b/8207057-pr3613-assembler-debuginfo-hotspot.patch
deleted file mode 100644
index c61d972..0000000
--- a/8207057-pr3613-assembler-debuginfo-hotspot.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- openjdk/hotspot/make/linux/makefiles/gcc.make 2018-09-17 15:40:56.933127667 +0200
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2018-09-17 15:40:56.831127850 +0200
-@@ -184,6 +184,10 @@
- LFLAGS += $(ARCHFLAG)
- ASFLAGS += $(ARCHFLAG)
-
-+ifeq ($(DEBUG_BINARIES), true)
-+ ASFLAGS += $(ASFLAGS_DEBUG_SYMBOLS)
-+endif
-+
- # Use C++ Interpreter
- ifdef CC_INTERP
- CFLAGS += -DCC_INTERP
diff --git a/8207057-pr3613-assembler-debuginfo-root.patch b/8207057-pr3613-assembler-debuginfo-root.patch
deleted file mode 100644
index 7f57c0a..0000000
--- a/8207057-pr3613-assembler-debuginfo-root.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- openjdk/common/autoconf/toolchain.m4 2018-09-17 15:35:40.783695320 +0200
-+++ openjdk/common/autoconf/toolchain.m4 2018-09-17 15:35:40.608695635 +0200
-@@ -814,6 +814,10 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION],
-
- C_FLAG_DEPS="-MMD -MF"
- CXX_FLAG_DEPS="-MMD -MF"
-+ # By default don't set any specific assembler debug
-+ # info flags for toolchains unless we know they work.
-+ # See JDK-8207057.
-+ ASFLAGS_DEBUG_SYMBOLS=""
-
- case $COMPILER_TYPE in
- CC )
-@@ -842,6 +846,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION],
- CFLAGS_DEBUG_SYMBOLS="-g1"
- CXXFLAGS_DEBUG_SYMBOLS="-g1"
- fi
-+ ASFLAGS_DEBUG_SYMBOLS="-g"
- ;;
- ossc )
- #
-@@ -969,6 +974,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION],
- AC_SUBST(CXX_O_FLAG_NONE)
- AC_SUBST(C_FLAG_DEPS)
- AC_SUBST(CXX_FLAG_DEPS)
-+ AC_SUBST(ASFLAGS_DEBUG_SYMBOLS)
- ])
-
- AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_JDK],
---- openjdk/common/autoconf/spec.gmk.in 2018-09-17 15:35:43.324690758 +0200
-+++ openjdk/common/autoconf/spec.gmk.in 2018-09-17 15:35:43.169691036 +0200
-@@ -414,6 +414,7 @@
- # Options for generating debug symbols
- ENABLE_DEBUG_SYMBOLS:=@ENABLE_DEBUG_SYMBOLS@
- CFLAGS_DEBUG_SYMBOLS:=@CFLAGS_DEBUG_SYMBOLS@
-+ASFLAGS_DEBUG_SYMBOLS:=@ASFLAGS_DEBUG_SYMBOLS@
- CXXFLAGS_DEBUG_SYMBOLS:=@CXXFLAGS_DEBUG_SYMBOLS@
- ZIP_DEBUGINFO_FILES:=@ZIP_DEBUGINFO_FILES@
- STRIP_POLICY:=@STRIP_POLICY@
diff --git a/8210425-01-rh1630426-hotspot-opt-fix.patch b/8210425-01-rh1630426-hotspot-opt-fix.patch
deleted file mode 100644
index 0b05ba6..0000000
--- a/8210425-01-rh1630426-hotspot-opt-fix.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git openjdk.orig/hotspot/make/linux/makefiles/amd64.make openjdk/hotspot/make/linux/makefiles/amd64.make
---- openjdk.orig/hotspot/make/linux/makefiles/amd64.make
-+++ openjdk/hotspot/make/linux/makefiles/amd64.make
-@@ -22,10 +22,13 @@
- #
- #
-
--# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
--# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+ifeq ($(OPT_CFLAGS_NO_FMA),)
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+else
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+endif
- # Must also specify if CPU is little endian
- CFLAGS += -DVM_LITTLE_ENDIAN
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make
-@@ -225,6 +225,16 @@
- OPT_CFLAGS/SIZE=-Os
- OPT_CFLAGS/SPEED=-O3
-
-+ifeq ($(USE_CLANG),)
-+ # Only GCC 4.6 and better have machine independent -ffp-contract=off.
-+ # For other versions we need to explicitly set arch specific machine
-+ # flags or keep optimization off for them.
-+ ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 6 \) \))" "1"
-+ OPT_CFLAGS_NO_FMA = -ffp-contract=off
-+ endif
-+endif
-+
-+
- # Hotspot uses very unstrict aliasing turn this optimization off
- # This option is added to CFLAGS rather than OPT_CFLAGS
- # so that OPT_CFLAGS overrides get this option too.
-diff --git openjdk.orig/hotspot/make/linux/makefiles/i486.make openjdk/hotspot/make/linux/makefiles/i486.make
---- openjdk.orig/hotspot/make/linux/makefiles/i486.make
-+++ openjdk/hotspot/make/linux/makefiles/i486.make
-@@ -24,10 +24,13 @@
-
- # TLS helper, assembled from .s file
-
--# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
--# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+ifeq ($(OPT_CFLAGS_NO_FMA),)
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+else
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+endif
- # Must also specify if CPU is little endian
- CFLAGS += -DVM_LITTLE_ENDIAN
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/ppc64.make openjdk/hotspot/make/linux/makefiles/ppc64.make
---- openjdk.orig/hotspot/make/linux/makefiles/ppc64.make
-+++ openjdk/hotspot/make/linux/makefiles/ppc64.make
-@@ -49,3 +49,17 @@
- # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
- CFLAGS += -mcpu=power7 -mtune=power8 -minsert-sched-nops=regroup_exact -mno-multiple -mno-string
- endif
-+
-+ifeq ($(OPT_CFLAGS_NO_FMA),)
-+ ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),big)
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) -mno-fused-madd -fno-strict-aliasing
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) -mno-fused-madd -fno-strict-aliasing
-+ else
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+ endif
-+else
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+endif
-+
diff --git a/8210647-rh1630426-saproc-opt-fix.patch b/8210647-rh1630426-saproc-opt-fix.patch
deleted file mode 100644
index 0ab09e4..0000000
--- a/8210647-rh1630426-saproc-opt-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
---- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
-+++ openjdk/hotspot/make/linux/makefiles/saproc.make
-@@ -59,6 +59,11 @@
- SA_DEBUG_CFLAGS = -g
- endif
-
-+# Optimize saproc lib at level -O3 unless it's a slowdebug build
-+ifneq ($(DEBUG_LEVEL), slowdebug)
-+ SA_OPT_FLAGS = $(OPT_CFLAGS)
-+endif
-+
- # if $(AGENT_DIR) does not exist, we don't build SA
- # also, we don't build SA on Itanium or zero.
-
-@@ -95,6 +100,7 @@
- $(SASRCFILES) \
- $(SA_LFLAGS) \
- $(SA_DEBUG_CFLAGS) \
-+ $(SA_OPT_FLAGS) \
- $(EXTRA_CFLAGS) \
- -o $@ \
- -lthread_db
diff --git a/8210761-rh1630426-jsig-opt-fix.patch b/8210761-rh1630426-jsig-opt-fix.patch
deleted file mode 100644
index 5f30e59..0000000
--- a/8210761-rh1630426-jsig-opt-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
---- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
-+++ openjdk/hotspot/make/linux/makefiles/jsig.make
-@@ -51,10 +51,15 @@ ifeq ($(DEBUG_BINARIES), true)
- JSIG_DEBUG_CFLAGS = -g
- endif
-
-+# Optimize jsig lib at level -O3 unless it's a slowdebug build
-+ifneq ($(DEBUG_LEVEL), slowdebug)
-+ JSIG_OPT_FLAGS = $(OPT_CFLAGS)
-+endif
-+
- $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
- @echo Making signal interposition lib...
- $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
-- $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
-+ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(JSIG_OPT_FLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
- ifeq ($(STRIP_POLICY),all_strip)
diff --git a/README.src b/README.src
deleted file mode 100644
index b5f06d1..0000000
--- a/README.src
+++ /dev/null
@@ -1,2 +0,0 @@
-The java-1.8.0-openjdk-src subpackage contains the complete OpenJDK 8
-class library source code for use by IDE indexers and debuggers.
diff --git a/enableCommentedOutSystemNss.patch b/enableCommentedOutSystemNss.patch
deleted file mode 100644
index febd87e..0000000
--- a/enableCommentedOutSystemNss.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -r 5b86f66575b7 src/share/lib/security/java.security-linux
---- openjdk/jdk/src/share/lib/security/java.security-linux Tue May 16 13:29:05 2017 -0700
-+++ openjdk/jdk/src/share/lib/security/java.security-linux Tue Jun 06 14:05:12 2017 +0200
-@@ -74,6 +74,7 @@
- security.provider.7=com.sun.security.sasl.Provider
- security.provider.8=org.jcp.xml.dsig.internal.dom.XMLDSigRI
- security.provider.9=sun.security.smartcardio.SunPCSC
-+#security.provider.10=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/nss.cfg
-
- #
- # Sun Provider SecureRandom seed source.
diff --git a/generate_singlerepo_source_tarball.sh b/generate_singlerepo_source_tarball.sh
new file mode 100644
index 0000000..62218ba
--- /dev/null
+++ b/generate_singlerepo_source_tarball.sh
@@ -0,0 +1,145 @@
+#!/bin/bash
+# Generates the 'source tarball' for JDK projects.
+#
+# Example:
+# When used from local repo set REPO_ROOT pointing to file:// with your repo
+# if your local repo follows upstream forests conventions, you may be enough by setting OPENJDK_URL
+# if you wont to use local copy of patch PR2126 set path to it to PR2126 variable
+#
+# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
+# PROJECT_NAME=jdk
+# REPO_NAME=jdk
+# VERSION=tip
+# or to eg prepare systemtap:
+# icedtea7's jstack and other tapsets
+# VERSION=6327cf1cea9e
+# REPO_NAME=icedtea7-2.6
+# PROJECT_NAME=release
+# OPENJDK_URL=http://icedtea.classpath.org/hg/
+# TO_COMPRESS="*/tapset"
+#
+# They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set)
+
+# This script creates a single source tarball out of the repository
+# based on the given tag and removes code not allowed in fedora/rhel. For
+# consistency, the source tarball will always contain 'openjdk' as the top
+# level folder, name is created, based on parameter
+#
+
+if [ ! "x$PR2126" = "x" ] ; then
+ if [ ! -f "$PR2126" ] ; then
+ echo "You have specified PR2126 as $PR2126 but it does not exists. exiting"
+ exit 1
+ fi
+fi
+
+set -e
+
+OPENJDK_URL_DEFAULT=http://hg.openjdk.java.net
+COMPRESSION_DEFAULT=xz
+
+if [ "x$1" = "xhelp" ] ; then
+ echo -e "Behaviour may be specified by setting the following variables:\n"
+ echo "VERSION - the version of the specified OpenJDK project"
+ echo "PROJECT_NAME -- the name of the OpenJDK project being archived (optional; only needed by defaults)"
+ echo "REPO_NAME - the name of the OpenJDK repository (optional; only needed by defaults)"
+ echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
+ echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
+ echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
+ echo "REPO_ROOT - the location of the Mercurial repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
+ echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
+ echo "PR2126 - the path to the PR2126 patch to apply (optional; downloaded if unavailable)"
+ exit 1;
+fi
+
+
+if [ "x$VERSION" = "x" ] ; then
+ echo "No VERSION specified"
+ exit -2
+fi
+echo "Version: ${VERSION}"
+
+# REPO_NAME is only needed when we default on REPO_ROOT and FILE_NAME_ROOT
+if [ "x$FILE_NAME_ROOT" = "x" -o "x$REPO_ROOT" = "x" ] ; then
+ if [ "x$PROJECT_NAME" = "x" ] ; then
+ echo "No PROJECT_NAME specified"
+ exit -1
+ fi
+ echo "Project name: ${PROJECT_NAME}"
+ if [ "x$REPO_NAME" = "x" ] ; then
+ echo "No REPO_NAME specified"
+ exit -3
+ fi
+ echo "Repository name: ${REPO_NAME}"
+fi
+
+if [ "x$OPENJDK_URL" = "x" ] ; then
+ OPENJDK_URL=${OPENJDK_URL_DEFAULT}
+ echo "No OpenJDK URL specified; defaulting to ${OPENJDK_URL}"
+else
+ echo "OpenJDK URL: ${OPENJDK_URL}"
+fi
+
+if [ "x$COMPRESSION" = "x" ] ; then
+ # rhel 5 needs tar.gz
+ COMPRESSION=${COMPRESSION_DEFAULT}
+fi
+echo "Creating a tar.${COMPRESSION} archive"
+
+if [ "x$FILE_NAME_ROOT" = "x" ] ; then
+ FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
+ echo "No file name root specified; default to ${FILE_NAME_ROOT}"
+fi
+if [ "x$REPO_ROOT" = "x" ] ; then
+ REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}"
+ echo "No repository root specified; default to ${REPO_ROOT}"
+fi;
+
+if [ "x$TO_COMPRESS" = "x" ] ; then
+ TO_COMPRESS="openjdk"
+ echo "No to be compressed targets specified, ; default to ${TO_COMPRESS}"
+fi;
+
+if [ -d ${FILE_NAME_ROOT} ] ; then
+ echo "exists exists exists exists exists exists exists "
+ echo "reusing reusing reusing reusing reusing reusing "
+ echo ${FILE_NAME_ROOT}
+else
+ mkdir "${FILE_NAME_ROOT}"
+ pushd "${FILE_NAME_ROOT}"
+ echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
+ hg clone ${REPO_ROOT} openjdk -r ${VERSION}
+ popd
+fi
+pushd "${FILE_NAME_ROOT}"
+ if [ -d openjdk/src ]; then
+ pushd openjdk
+ echo "Removing EC source code we don't build"
+ CRYPTO_PATH=src/jdk.crypto.ec/share/native/libsunec/impl
+ rm -vrf $CRYPTO_PATH
+ echo "Syncing EC list with NSS"
+ if [ "x$PR2126" = "x" ] ; then
+ # orriginally for 8:
+ # get pr2126.patch (from http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8d2c9a898f50) from most correct tag
+ # Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2126)
+ # there is currnetly no "upstram version of this patch, hardcoding custom version
+ PR2126="../../pr2126-11.patch"
+ fi;
+ echo "Applying ${PR2126}"
+ patch -Np1 < $PR2126
+ find . -name '*.orig' -exec rm -vf '{}' ';'
+ popd
+ fi
+
+ echo "Compressing remaining forest"
+ if [ "X$COMPRESSION" = "Xxz" ] ; then
+ SWITCH=cJf
+ else
+ SWITCH=czf
+ fi
+ tar --exclude-vcs -$SWITCH ${FILE_NAME_ROOT}.tar.${COMPRESSION} $TO_COMPRESS
+ mv ${FILE_NAME_ROOT}.tar.${COMPRESSION} ..
+popd
+echo "Done. You may want to remove the uncompressed version - $FILE_NAME_ROOT."
+
+
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
new file mode 100755
index 0000000..ecbc982
--- /dev/null
+++ b/generate_source_tarball.sh
@@ -0,0 +1,152 @@
+#!/bin/bash
+# Generates the 'source tarball' for JDK 8 projects.
+#
+# Example:
+# When used from local repo set REPO_ROOT pointing to file:// with your repo
+# If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL
+# If you want to use a local copy of patch PR3667, set the path to it in the PR3667 variable
+#
+# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
+# PROJECT_NAME=jdk8u OR aarch64-port
+# REPO_NAME=jdk8u60 OR jdk8u60
+# VERSION=jdk8u60-b27 OR aarch64-jdk8u65-b17 OR for head, keyword 'tip' should do the job there
+#
+# They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set)
+
+# This script creates a single source tarball out of the repository
+# based on the given tag and removes code not allowed in fedora/rhel. For
+# consistency, the source tarball will always contain 'openjdk' as the top
+# level folder, name is created, based on parameter
+#
+
+if [ ! "x$PR3667" = "x" ] ; then
+ if [ ! -f "$PR3667" ] ; then
+ echo "You have specified PR3667 as $PR3667 but it does not exists. exiting"
+ exit 1
+ fi
+fi
+set -e
+
+OPENJDK_URL_DEFAULT=http://hg.openjdk.java.net
+COMPRESSION_DEFAULT=xz
+# jdk is last for its size
+REPOS_DEFAULT="hotspot corba jaxws jaxp langtools nashorn jdk"
+
+if [ "x$1" = "xhelp" ] ; then
+ echo -e "Behaviour may be specified by setting the following variables:\n"
+ echo "VERSION - the version of the specified OpenJDK project"
+ echo "PROJECT_NAME -- the name of the OpenJDK project being archived (optional; only needed by defaults)"
+ echo "REPO_NAME - the name of the OpenJDK repository (optional; only needed by defaults)"
+ echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
+ echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
+ echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
+ echo "REPO_ROOT - the location of the Mercurial repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
+ echo "PR3667 - the path to the PR3667 patch to apply (optional; downloaded if unavailable)"
+ echo "REPOS - specify the repositories to use (optional; defaults to ${REPOS_DEFAULT})"
+ exit 1;
+fi
+
+
+if [ "x$VERSION" = "x" ] ; then
+ echo "No VERSION specified"
+ exit -2
+fi
+echo "Version: ${VERSION}"
+
+# REPO_NAME is only needed when we default on REPO_ROOT and FILE_NAME_ROOT
+if [ "x$FILE_NAME_ROOT" = "x" -o "x$REPO_ROOT" = "x" ] ; then
+ if [ "x$PROJECT_NAME" = "x" ] ; then
+ echo "No PROJECT_NAME specified"
+ exit -1
+ fi
+ echo "Project name: ${PROJECT_NAME}"
+ if [ "x$REPO_NAME" = "x" ] ; then
+ echo "No REPO_NAME specified"
+ exit -3
+ fi
+ echo "Repository name: ${REPO_NAME}"
+fi
+
+if [ "x$OPENJDK_URL" = "x" ] ; then
+ OPENJDK_URL=${OPENJDK_URL_DEFAULT}
+ echo "No OpenJDK URL specified; defaulting to ${OPENJDK_URL}"
+else
+ echo "OpenJDK URL: ${OPENJDK_URL}"
+fi
+
+if [ "x$COMPRESSION" = "x" ] ; then
+# rhel 5 needs tar.gz
+ COMPRESSION=${COMPRESSION_DEFAULT}
+fi
+echo "Creating a tar.${COMPRESSION} archive"
+
+if [ "x$FILE_NAME_ROOT" = "x" ] ; then
+ FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
+ echo "No file name root specified; default to ${FILE_NAME_ROOT}"
+fi
+if [ "x$REPO_ROOT" = "x" ] ; then
+ REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}"
+ echo "No repository root specified; default to ${REPO_ROOT}"
+fi;
+
+mkdir "${FILE_NAME_ROOT}"
+pushd "${FILE_NAME_ROOT}"
+
+echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
+hg clone ${REPO_ROOT} openjdk -r ${VERSION}
+pushd openjdk
+
+
+if [ "x$REPOS" = "x" ] ; then
+ repos=${REPOS_DEFAULT}
+ echo "No repositories specified; defaulting to ${repos}"
+else
+ repos=$REPOS
+ echo "Repositories: ${repos}"
+fi;
+
+for subrepo in $repos
+do
+ echo "Cloning ${VERSION} ${subrepo} repository from ${REPO_ROOT}"
+ hg clone ${REPO_ROOT}/${subrepo} -r ${VERSION}
+done
+
+if [ -d jdk ]; then
+echo "Removing EC source code we don't build"
+rm -vf jdk/src/share/native/sun/security/ec/impl/ec2.h
+rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_163.c
+rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_193.c
+rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_233.c
+rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_aff.c
+rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_mont.c
+rm -vf jdk/src/share/native/sun/security/ec/impl/ecp_192.c
+rm -vf jdk/src/share/native/sun/security/ec/impl/ecp_224.c
+
+echo "Syncing EC list with NSS"
+
+if [ "x$PR3667" = "x" ] ; then
+# get pr3667.patch (from http://icedtea.classpath.org/hg/icedtea8) from most correct tag
+# Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3667)
+ wget http://icedtea.classpath.org/hg/icedtea8/raw-file/tip/patches/pr3667.patch
+ patch -Np1 < pr3667.patch
+ rm pr3667.patch
+else
+ echo "Applying ${PR3667}"
+ patch -Np1 < $PR3667
+fi;
+fi
+find . -name '*.orig' -exec rm -vf '{}' ';'
+
+popd
+echo "Compressing remaining forest"
+if [ "X$COMPRESSION" = "Xxz" ] ; then
+ tar --exclude-vcs -cJf ${FILE_NAME_ROOT}.tar.${COMPRESSION} openjdk
+else
+ tar --exclude-vcs -czf ${FILE_NAME_ROOT}.tar.${COMPRESSION} openjdk
+fi
+
+mv ${FILE_NAME_ROOT}.tar.${COMPRESSION} ..
+popd
+echo "Done. You may want to remove the uncompressed version."
+
+
diff --git a/java-1.8.0-openjdk-aarch32.spec b/java-1.8.0-openjdk-aarch32.spec
index 14e81e7..d8287df 100644
--- a/java-1.8.0-openjdk-aarch32.spec
+++ b/java-1.8.0-openjdk-aarch32.spec
@@ -21,7 +21,11 @@
# Enable release builds by default on relevant arches.
%bcond_without release
-%define _find_debuginfo_opts -g
+# The -g flag says to use strip -g instead of full strip on DSOs or EXEs.
+# This fixes detailed NMT and other tools which need minimal debug info.
+# See: https://bugzilla.redhat.com/show_bug.cgi?id=1520879
+%global _find_debuginfo_opts -g
+
# note: parametrized macros are order-sensitive (unlike not-parametrized) even with normal macros
# also necessary when passing it as parameter to other macros. If not macro, then it is considered a switch
# see the difference between global and define:
@@ -55,6 +59,7 @@
%global ppc64be ppc64 ppc64p7
%global multilib_arches %{power64} sparc64 x86_64
%global jit_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm}
+%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64}
# By default, we build a debug build during main build on JIT architectures
%if %{with slowdebug}
@@ -212,7 +217,7 @@
# links src files
# maybe depend on jfx and generate the lists in build time? Yes, bad idea to inlcude cyclic depndenci, but this list is aweful
%global jfx_jre_libs jfxswt.jar javafx.properties
-%global jfx_jre_native libprism_es2.so libprism_common.so libjavafx_font.so libdecora_sse.so libjavafx_font_freetype.so libprism_sw.so libjavafx_font_pango.so libglass.so libjavafx_iio.so
+%global jfx_jre_native libprism_es2.so libprism_common.so libjavafx_font.so libdecora_sse.so libjavafx_font_freetype.so libprism_sw.so libjavafx_font_pango.so libglass.so libjavafx_iio.so libglassgtk2.so libglassgtk3.so
%global jfx_sdk_libs javafx-mx.jar packager.jar ant-javafx.jar
%global jfx_sdk_bins javafxpackager javapackager
%global jfx_jre_exts jfxrt.jar
@@ -227,11 +232,11 @@
# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
%global shenandoah_project aarch64-port
%global shenandoah_repo jdk8u-shenandoah
-%global shenandoah_revision aarch64-shenandoah-jdk8u191-b12
+%global shenandoah_revision aarch64-shenandoah-jdk8u201-b09
# Define old aarch64/jdk8u tree variables for compatibility
%global project aarch32-port
%global repo jdk8u
-%global revision jdk8u191-b12-aarch32-181022
+%global revision jdk8u201-b09-aarch32-190124
# eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60 (dont forget spec escape % by %%)
%global whole_update %(VERSION=%{revision}; echo ${VERSION%%-*})
@@ -296,7 +301,7 @@ exit 0
# MetaspaceShared::generate_vtable_methods not implemented for PPC JIT
%ifnarch %{power64}
%ifnarch %{arm}
-#see https://bugzilla.redhat.com/show_bug.cgi?id=513605
+# see https://bugzilla.redhat.com/show_bug.cgi?id=513605
%{jrebindir -- %{?1}}/java -Xshare:dump >/dev/null 2>/dev/null
%endif
%endif
@@ -795,7 +800,7 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/ir.idl
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jconsole.jar
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/orb.idl
-%ifarch x86_64 %{ix86}
+%ifarch %{sa_arches}
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/sa-jdi.jar
%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/dt.jar
@@ -881,7 +886,6 @@ Requires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
# for java-X-openjdk package's desktop binding
Recommends: gtk2%{?_isa}
-Suggests: cups
#Provides: java-%{javaver}-%{origin} = %{epoch}:%{version}-%{release}
@@ -912,6 +916,8 @@ Requires: nss-softokn%{?_isa} %{NSSSOFTOKN_BUILDTIME_VERSION}
# considered as regression
Requires: copy-jdk-configs >= 3.3
OrderWithRequires: copy-jdk-configs
+# for printing support
+Requires: cups-libs
# Post requires alternatives to install tool alternatives
Requires(post): %{_sbindir}/alternatives
# in version 1.7 and higher for --family switch
@@ -1011,12 +1017,12 @@ OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release
}
-# Prevent brp-java-repack-jars from being run.
+# Prevent brp-java-repack-jars from being run
%global __jar_repack 0
Name: java-%{javaver}-%{origin}-aarch32
Version: %{javaver}.%{updatever}.%{buildver}
-Release: 2%{?dist}
+Release: 1%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -1052,7 +1058,6 @@ URL: http://openjdk.java.net/
# REPO_ROOT=<path to checked-out repository> generate_source_tarball.sh
# where the source is obtained from http://hg.openjdk.java.net/%%{project}/%%{repo}
Source0: %{project}-%{repo}-%{revision}.tar.xz
-#Source1: {shenandoah_project}-{shenandoah_repo}-{shenandoah_revision}.tar.xz
# Custom README for -src subpackage
Source2: README.md
@@ -1060,7 +1065,7 @@ Source2: README.md
# run update_systemtap.sh to regenerate or update systemtap sources
# update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
-Source8: systemtap-tapset-3.4.0pre01.tar.xz
+Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
# Desktop files. Adapted from IcedTea
Source9: jconsole.desktop.in
@@ -1088,202 +1093,225 @@ Source101: config.sub
#
# RPM/distribution specific patches
#
+# This section includes patches specific to
+# Fedora/RHEL which can not be upstreamed
+# either in their current form or at all.
############################################
# Accessibility patches
# Ignore AWTError when assistive technologies are loaded
-Patch1: java-1.8.0-openjdk-accessible-toolkit.patch
+Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
# Restrict access to java-atk-wrapper classes
-Patch3: java-atk-wrapper-security.patch
-# Support for building the SunEC provider with the system NSS installation
-# PR1983: Support using the system installation of NSS with the SunEC provider
-# PR2127: SunEC provider crashes when built using system NSS
-# PR2815: Race condition in SunEC provider with system NSS
-# PR2899: Don't use WithSeed versions of NSS functions as they don't fully process the seed
-# PR2934: SunEC provider throwing KeyException with current NSS
-# PR3479, RH1486025: ECC and NSS JVM crash
-Patch513: pr1983-jdk.patch
-Patch514: pr1983-root.patch
-Patch515: pr2127.patch
-Patch516: pr2815.patch
-Patch517: pr2899.patch
-Patch518: pr2934.patch
-Patch519: pr3479-rh1486025.patch
-# PR3183, RH1340845: Support Fedora/RHEL8 system crypto policy
-Patch300: pr3183-rh1340845-system-crypto-policy.patch
+Patch3: rh1648644-java_access_bridge_privileged_security.patch
+# PR1834, RH1022017: Reduce curves reported by SSL to those in NSS
+# Not currently suitable to go upstream as it disables curves
+# for all providers unconditionally
+Patch525: pr1834-rh1022017-reduce_ellipticcurvesextension_to_provide_only_three_nss_supported_nist_curves_23_24_25.patch
+# Turn on AssumeMP by default on RHEL systems
+Patch534: rh1648246-always_instruct_vm_to_assume_multiple_processors_are_available.patch
#############################################
#
# Upstreamable patches
#
+# This section includes patches which need to
+# be reviewed & pushed to the current development
+# tree of OpenJDK.
#############################################
# PR2737: Allow multiple initialization of PKCS11 libraries
-Patch5: multiple-pkcs11-library-init.patch
+Patch5: pr2737-allow_multiple_pkcs11_library_initialisation_to_be_a_non_critical_error.patch
# PR2095, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure (sync with IcedTea 2.x)
-Patch504: rh1163501.patch
+Patch504: rh1163501-increase_2048_bit_dh_upper_bound_fedora_infrastructure_in_dhparametergenerator.patch
# Turn off strict overflow on IndicRearrangementProcessor{,2}.cpp following 8140543: Arrange font actions
-Patch512: no_strict_overflow.patch
+Patch512: rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch
# RH1337583, PR2974: PKCS#10 certificate requests now use CRLF line endings rather than system line endings
-Patch523: pr2974-rh1337583.patch
+Patch523: pr2974-rh1337583-add_systemlineendings_option_to_keytool_and_use_line_separator_instead_of_crlf_in_pkcs10.patch
# PR3083, RH1346460: Regression in SSL debug output without an ECC provider
-Patch528: pr3083-rh1346460.patch
+Patch528: pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch
# RH1566890: CVE-2018-3639
-Patch529: rh1566890_embargoed20180521.patch
+Patch529: rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch
# PR3601: Fix additional -Wreturn-type issues introduced by 8061651
-Patch530: pr3601.patch
+Patch530: pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
+# Support for building the SunEC provider with the system NSS installation
+# PR1983: Support using the system installation of NSS with the SunEC provider
+# PR2127: SunEC provider crashes when built using system NSS
+# PR2815: Race condition in SunEC provider with system NSS
+# PR2899: Don't use WithSeed versions of NSS functions as they don't fully process the seed
+# PR2934: SunEC provider throwing KeyException with current NSS
+# PR3479, RH1486025: ECC and NSS JVM crash
+Patch513: pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_jdk8.patch
+Patch514: pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_root8.patch
+Patch515: pr2127-sunec_provider_crashes_when_built_using_system_nss_thus_use_of_nss_memory_management_functions.patch
+Patch516: pr2815-race_condition_in_sunec_provider_with_system_nss_fix.patch
+Patch517: pr2899-dont_use_withseed_versions_of_nss_functions_as_they_dont_fully_process_the_seed.patch
+Patch518: pr2934-sunec_provider_throwing_keyexception_withine.separator_current_nss_thus_initialise_the_random_number_generator_and_feed_the_seed_to_it.patch
+Patch519: pr3479-rh1486025-sunec_provider_can_have_multiple_instances_leading_to_premature_nss_shutdown.patch
+# PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
+Patch539: pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch
+# PR3575, RH1567204: System cacerts database handling should not affect jssecacerts
+Patch540: pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch
+# PR3183, RH1340845: Support Fedora/RHEL8 system crypto policy
+Patch300: pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch
+#############################################
+#
# Arch-specific upstreamable patches
-
+#
+# This section includes patches which need to
+# be reviewed & pushed upstream and are specific
+# to certain architectures. This usually means the
+# current OpenJDK development branch, but may also
+# include other trees e.g. for the AArch64 port for
+# OpenJDK 8u.
+#############################################
# s390: PR3593: Use "%z" for size_t on s390 as size_t != intptr_t
-#Patch103: pr3593-s390-size_t_format_flags.patch
+Patch103: pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_equals_to_int.patch
# x86: S8199936, PR3533: HotSpot generates code with unaligned stack, crashes on SSE operations (-mstackrealign workaround)
-Patch105: 8199936-pr3533-workaround.patch
+Patch105: jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch
# AArch64: PR3519: Fix further functions with a missing return value (AArch64)
-#Patch106: pr3519.patch
+Patch106: pr3519-fix_further_functions_with_a_missing_return_value.patch
+# AArch64: JDK-8160748: [AArch64] Inconsistent types for ideal_reg
+Patch107: jdk8160748-aarch64_ideal_reg.patch
+# AArch64: JDK-8189170: [AArch64] Add option to disable stack overflow checking in primordial thread for use with JNI_CreateJavaJVM
+Patch108: jdk8189170-aarch64_primordial_thread.patch
#############################################
#
# Patches which need backporting to 8u
#
+# This section includes patches which have
+# been pushed upstream to the latest OpenJDK
+# development tree, but need to be backported
+# to OpenJDK 8u.
#############################################
# S8074839, PR2462: Resolve disabled warnings for libunpack and the unpack200 binary
# This fixes printf warnings that lead to build failure with -Werror=format-security from optflags
-Patch502: pr2462.patch
+Patch502: pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binary.patch
# S8154313: Generated javadoc scattered all over the place
-Patch400: 8154313.patch
+Patch400: jdk8154313-generated_javadoc_scattered_all_over_the_place.patch
# 8197429, PR3546, RH153662{2,3}: 32 bit java app started via JNI crashes with larger stack sizes
-Patch561: 8197429-pr3546-rh1536622.patch
+Patch561: jdk8197429-pr3546-rh1536622-increased_stack_guard_causes_segfaults_on_x86_32.patch
# 8171000, PR3542, RH1402819: Robot.createScreenCapture() crashes in wayland mode
-Patch563: 8171000-pr3542-rh1402819.patch
+Patch563: jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch
# 8197546, PR3542, RH1402819: Fix for 8171000 breaks Solaris + Linux builds
-Patch564: 8197546-pr3542-rh1402819.patch
+Patch564: jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch
# PR3559: Use ldrexd for atomic reads on ARMv7.
-Patch567: pr3559.patch
+Patch567: pr3559-use_ldrexd_for_atomic_reads_on_armv7_zero.patch
# PR3591: Fix for bug 3533 doesn't add -mstackrealign to JDK code
-Patch571: pr3591.patch
+Patch571: jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch
# 8184309, PR3596: Build warnings from GCC 7.1 on Fedora 26
-Patch572: 8184309-pr3596.patch
+Patch572: jdk8184309-pr3596-build_warnings_from_gcc_7_1_on_fedora_26.patch
# 8141570, PR3548: Fix Zero interpreter build for --disable-precompiled-headers
-Patch573: 8141570-pr3548.patch
+Patch573: jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch
# 8143245, PR3548: Zero build requires disabled warnings
-Patch574: 8143245-pr3548.patch
+Patch574: jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
# 8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
-Patch575: 8197981-pr3548.patch
+Patch575: jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
# 8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning
-Patch576: 8064786-pr3599.patch
+Patch576: jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch
# 8062808, PR3548: Turn on the -Wreturn-type warning
-Patch577: 8062808-pr3548.patch
+Patch577: jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
# s390: JDK-8203030, Type fixing for s390
-#Patch102: 8203030-size_t-fixes.patch
+Patch102: jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch
+# 8035341: Allow using a system installed libpng
+Patch202: jdk8035341-allow_using_system_installed_libpng.patch
+# 8042159: Allow using a system-installed lcms2
+Patch203: jdk8042159-allow_using_system_installed_lcms2.patch
# 8210761: libjsig is being compiled without optimization
-Patch620: 8210761-rh1630426-jsig-opt-fix.patch
+Patch620: jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch
# 8210647: libsaproc is being compiled without optimization
-Patch621: 8210647-rh1630426-saproc-opt-fix.patch
+Patch621: jdk8210647-rh1632174-libsaproc_is_being_compiled_without_optimization.patch
# 8210416: [linux] Poor StrictMath performance due to non-optimized compilation
-#Patch622: 8210416-rh1630426-strict-math-opt.patch
+Patch622: jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch
# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
# Upstream 8u part.
-Patch623: 8210425-01-rh1630426-hotspot-opt-fix.patch
+Patch623: jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch
# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
# Aarch64-port 8u local part
-#Patch624: 8210425-02-rh1630426-hotspot-opt-fix-aarch64.patch
+Patch624: jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch
# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
# Zero part of the fix for (arm/s390 arches)
-#Patch625: 8210425-03-rh1630426-hotspot-opt-fix-zero.patch
-
-#############################################
-#
-# Patches appearing in 8u192
-#
-#############################################
-# S8031668, PR2842: TOOLCHAIN_FIND_COMPILER unexpectedly resolves symbolic links
-Patch506: 8031668-pr2842-01.patch
-# S8148351, PR2842: Only display resolved symlink for compiler, do not change path
-Patch507: 8148351-pr2842-02.patch
-# S6260348, PR3066: GTK+ L&F JTextComponent not respecting desktop caret blink rate
-Patch526: 6260348-pr3066.patch
-# 8061305, PR3335, RH1423421: Javadoc crashes when method name ends with "Property"
-Patch538: 8061305-pr3335-rh1423421.patch
-# 8188030, PR3459, RH1484079: AWT java apps fail to start when some minimal fonts are present
-Patch560: 8188030-pr3459-rh1484079.patch
-# 8205104, PR3539, RH1548475: Pass EXTRA_LDFLAGS to HotSpot build
-Patch562: 8205104-pr3539-rh1548475.patch
-# 8185723, PR3553: Zero: segfaults on Power PC 32-bit
-Patch565: 8185723-pr3553.patch
-# 8186461, PR3557: Zero's atomic_copy64() should use SPE instructions on linux-powerpcspe
-Patch566: 8186461-pr3557.patch
-# 8201509, PR3579: Zero: S390 31bit atomic_copy64 inline assembler is wrong
-Patch569: 8201509-pr3579.patch
-# 8075942, PR3602: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo
-Patch578: 8075942-pr3602-rh1582032.patch
-# 8203182, PR3603: Release session if initialization of SunPKCS11 Signature fails
-Patch579: 8203182-pr3603-rh1568033.patch
-# 8206406, PR3610, RH1597825: StubCodeDesc constructor publishes partially-constructed objects on StubCodeDesc::_list
-Patch580: 8206406-pr3610-rh1597825.patch
-# Patches 204 and 205 stop the build adding .gnu_debuglink sections to unstripped files
-# 8206425: .gnu_debuglink sections added unconditionally when no debuginfo is stripped
-Patch204: 8206425-hotspot-remove-debuglink.patch
-# 8036003: Add --with-native-debug-symbols=[none|internal|external|zipped]
-Patch205: 8036003-add-with-native-debug-symbols-configure-flag.patch
-# s390: JDK-8201495, PR2415: JVM -Xmx requirement is too high on s390
-#Patch100: 8201495-s390-java-opts.patch
+Patch625: jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch
#############################################
#
# Patches appearing in 8u202
#
+# This section includes patches which are present
+# in the listed OpenJDK 8u release and should be
+# able to be removed once that release is out
+# and used by this RPM.
#############################################
-# S8150954, RH1176206, PR2866: Taking screenshots on x11 composite desktop produces wrong result
-Patch508: 8150954-pr2866-rh1176206-screenshot-xcomposite-jdk.patch
# 8207057, PR3613: Enable debug information for assembly code files
-Patch206: 8207057-pr3613-assembler-debuginfo-hotspot.patch
-Patch207: 8207057-pr3613-assembler-debuginfo-root.patch
+Patch206: jdk8207057-pr3613-no_debug_info_for_assembler_files_hotspot.patch
+Patch207: jdk8207057-pr3613-no_debug_info_for_assembler_files_root.patch
# 8165852, PR3468: (fs) Mount point not found for a file which is present in overlayfs
-Patch210: 8165852-pr3468.patch
+Patch210: jdk8165852-pr3468-mount_point_not_found_for_a_file_which_is_present_in_overlayfs.patch
# S8073139, RH1191652; fix name of ppc64le architecture
-#Patch601: 8073139-rh1191652-root.patch
-#Patch602: 8073139-rh1191652-jdk.patch
-#Patch603: 8073139-rh1191652-hotspot-aarch64.patch
+Patch601: jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch
+Patch602: jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_jdk.patch
+Patch603: jdk8073139-pr2236-rh1191652--use_ppc64le_as_the_arch_directory_on_that_platform_and_report_it_in_os_arch_aarch64_forest.patch
# 8044235: src.zip should include all sources
-Patch7: 8044235-include-all-srcs.patch
+Patch7: jdk8044235-src_zip_should_include_all_sources.patch
+# JDK-8172850, RH1640127: Anti-dependency on membar causes crash in register allocator due to invalid instruction scheduling
+Patch583: jdk8172850-rh1640127-01-register_allocator_crash.patch
+# JDK-8209639, RH1640127: assert failure in coalesce.cpp: attempted to spill a non-spillable item
+Patch584: jdk8209639-rh1640127-02-coalesce_attempted_spill_non_spillable.patch
+# JDK-8131048, PR3574, RH1498936: ppc implement CRC32 intrinsic
+Patch586: jdk8131048-pr3574-rh1498936-ppc_crc32.patch
+# JDK-8164920, PR3574, RH1498936: ppc: enhancement of CRC32 intrinsic
+Patch587: jdk8164920-pr3574-rh1498936-ppc_crc32_enhancement.patch
#############################################
#
-# Patches ineligible for 8u
+# Patches appearing in 8u211
#
+# This section includes patches which are present
+# in the listed OpenJDK 8u release and should be
+# able to be removed once that release is out
+# and used by this RPM.
#############################################
-# 8043805: Allow using a system-installed libjpeg
-Patch201: system-libjpeg.patch
-# 8035341: Allow using a system installed libpng
-Patch202: system-libpng.patch
-# 8042159: Allow using a system-installed lcms2
-Patch203: system-lcms.patch
+# JDK-8029661, PR3642, RH1477159: Support TLS v1.2 algorithm in SunPKCS11 provider
+Patch585: jdk8029661-pr3642-rh1477159-add_tlsv1_2_support_to_pkcs11_provider.patch
+# JDK-8145096, PR3693: Undefined behaviour in HotSpot
+Patch588: jdk8145096-pr3693-undefined_behaviour.patch
#############################################
#
-# Local fixes
+# Patches ineligible for 8u
#
+# This section includes patches which are present
+# upstream, but ineligible for upstream 8u backport.
#############################################
-# PR1834, RH1022017: Reduce curves reported by SSL to those in NSS
-Patch525: pr1834-rh1022017.patch
-# Turn on AssumeMP by default on RHEL systems
-#Patch534: always_assumemp.patch
-# PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
-Patch539: pr2888.patch
-# PR3575, RH1567204: System cacerts database handling should not affect jssecacerts
-Patch540: pr3575-rh1567204.patch
+# 8043805: Allow using a system-installed libjpeg
+Patch201: jdk8043805-allow_using_system_installed_libjpeg.patch
+#############################################
+#
# Shenandoah fixes
+#
+# This section includes patches which are
+# specific to the Shenandoah garbage collector
+# and should be upstreamed to the appropriate
+# trees.
+#############################################
# PR3634: Shenandoah still broken on s390 with aarch64-shenandoah-jdk8u181-b16
-#Patch582: pr3634.patch
+Patch582: pr3634-fix_shenandoah_for_size_t_on_s390.patch
#############################################
#
# Non-OpenJDK fixes
#
+# This section includes patches to code other
+# that from OpenJDK.
#############################################
-Patch1000: enableCommentedOutSystemNss.patch
+Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
+#############################################
+#
+# Dependencies
+#
+#############################################
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: alsa-lib-devel
@@ -1600,8 +1628,6 @@ sh %{SOURCE12}
%patch203
# Debugging fixes
-%patch204
-%patch205
%patch206
%patch207
%patch210
@@ -1614,12 +1640,13 @@ sh %{SOURCE12}
%patch7
# s390 build fixes
-#%patch100
-#%patch102
-#%patch103
+%patch102
+%patch103
# AArch64 fixes
#%patch106
+#%patch107
+#%patch108
# x86 fixes
%patch105
@@ -1632,9 +1659,6 @@ sh %{SOURCE12}
# Upstreamable fixes
%patch502
%patch504
-%patch506
-%patch507
-%patch508
%patch512
%patch513
%patch514
@@ -1645,20 +1669,13 @@ sh %{SOURCE12}
%patch519
%patch400
%patch523
-%patch526
%patch528
%patch529
%patch530
-%patch538
-%patch560
%patch561
-%patch562
%patch563
%patch564
-%patch565
-%patch566
%patch567
-%patch569
%patch571
%patch572
%patch573
@@ -1666,15 +1683,18 @@ sh %{SOURCE12}
%patch575
%patch576
%patch577
-%patch578
-%patch579
-%patch580
%patch620
%patch621
#%patch622
%patch623
#%patch624
-#%patch625
+%patch625
+%patch583
+%patch584
+%patch585
+%patch586
+%patch587
+%patch588
# RPM-only fixes
%patch525
@@ -1800,8 +1820,13 @@ bash ../../configure \
--with-libpng=system \
--with-lcms=system \
--with-stdc++lib=dynamic \
+%ifarch %{ix86}
+ --with-extra-cxxflags="-mstackrealign $EXTRA_CPP_FLAGS" \
+ --with-extra-cflags="-mstackrealign $EXTRA_CFLAGS" \
+%else
--with-extra-cxxflags="$EXTRA_CPP_FLAGS" \
--with-extra-cflags="$EXTRA_CFLAGS" \
+%endif
--with-extra-ldflags="%{ourldflags}" \
--with-num-cores="$NUM_PROC"
@@ -2062,6 +2087,7 @@ find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/demo \
pushd $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/lib/aarch32
ln -s %{_libdir}/java-atk-wrapper/libatk-wrapper.so.0 libatk-wrapper.so
popd
+
pushd $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/lib/ext
ln -s %{_libdir}/java-atk-wrapper/java-atk-wrapper.jar java-atk-wrapper.jar
popd
@@ -2377,8 +2403,9 @@ require "copy_jdk_configs.lua"
%endif
%changelog
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.8.0.191.181022-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+* Tue Feb 12 2019 Alex Kashchenko <akashche(a)redhat.com> - 1:1.8.0.201-1.190124
+- update sources to 8u201
+- sync with mainline package
* Tue Oct 30 2018 Alex Kashchenko <akashche(a)redhat.com> - 1:1.8.0.191-1.181022
- update sources to 8u191
diff --git a/java-1.8.0-openjdk-accessible-toolkit.patch b/java-1.8.0-openjdk-accessible-toolkit.patch
deleted file mode 100644
index bddd702..0000000
--- a/java-1.8.0-openjdk-accessible-toolkit.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -uNr openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java jdk8/jdk/src/share/classes/java/awt/Toolkit.java
---- openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 11:59:47.000000000 -0500
-+++ jdk8/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 12:05:20.000000000 -0500
-@@ -883,7 +883,11 @@
- return null;
- }
- });
-- loadAssistiveTechnologies();
-+ try {
-+ loadAssistiveTechnologies();
-+ } catch ( AWTError error) {
-+ // ignore silently
-+ }
- }
- return toolkit;
- }
diff --git a/java-1.8.0-openjdk-remove-intree-libraries.sh b/java-1.8.0-openjdk-remove-intree-libraries.sh
index 879d462..b52d016 100644
--- a/java-1.8.0-openjdk-remove-intree-libraries.sh
+++ b/java-1.8.0-openjdk-remove-intree-libraries.sh
@@ -99,6 +99,7 @@ if [ ! -d ${LCMS_SRC} ]; then
fi
# temporary change to move bundled LCMS
if [ ! true ]; then
+rm -vf ${LCMS_SRC}/cmsalpha.c
rm -vf ${LCMS_SRC}/cmscam02.c
rm -vf ${LCMS_SRC}/cmscgats.c
rm -vf ${LCMS_SRC}/cmscnvrt.c
@@ -128,3 +129,10 @@ rm -vf ${LCMS_SRC}/lcms2.h
rm -vf ${LCMS_SRC}/lcms2_internal.h
rm -vf ${LCMS_SRC}/lcms2_plugin.h
fi
+
+# Get rid of in-tree SunEC until RH1656676 is implemented
+echo "Removing SunEC native code"
+mv -v openjdk/jdk/src/share/native/sun/security/ec/impl/ecc_impl.h .
+rm -vrf openjdk/jdk/src/share/native/sun/security/ec/impl
+mkdir openjdk/jdk/src/share/native/sun/security/ec/impl
+mv -v ecc_impl.h openjdk/jdk/src/share/native/sun/security/ec/impl
diff --git a/java-atk-wrapper-security.patch b/java-atk-wrapper-security.patch
deleted file mode 100644
index 538468a..0000000
--- a/java-atk-wrapper-security.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- jdk8/jdk/src/share/lib/security/java.security-linux.orig
-+++ jdk8/jdk/src/share/lib/security/java.security-linux
-@@ -223,7 +223,9 @@
- jdk.nashorn.internal.,\
- jdk.nashorn.tools.,\
- jdk.xml.internal.,\
-- com.sun.activation.registries.
-+ com.sun.activation.registries.,\
-+ org.GNOME.Accessibility.,\
-+ org.GNOME.Bonobo.
-
- #
- # List of comma-separated packages that start with or equal this string
-@@ -273,7 +275,9 @@
- jdk.nashorn.internal.,\
- jdk.nashorn.tools.,\
- jdk.xml.internal.,\
-- com.sun.activation.registries.
-+ com.sun.activation.registries.,\
-+ org.GNOME.Accessibility.,\
-+ org.GNOME.Bonobo.
-
- #
- # Determines whether this properties file can be appended to
diff --git a/jdk8029661-pr3642-rh1477159-add_tlsv1_2_support_to_pkcs11_provider.patch b/jdk8029661-pr3642-rh1477159-add_tlsv1_2_support_to_pkcs11_provider.patch
new file mode 100644
index 0000000..f7a816a
--- /dev/null
+++ b/jdk8029661-pr3642-rh1477159-add_tlsv1_2_support_to_pkcs11_provider.patch
@@ -0,0 +1,2269 @@
+# HG changeset patch
+# User mbalao
+# Date 1541016287 10800
+# Wed Oct 31 17:04:47 2018 -0300
+# Node ID fa06cdb4c6f7b5ca148f26d345090d48014fecff
+# Parent 478a4add975beb90696a4ead5f8fcd9c17fc1a83
+8029661, PR3642, RH1477159: Support TLS v1.2 algorithm in SunPKCS11 provider
+Summary: TLS v1.2 algorithms for key and MAC derivation added to SunPKCS11 crypto provider. 8210912 fix is included as part of this changeset.
+Reviewed-by: valeriep
+
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 2018, 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
+@@ -95,9 +95,9 @@
+ throw new InvalidAlgorithmParameterException("init() failed", e);
+ }
+ version = (spec.getMajorVersion() << 8) | spec.getMinorVersion();
+- if ((version < 0x0300) && (version > 0x0302)) {
+- throw new InvalidAlgorithmParameterException
+- ("Only SSL 3.0, TLS 1.0, and TLS 1.1 are supported");
++ if ((version < 0x0300) && (version > 0x0303)) {
++ throw new InvalidAlgorithmParameterException("Only SSL 3.0," +
++ " TLS 1.0, TLS 1.1, and TLS 1.2 are supported");
+ }
+ // we assume the token supports both the CKM_SSL3_* and the CKM_TLS_*
+ // mechanisms
+@@ -112,8 +112,11 @@
+ throw new IllegalStateException
+ ("TlsKeyMaterialGenerator must be initialized");
+ }
+- mechanism = (version == 0x0300) ? CKM_SSL3_KEY_AND_MAC_DERIVE
+- : CKM_TLS_KEY_AND_MAC_DERIVE;
++ if (version == 0x0300) {
++ mechanism = CKM_SSL3_KEY_AND_MAC_DERIVE;
++ } else if (version == 0x0301 || version == 0x0302) {
++ mechanism = CKM_TLS_KEY_AND_MAC_DERIVE;
++ }
+ int macBits = spec.getMacKeyLength() << 3;
+ int ivBits = spec.getIvLength() << 3;
+
+@@ -129,8 +132,18 @@
+
+ CK_SSL3_RANDOM_DATA random = new CK_SSL3_RANDOM_DATA
+ (spec.getClientRandom(), spec.getServerRandom());
+- CK_SSL3_KEY_MAT_PARAMS params = new CK_SSL3_KEY_MAT_PARAMS
+- (macBits, keyBits, ivBits, isExportable, random);
++ Object params = null;
++ CK_MECHANISM ckMechanism = null;
++ if (version < 0x0303) {
++ params = new CK_SSL3_KEY_MAT_PARAMS
++ (macBits, keyBits, ivBits, isExportable, random);
++ ckMechanism = new CK_MECHANISM(mechanism, (CK_SSL3_KEY_MAT_PARAMS)params);
++ } else if (version == 0x0303) {
++ params = new CK_TLS12_KEY_MAT_PARAMS
++ (macBits, keyBits, ivBits, isExportable, random,
++ Functions.getHashMechId(spec.getPRFHashAlg()));
++ ckMechanism = new CK_MECHANISM(mechanism, (CK_TLS12_KEY_MAT_PARAMS)params);
++ }
+
+ String cipherAlgorithm = spec.getCipherAlgorithm();
+ long keyType = P11SecretKeyFactory.getKeyType(cipherAlgorithm);
+@@ -162,9 +175,14 @@
+ (O_GENERATE, CKO_SECRET_KEY, keyType, attributes);
+ // the returned keyID is a dummy, ignore
+ long keyID = token.p11.C_DeriveKey(session.id(),
+- new CK_MECHANISM(mechanism, params), p11Key.keyID, attributes);
++ ckMechanism, p11Key.keyID, attributes);
+
+- CK_SSL3_KEY_MAT_OUT out = params.pReturnedKeyMaterial;
++ CK_SSL3_KEY_MAT_OUT out = null;
++ if (params instanceof CK_SSL3_KEY_MAT_PARAMS) {
++ out = ((CK_SSL3_KEY_MAT_PARAMS)params).pReturnedKeyMaterial;
++ } else if (params instanceof CK_TLS12_KEY_MAT_PARAMS) {
++ out = ((CK_TLS12_KEY_MAT_PARAMS)params).pReturnedKeyMaterial;
++ }
+ // Note that the MAC keys do not inherit all attributes from the
+ // template, but they do inherit the sensitive/extractable/token
+ // flags, which is all P11Key cares about.
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 2018, 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
+@@ -89,9 +89,9 @@
+ throw new InvalidAlgorithmParameterException("init() failed", e);
+ }
+ version = (spec.getMajorVersion() << 8) | spec.getMinorVersion();
+- if ((version < 0x0300) || (version > 0x0302)) {
+- throw new InvalidAlgorithmParameterException
+- ("Only SSL 3.0, TLS 1.0, and TLS 1.1 supported");
++ if ((version < 0x0300) && (version > 0x0303)) {
++ throw new InvalidAlgorithmParameterException("Only SSL 3.0," +
++ " TLS 1.0, TLS 1.1, and TLS 1.2 are supported");
+ }
+ // We assume the token supports the required mechanism. If it does not,
+ // generateKey() will fail and the failover should take care of us.
+@@ -106,10 +106,20 @@
+ throw new IllegalStateException
+ ("TlsMasterSecretGenerator must be initialized");
+ }
++ final boolean isTlsRsaPremasterSecret =
++ p11Key.getAlgorithm().equals("TlsRsaPremasterSecret");
++ if (version == 0x0300) {
++ mechanism = isTlsRsaPremasterSecret ?
++ CKM_SSL3_MASTER_KEY_DERIVE : CKM_SSL3_MASTER_KEY_DERIVE_DH;
++ } else if (version == 0x0301 || version == 0x0302) {
++ mechanism = isTlsRsaPremasterSecret ?
++ CKM_TLS_MASTER_KEY_DERIVE : CKM_TLS_MASTER_KEY_DERIVE_DH;
++ } else if (version == 0x0303) {
++ mechanism = isTlsRsaPremasterSecret ?
++ CKM_TLS12_MASTER_KEY_DERIVE : CKM_TLS12_MASTER_KEY_DERIVE_DH;
++ }
+ CK_VERSION ckVersion;
+- if (p11Key.getAlgorithm().equals("TlsRsaPremasterSecret")) {
+- mechanism = (version == 0x0300) ? CKM_SSL3_MASTER_KEY_DERIVE
+- : CKM_TLS_MASTER_KEY_DERIVE;
++ if (isTlsRsaPremasterSecret) {
+ ckVersion = new CK_VERSION(0, 0);
+ } else {
+ // Note: we use DH for all non-RSA premaster secrets. That includes
+@@ -118,16 +128,23 @@
+ // TLS PRF (or the SSL equivalent).
+ // The only thing special about RSA master secret calculation is
+ // that it extracts the version numbers from the premaster secret.
+- mechanism = (version == 0x0300) ? CKM_SSL3_MASTER_KEY_DERIVE_DH
+- : CKM_TLS_MASTER_KEY_DERIVE_DH;
+ ckVersion = null;
+ }
+ byte[] clientRandom = spec.getClientRandom();
+ byte[] serverRandom = spec.getServerRandom();
+ CK_SSL3_RANDOM_DATA random =
+ new CK_SSL3_RANDOM_DATA(clientRandom, serverRandom);
+- CK_SSL3_MASTER_KEY_DERIVE_PARAMS params =
+- new CK_SSL3_MASTER_KEY_DERIVE_PARAMS(random, ckVersion);
++ CK_MECHANISM ckMechanism = null;
++ if (version < 0x0303) {
++ CK_SSL3_MASTER_KEY_DERIVE_PARAMS params =
++ new CK_SSL3_MASTER_KEY_DERIVE_PARAMS(random, ckVersion);
++ ckMechanism = new CK_MECHANISM(mechanism, params);
++ } else if (version == 0x0303) {
++ CK_TLS12_MASTER_KEY_DERIVE_PARAMS params =
++ new CK_TLS12_MASTER_KEY_DERIVE_PARAMS(random, ckVersion,
++ Functions.getHashMechId(spec.getPRFHashAlg()));
++ ckMechanism = new CK_MECHANISM(mechanism, params);
++ }
+
+ Session session = null;
+ try {
+@@ -135,9 +152,8 @@
+ CK_ATTRIBUTE[] attributes = token.getAttributes(O_GENERATE,
+ CKO_SECRET_KEY, CKK_GENERIC_SECRET, new CK_ATTRIBUTE[0]);
+ long keyID = token.p11.C_DeriveKey(session.id(),
+- new CK_MECHANISM(mechanism, params), p11Key.keyID, attributes);
++ ckMechanism, p11Key.keyID, attributes);
+ int major, minor;
+- ckVersion = params.pVersion;
+ if (ckVersion == null) {
+ major = -1;
+ minor = -1;
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 2018, 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
+@@ -124,8 +124,46 @@
+ if (spec == null) {
+ throw new IllegalStateException("TlsPrfGenerator must be initialized");
+ }
++ byte[] seed = spec.getSeed();
++
++ // TLS 1.2
++ if (mechanism == CKM_TLS_MAC) {
++ SecretKey k = null;
++ int ulServerOrClient = 0;
++ if (spec.getLabel().equals("server finished")) {
++ ulServerOrClient = 1;
++ }
++ if (spec.getLabel().equals("client finished")) {
++ ulServerOrClient = 2;
++ }
++
++ if (ulServerOrClient != 0) {
++ // Finished message
++ CK_TLS_MAC_PARAMS params = new CK_TLS_MAC_PARAMS(
++ Functions.getHashMechId(spec.getPRFHashAlg()),
++ spec.getOutputLength(), ulServerOrClient);
++ Session session = null;
++ try {
++ session = token.getOpSession();
++ token.p11.C_SignInit(session.id(),
++ new CK_MECHANISM(mechanism, params), p11Key.keyID);
++ token.p11.C_SignUpdate(session.id(), 0, seed, 0, seed.length);
++ byte[] out = token.p11.C_SignFinal
++ (session.id(), spec.getOutputLength());
++ k = new SecretKeySpec(out, "TlsPrf");
++ } catch (PKCS11Exception e) {
++ throw new ProviderException("Could not calculate PRF", e);
++ } finally {
++ token.releaseSession(session);
++ }
++ } else {
++ throw new ProviderException("Only Finished message authentication code"+
++ " generation supported for TLS 1.2.");
++ }
++ return k;
++ }
++
+ byte[] label = P11Util.getBytesUTF8(spec.getLabel());
+- byte[] seed = spec.getSeed();
+
+ if (mechanism == CKM_NSS_TLS_PRF_GENERAL) {
+ Session session = null;
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 2018, 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
+@@ -57,6 +57,8 @@
+ // mechanism id
+ private long mechanism;
+
++ private int version;
++
+ private TlsRsaPremasterSecretParameterSpec spec;
+
+ P11TlsRsaPremasterSecretGenerator(Token token, String algorithm, long mechanism)
+@@ -77,6 +79,11 @@
+ throw new InvalidAlgorithmParameterException(MSG);
+ }
+ this.spec = (TlsRsaPremasterSecretParameterSpec)params;
++ version = (spec.getMajorVersion() << 8) | spec.getMinorVersion();
++ if ((version < 0x0300) && (version > 0x0303)) {
++ throw new InvalidAlgorithmParameterException
++ ("Only SSL 3.0, TLS 1.0, TLS 1.1, and TLS 1.2 are supported");
++ }
+ }
+
+ protected void engineInit(int keysize, SecureRandom random) {
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java openjdk/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, 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
+@@ -720,38 +720,28 @@
+ s("1.2.840.113549.1.1.13", "OID.1.2.840.113549.1.1.13"),
+ m(CKM_SHA512_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
+
+- /*
+- * TLS 1.2 uses a different hash algorithm than 1.0/1.1 for the
+- * PRF calculations. As of 2010, there is no PKCS11-level
+- * support for TLS 1.2 PRF calculations, and no known OS's have
+- * an internal variant we could use. Therefore for TLS 1.2, we
+- * are updating JSSE to request different provider algorithms
+- * (e.g. "SunTls12Prf"), and currently only SunJCE has these
+- * TLS 1.2 algorithms.
+- *
+- * If we reused the names such as "SunTlsPrf", the PKCS11
+- * providers would need be updated to fail correctly when
+- * presented with the wrong version number (via
+- * Provider.Service.supportsParameters()), and we would also
+- * need to add the appropriate supportsParamters() checks into
+- * KeyGenerators (not currently there).
+- *
+- * In the future, if PKCS11 support is added, we will restructure
+- * this.
+- */
+ d(KG, "SunTlsRsaPremasterSecret",
+ "sun.security.pkcs11.P11TlsRsaPremasterSecretGenerator",
++ s("SunTls12RsaPremasterSecret"),
+ m(CKM_SSL3_PRE_MASTER_KEY_GEN, CKM_TLS_PRE_MASTER_KEY_GEN));
+ d(KG, "SunTlsMasterSecret",
+ "sun.security.pkcs11.P11TlsMasterSecretGenerator",
+ m(CKM_SSL3_MASTER_KEY_DERIVE, CKM_TLS_MASTER_KEY_DERIVE,
+ CKM_SSL3_MASTER_KEY_DERIVE_DH,
+ CKM_TLS_MASTER_KEY_DERIVE_DH));
++ d(KG, "SunTls12MasterSecret",
++ "sun.security.pkcs11.P11TlsMasterSecretGenerator",
++ m(CKM_TLS12_MASTER_KEY_DERIVE, CKM_TLS12_MASTER_KEY_DERIVE_DH));
+ d(KG, "SunTlsKeyMaterial",
+ "sun.security.pkcs11.P11TlsKeyMaterialGenerator",
+ m(CKM_SSL3_KEY_AND_MAC_DERIVE, CKM_TLS_KEY_AND_MAC_DERIVE));
++ d(KG, "SunTls12KeyMaterial",
++ "sun.security.pkcs11.P11TlsKeyMaterialGenerator",
++ m(CKM_TLS12_KEY_AND_MAC_DERIVE));
+ d(KG, "SunTlsPrf", "sun.security.pkcs11.P11TlsPrfGenerator",
+ m(CKM_TLS_PRF, CKM_NSS_TLS_PRF_GENERAL));
++ d(KG, "SunTls12Prf", "sun.security.pkcs11.P11TlsPrfGenerator",
++ m(CKM_TLS_MAC));
+ }
+
+ // background thread that periodically checks for token insertion
+@@ -1016,13 +1006,16 @@
+ if (algorithm == "SunTlsRsaPremasterSecret") {
+ return new P11TlsRsaPremasterSecretGenerator(
+ token, algorithm, mechanism);
+- } else if (algorithm == "SunTlsMasterSecret") {
++ } else if (algorithm == "SunTlsMasterSecret"
++ || algorithm == "SunTls12MasterSecret") {
+ return new P11TlsMasterSecretGenerator(
+ token, algorithm, mechanism);
+- } else if (algorithm == "SunTlsKeyMaterial") {
++ } else if (algorithm == "SunTlsKeyMaterial"
++ || algorithm == "SunTls12KeyMaterial") {
+ return new P11TlsKeyMaterialGenerator(
+ token, algorithm, mechanism);
+- } else if (algorithm == "SunTlsPrf") {
++ } else if (algorithm == "SunTlsPrf"
++ || algorithm == "SunTls12Prf") {
+ return new P11TlsPrfGenerator(token, algorithm, mechanism);
+ } else {
+ return new P11KeyGenerator(token, algorithm, mechanism);
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+
+ /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
+@@ -112,14 +112,26 @@
+ init(mechanism, params);
+ }
+
++ public CK_MECHANISM(long mechanism, CK_TLS12_MASTER_KEY_DERIVE_PARAMS params) {
++ init(mechanism, params);
++ }
++
+ public CK_MECHANISM(long mechanism, CK_SSL3_KEY_MAT_PARAMS params) {
+ init(mechanism, params);
+ }
+
++ public CK_MECHANISM(long mechanism, CK_TLS12_KEY_MAT_PARAMS params) {
++ init(mechanism, params);
++ }
++
+ public CK_MECHANISM(long mechanism, CK_TLS_PRF_PARAMS params) {
+ init(mechanism, params);
+ }
+
++ public CK_MECHANISM(long mechanism, CK_TLS_MAC_PARAMS params) {
++ init(mechanism, params);
++ }
++
+ public CK_MECHANISM(long mechanism, CK_ECDH1_DERIVE_PARAMS params) {
+ init(mechanism, params);
+ }
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS12_KEY_MAT_PARAMS.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS12_KEY_MAT_PARAMS.java
+new file mode 100644
+--- /dev/null
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS12_KEY_MAT_PARAMS.java
+@@ -0,0 +1,151 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ */
++
++package sun.security.pkcs11.wrapper;
++
++/**
++ * CK_TLS12_KEY_MAT_PARAMS from PKCS#11 v2.40.
++ */
++public class CK_TLS12_KEY_MAT_PARAMS {
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_ULONG ulMacSizeInBits;
++ * </PRE>
++ */
++ public long ulMacSizeInBits;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_ULONG ulKeySizeInBits;
++ * </PRE>
++ */
++ public long ulKeySizeInBits;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_ULONG ulIVSizeInBits;
++ * </PRE>
++ */
++ public long ulIVSizeInBits;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_BBOOL bIsExport;
++ * </PRE>
++ */
++ public boolean bIsExport;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_SSL3_RANDOM_DATA RandomInfo;
++ * </PRE>
++ */
++ public CK_SSL3_RANDOM_DATA RandomInfo;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_SSL3_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
++ * </PRE>
++ */
++ public CK_SSL3_KEY_MAT_OUT pReturnedKeyMaterial;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_MECHANISM_TYPE prfHashMechanism;
++ * </PRE>
++ */
++ public long prfHashMechanism;
++
++ public CK_TLS12_KEY_MAT_PARAMS(
++ int macSize, int keySize, int ivSize, boolean export,
++ CK_SSL3_RANDOM_DATA random, long prfHashMechanism) {
++ ulMacSizeInBits = macSize;
++ ulKeySizeInBits = keySize;
++ ulIVSizeInBits = ivSize;
++ bIsExport = export;
++ RandomInfo = random;
++ pReturnedKeyMaterial = new CK_SSL3_KEY_MAT_OUT();
++ if (ivSize != 0) {
++ int n = ivSize >> 3;
++ pReturnedKeyMaterial.pIVClient = new byte[n];
++ pReturnedKeyMaterial.pIVServer = new byte[n];
++ }
++ this.prfHashMechanism = prfHashMechanism;
++ }
++
++ /**
++ * Returns the string representation of CK_TLS12_KEY_MAT_PARAMS.
++ *
++ * @return the string representation of CK_TLS12_KEY_MAT_PARAMS
++ */
++ public String toString() {
++ StringBuilder buffer = new StringBuilder();
++
++ buffer.append(Constants.INDENT);
++ buffer.append("ulMacSizeInBits: ");
++ buffer.append(ulMacSizeInBits);
++ buffer.append(Constants.NEWLINE);
++
++ buffer.append(Constants.INDENT);
++ buffer.append("ulKeySizeInBits: ");
++ buffer.append(ulKeySizeInBits);
++ buffer.append(Constants.NEWLINE);
++
++ buffer.append(Constants.INDENT);
++ buffer.append("ulIVSizeInBits: ");
++ buffer.append(ulIVSizeInBits);
++ buffer.append(Constants.NEWLINE);
++
++ buffer.append(Constants.INDENT);
++ buffer.append("bIsExport: ");
++ buffer.append(bIsExport);
++ buffer.append(Constants.NEWLINE);
++
++ buffer.append(Constants.INDENT);
++ buffer.append("RandomInfo: ");
++ buffer.append(RandomInfo);
++ buffer.append(Constants.NEWLINE);
++
++ buffer.append(Constants.INDENT);
++ buffer.append("pReturnedKeyMaterial: ");
++ buffer.append(pReturnedKeyMaterial);
++ buffer.append(Constants.NEWLINE);
++
++ buffer.append(Constants.INDENT);
++ buffer.append("prfHashMechanism: ");
++ buffer.append(prfHashMechanism);
++
++ return buffer.toString();
++ }
++
++}
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS12_MASTER_KEY_DERIVE_PARAMS.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS12_MASTER_KEY_DERIVE_PARAMS.java
+new file mode 100644
+--- /dev/null
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS12_MASTER_KEY_DERIVE_PARAMS.java
+@@ -0,0 +1,65 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ */
++
++package sun.security.pkcs11.wrapper;
++
++/**
++ * CK_TLS12_MASTER_KEY_DERIVE_PARAMS from PKCS#11 v2.40.
++ */
++public class CK_TLS12_MASTER_KEY_DERIVE_PARAMS {
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_SSL3_RANDOM_DATA RandomInfo;
++ * </PRE>
++ */
++ public CK_SSL3_RANDOM_DATA RandomInfo;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_VERSION_PTR pVersion;
++ * </PRE>
++ */
++ public CK_VERSION pVersion;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_MECHANISM_TYPE prfHashMechanism;
++ * </PRE>
++ */
++ public long prfHashMechanism;
++
++ public CK_TLS12_MASTER_KEY_DERIVE_PARAMS(
++ CK_SSL3_RANDOM_DATA random, CK_VERSION version,
++ long prfHashMechanism) {
++ RandomInfo = random;
++ pVersion = version;
++ this.prfHashMechanism = prfHashMechanism;
++ }
++
++}
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS_MAC_PARAMS.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS_MAC_PARAMS.java
+new file mode 100644
+--- /dev/null
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS_MAC_PARAMS.java
+@@ -0,0 +1,64 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ */
++
++package sun.security.pkcs11.wrapper;
++
++/**
++ * CK_TLS_MAC_PARAMS from PKCS#11 v2.40.
++ */
++public class CK_TLS_MAC_PARAMS {
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_MECHANISM_TYPE prfMechanism;
++ * </PRE>
++ */
++ public long prfMechanism;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_ULONG ulMacLength;
++ * </PRE>
++ */
++ public long ulMacLength;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_ULONG ulServerOrClient;
++ * </PRE>
++ */
++ public long ulServerOrClient;
++
++ public CK_TLS_MAC_PARAMS(long prfMechanism,
++ long ulMacLength, long ulServerOrClient) {
++ this.prfMechanism = prfMechanism;
++ this.ulMacLength = ulMacLength;
++ this.ulServerOrClient = ulServerOrClient;
++ }
++
++}
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/Functions.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/Functions.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/Functions.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/Functions.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+
+ /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
+@@ -73,6 +73,9 @@
+ private static final Map<String,Integer> mechIds =
+ new HashMap<String,Integer>();
+
++ private static final Map<String, Long> hashMechIds =
++ new HashMap<String, Long>();
++
+ // key types (CKK_*)
+ private static final Map<Integer,String> keyNames =
+ new HashMap<Integer,String>();
+@@ -94,7 +97,6 @@
+ private static final Map<String,Integer> objectClassIds =
+ new HashMap<String,Integer>();
+
+-
+ /**
+ * For converting numbers to their hex presentation.
+ */
+@@ -444,6 +446,10 @@
+ return getId(objectClassIds, name);
+ }
+
++ public static long getHashMechId(String name) {
++ return hashMechIds.get(name);
++ }
++
+ /**
+ * Check the given arrays for equalitiy. This method considers both arrays as
+ * equal, if both are <code>null</code> or both have the same length and
+@@ -589,6 +595,10 @@
+ addMapping(objectClassNames, objectClassIds, id, name);
+ }
+
++ private static void addHashMech(long id, String name) {
++ hashMechIds.put(name, id);
++ }
++
+ static {
+ addMech(CKM_RSA_PKCS_KEY_PAIR_GEN, "CKM_RSA_PKCS_KEY_PAIR_GEN");
+ addMech(CKM_RSA_PKCS, "CKM_RSA_PKCS");
+@@ -719,6 +729,10 @@
+ addMech(CKM_TLS_PRF, "CKM_TLS_PRF");
+ addMech(CKM_SSL3_MD5_MAC, "CKM_SSL3_MD5_MAC");
+ addMech(CKM_SSL3_SHA1_MAC, "CKM_SSL3_SHA1_MAC");
++ addMech(CKM_TLS12_MASTER_KEY_DERIVE, "CKM_TLS12_MASTER_KEY_DERIVE");
++ addMech(CKM_TLS12_KEY_AND_MAC_DERIVE, "CKM_TLS12_KEY_AND_MAC_DERIVE");
++ addMech(CKM_TLS12_MASTER_KEY_DERIVE_DH, "CKM_TLS12_MASTER_KEY_DERIVE_DH");
++ addMech(CKM_TLS_MAC, "CKM_TLS_MAC");
+ addMech(CKM_MD5_KEY_DERIVATION, "CKM_MD5_KEY_DERIVATION");
+ addMech(CKM_MD2_KEY_DERIVATION, "CKM_MD2_KEY_DERIVATION");
+ addMech(CKM_SHA1_KEY_DERIVATION, "CKM_SHA1_KEY_DERIVATION");
+@@ -794,6 +808,12 @@
+ addMech(PCKM_SECURERANDOM, "SecureRandom");
+ addMech(PCKM_KEYSTORE, "KeyStore");
+
++ addHashMech(CKM_SHA_1, "SHA-1");
++ addHashMech(CKM_SHA224, "SHA-224");
++ addHashMech(CKM_SHA256, "SHA-256");
++ addHashMech(CKM_SHA384, "SHA-384");
++ addHashMech(CKM_SHA512, "SHA-512");
++
+ addKeyType(CKK_RSA, "CKK_RSA");
+ addKeyType(CKK_DSA, "CKK_DSA");
+ addKeyType(CKK_DH, "CKK_DH");
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+
+ /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
+@@ -625,6 +625,14 @@
+ public static final long CKM_PKCS5_PBKD2 = 0x000003B0L;
+
+ public static final long CKM_PBA_SHA1_WITH_SHA1_HMAC = 0x000003C0L;
++
++ /* CKM_TLS12_MASTER_KEY_DERIVE, CKM_TLS12_KEY_AND_MAC_DERIVE,
++ * CKM_TLS12_MASTER_KEY_DERIVE_DH and CKM_TLS_MAC are new for v2.40 */
++ public static final long CKM_TLS12_MASTER_KEY_DERIVE = 0x000003E0L;
++ public static final long CKM_TLS12_KEY_AND_MAC_DERIVE = 0x000003E1L;
++ public static final long CKM_TLS12_MASTER_KEY_DERIVE_DH = 0x000003E2L;
++ public static final long CKM_TLS_MAC = 0x000003E4L;
++
+ public static final long CKM_KEY_WRAP_LYNKS = 0x00000400L;
+ public static final long CKM_KEY_WRAP_SET_OAEP = 0x00000401L;
+
+diff --git openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
+--- openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
++++ openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+
+ /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
+@@ -457,67 +457,113 @@
+ return ckAttribute ;
+ }
+
+-/*
+- * converts the Java CK_SSL3_MASTER_KEY_DERIVE_PARAMS object to a
+- * CK_SSL3_MASTER_KEY_DERIVE_PARAMS structure
+- *
+- * @param env - used to call JNI funktions to get the Java classes and objects
+- * @param jParam - the Java CK_SSL3_MASTER_KEY_DERIVE_PARAMS object to convert
+- * @return - the new CK_SSL3_MASTER_KEY_DERIVE_PARAMS structure
+- */
+-CK_SSL3_MASTER_KEY_DERIVE_PARAMS jSsl3MasterKeyDeriveParamToCKSsl3MasterKeyDeriveParam(JNIEnv *env, jobject jParam)
+-{
+- // XXX don't return structs
+- // XXX prefetch class and field ids
+- jclass jSsl3MasterKeyDeriveParamsClass;
+- CK_SSL3_MASTER_KEY_DERIVE_PARAMS ckParam;
++void masterKeyDeriveParamToCKMasterKeyDeriveParam(JNIEnv *env, jobject jParam,
++ jclass masterKeyDeriveParamClass,
++ CK_VERSION_PTR* cKMasterKeyDeriveParamVersion,
++ CK_SSL3_RANDOM_DATA* cKMasterKeyDeriveParamRandomInfo) {
+ jfieldID fieldID;
+ jclass jSsl3RandomDataClass;
+ jobject jRandomInfo, jRIClientRandom, jRIServerRandom, jVersion;
+- memset(&ckParam, 0, sizeof(CK_SSL3_MASTER_KEY_DERIVE_PARAMS));
+
+ /* get RandomInfo */
+- jSsl3MasterKeyDeriveParamsClass = (*env)->FindClass(env, CLASS_SSL3_MASTER_KEY_DERIVE_PARAMS);
+- if (jSsl3MasterKeyDeriveParamsClass == NULL) { return ckParam; }
+- fieldID = (*env)->GetFieldID(env, jSsl3MasterKeyDeriveParamsClass, "RandomInfo", "Lsun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA;");
+- if (fieldID == NULL) { return ckParam; }
++ fieldID = (*env)->GetFieldID(env, masterKeyDeriveParamClass, "RandomInfo",
++ "Lsun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA;");
++ if (fieldID == NULL) { return; }
+ jRandomInfo = (*env)->GetObjectField(env, jParam, fieldID);
+
+ /* get pClientRandom and ulClientRandomLength out of RandomInfo */
+ jSsl3RandomDataClass = (*env)->FindClass(env, CLASS_SSL3_RANDOM_DATA);
+- if (jSsl3RandomDataClass == NULL) { return ckParam; }
++ if (jSsl3RandomDataClass == NULL) { return; }
+ fieldID = (*env)->GetFieldID(env, jSsl3RandomDataClass, "pClientRandom", "[B");
+- if (fieldID == NULL) { return ckParam; }
++ if (fieldID == NULL) { return; }
+ jRIClientRandom = (*env)->GetObjectField(env, jRandomInfo, fieldID);
+
+ /* get pServerRandom and ulServerRandomLength out of RandomInfo */
+ fieldID = (*env)->GetFieldID(env, jSsl3RandomDataClass, "pServerRandom", "[B");
+- if (fieldID == NULL) { return ckParam; }
++ if (fieldID == NULL) { return; }
+ jRIServerRandom = (*env)->GetObjectField(env, jRandomInfo, fieldID);
+
+ /* get pVersion */
+- fieldID = (*env)->GetFieldID(env, jSsl3MasterKeyDeriveParamsClass, "pVersion", "Lsun/security/pkcs11/wrapper/CK_VERSION;");
+- if (fieldID == NULL) { return ckParam; }
++ fieldID = (*env)->GetFieldID(env, masterKeyDeriveParamClass, "pVersion",
++ "Lsun/security/pkcs11/wrapper/CK_VERSION;");
++ if (fieldID == NULL) { return; }
+ jVersion = (*env)->GetObjectField(env, jParam, fieldID);
+
+ /* populate java values */
+- ckParam.pVersion = jVersionToCKVersionPtr(env, jVersion);
+- if ((*env)->ExceptionCheck(env)) { return ckParam; }
+- jByteArrayToCKByteArray(env, jRIClientRandom, &(ckParam.RandomInfo.pClientRandom), &(ckParam.RandomInfo.ulClientRandomLen));
++ *cKMasterKeyDeriveParamVersion = jVersionToCKVersionPtr(env, jVersion);
++ if ((*env)->ExceptionCheck(env)) { return; }
++ jByteArrayToCKByteArray(env, jRIClientRandom,
++ &(cKMasterKeyDeriveParamRandomInfo->pClientRandom),
++ &(cKMasterKeyDeriveParamRandomInfo->ulClientRandomLen));
+ if ((*env)->ExceptionCheck(env)) {
+- free(ckParam.pVersion);
+- return ckParam;
++ free(*cKMasterKeyDeriveParamVersion);
++ return;
+ }
+- jByteArrayToCKByteArray(env, jRIServerRandom, &(ckParam.RandomInfo.pServerRandom), &(ckParam.RandomInfo.ulServerRandomLen));
++ jByteArrayToCKByteArray(env, jRIServerRandom,
++ &(cKMasterKeyDeriveParamRandomInfo->pServerRandom),
++ &(cKMasterKeyDeriveParamRandomInfo->ulServerRandomLen));
+ if ((*env)->ExceptionCheck(env)) {
+- free(ckParam.pVersion);
+- free(ckParam.RandomInfo.pClientRandom);
+- return ckParam;
++ free(*cKMasterKeyDeriveParamVersion);
++ free(cKMasterKeyDeriveParamRandomInfo->pClientRandom);
++ return;
+ }
+-
+- return ckParam ;
+ }
+
++/*
++ * converts the Java CK_SSL3_MASTER_KEY_DERIVE_PARAMS object to a
++ * CK_SSL3_MASTER_KEY_DERIVE_PARAMS structure
++ *
++ * @param env - used to call JNI functions to get the Java classes and objects
++ * @param jParam - the Java CK_SSL3_MASTER_KEY_DERIVE_PARAMS object to convert
++ * @return - the new CK_SSL3_MASTER_KEY_DERIVE_PARAMS structure
++ */
++CK_SSL3_MASTER_KEY_DERIVE_PARAMS
++jSsl3MasterKeyDeriveParamToCKSsl3MasterKeyDeriveParam(JNIEnv *env,
++ jobject jParam)
++{
++ CK_SSL3_MASTER_KEY_DERIVE_PARAMS ckParam;
++ jclass jSsl3MasterKeyDeriveParamsClass;
++ memset(&ckParam, 0, sizeof(CK_SSL3_MASTER_KEY_DERIVE_PARAMS));
++ jSsl3MasterKeyDeriveParamsClass =
++ (*env)->FindClass(env, CLASS_SSL3_MASTER_KEY_DERIVE_PARAMS);
++ if (jSsl3MasterKeyDeriveParamsClass == NULL) { return ckParam; }
++ masterKeyDeriveParamToCKMasterKeyDeriveParam(env, jParam,
++ jSsl3MasterKeyDeriveParamsClass,
++ &ckParam.pVersion, &ckParam.RandomInfo);
++ return ckParam;
++}
++
++/*
++ * converts the Java CK_TLS12_MASTER_KEY_DERIVE_PARAMS object to a
++ * CK_TLS12_MASTER_KEY_DERIVE_PARAMS structure
++ *
++ * @param env - used to call JNI functions to get the Java classes and objects
++ * @param jParam - the Java CK_TLS12_MASTER_KEY_DERIVE_PARAMS object to convert
++ * @return - the new CK_TLS12_MASTER_KEY_DERIVE_PARAMS structure
++ */
++CK_TLS12_MASTER_KEY_DERIVE_PARAMS
++jTls12MasterKeyDeriveParamToCKTls12MasterKeyDeriveParam(JNIEnv *env,
++ jobject jParam)
++{
++ CK_TLS12_MASTER_KEY_DERIVE_PARAMS ckParam;
++ jclass jTls12MasterKeyDeriveParamsClass;
++ jfieldID fieldID;
++ memset(&ckParam, 0, sizeof(CK_TLS12_MASTER_KEY_DERIVE_PARAMS));
++ jTls12MasterKeyDeriveParamsClass =
++ (*env)->FindClass(env, CLASS_TLS12_MASTER_KEY_DERIVE_PARAMS);
++ if (jTls12MasterKeyDeriveParamsClass == NULL) { return ckParam; }
++ masterKeyDeriveParamToCKMasterKeyDeriveParam(env, jParam,
++ jTls12MasterKeyDeriveParamsClass, &ckParam.pVersion,
++ &ckParam.RandomInfo);
++ fieldID = (*env)->GetFieldID(env,
++ jTls12MasterKeyDeriveParamsClass, "prfHashMechanism", "J");
++ if (fieldID != NULL) {
++ jlong prfHashMechanism =
++ (*env)->GetLongField(env, jParam, fieldID);
++ ckParam.prfHashMechanism = (CK_MECHANISM_TYPE)prfHashMechanism;
++ }
++ return ckParam;
++}
+
+ /*
+ * converts the Java CK_TLS_PRF_PARAMS object to a CK_TLS_PRF_PARAMS structure
+@@ -576,126 +622,220 @@
+ }
+
+ /*
+- * converts the Java CK_SSL3_KEY_MAT_PARAMS object to a CK_SSL3_KEY_MAT_PARAMS structure
+- *
+- * @param env - used to call JNI funktions to get the Java classes and objects
+- * @param jParam - the Java CK_SSL3_KEY_MAT_PARAMS object to convert
+- * @return - the new CK_SSL3_KEY_MAT_PARAMS structure
++ * converts the Java CK_TLS_MAC_PARAMS object to a CK_TLS_MAC_PARAMS structure
+ */
+-CK_SSL3_KEY_MAT_PARAMS jSsl3KeyMatParamToCKSsl3KeyMatParam(JNIEnv *env, jobject jParam)
++CK_TLS_MAC_PARAMS jTlsMacParamsToCKTlsMacParam(JNIEnv *env, jobject jParam)
+ {
+- // XXX don't return structs
+- // XXX prefetch class and field ids
+- jclass jSsl3KeyMatParamsClass, jSsl3RandomDataClass, jSsl3KeyMatOutClass;
+- CK_SSL3_KEY_MAT_PARAMS ckParam;
++ jclass jTlsMacParamsClass;
++ CK_TLS_MAC_PARAMS ckParam;
++ jfieldID fieldID;
++ jlong jPrfMechanism, jUlMacLength, jUlServerOrClient;
++ memset(&ckParam, 0, sizeof(CK_TLS_MAC_PARAMS));
++
++ jTlsMacParamsClass = (*env)->FindClass(env, CLASS_TLS_MAC_PARAMS);
++ if (jTlsMacParamsClass == NULL) { return ckParam; }
++
++ /* get prfMechanism */
++ fieldID = (*env)->GetFieldID(env, jTlsMacParamsClass, "prfMechanism", "J");
++ if (fieldID == NULL) { return ckParam; }
++ jPrfMechanism = (*env)->GetLongField(env, jParam, fieldID);
++
++ /* get ulMacLength */
++ fieldID = (*env)->GetFieldID(env, jTlsMacParamsClass, "ulMacLength", "J");
++ if (fieldID == NULL) { return ckParam; }
++ jUlMacLength = (*env)->GetLongField(env, jParam, fieldID);
++
++ /* get ulServerOrClient */
++ fieldID = (*env)->GetFieldID(env, jTlsMacParamsClass, "ulServerOrClient", "J");
++ if (fieldID == NULL) { return ckParam; }
++ jUlServerOrClient = (*env)->GetLongField(env, jParam, fieldID);
++
++ /* populate java values */
++ ckParam.prfMechanism = jLongToCKULong(jPrfMechanism);
++ ckParam.ulMacLength = jLongToCKULong(jUlMacLength);
++ ckParam.ulServerOrClient = jLongToCKULong(jUlServerOrClient);
++
++ return ckParam;
++}
++
++void keyMatParamToCKKeyMatParam(JNIEnv *env, jobject jParam,
++ jclass jKeyMatParamClass,
++ CK_ULONG* cKKeyMatParamUlMacSizeInBits,
++ CK_ULONG* cKKeyMatParamUlKeySizeInBits,
++ CK_ULONG* cKKeyMatParamUlIVSizeInBits,
++ CK_BBOOL* cKKeyMatParamBIsExport,
++ CK_SSL3_RANDOM_DATA* cKKeyMatParamRandomInfo,
++ CK_SSL3_KEY_MAT_OUT_PTR* cKKeyMatParamPReturnedKeyMaterial)
++{
++ jclass jSsl3RandomDataClass, jSsl3KeyMatOutClass;
+ jfieldID fieldID;
+ jlong jMacSizeInBits, jKeySizeInBits, jIVSizeInBits;
+ jboolean jIsExport;
+ jobject jRandomInfo, jRIClientRandom, jRIServerRandom;
+ jobject jReturnedKeyMaterial, jRMIvClient, jRMIvServer;
+ CK_ULONG ckTemp;
+- memset(&ckParam, 0, sizeof(CK_SSL3_KEY_MAT_PARAMS));
+
+ /* get ulMacSizeInBits */
+- jSsl3KeyMatParamsClass = (*env)->FindClass(env, CLASS_SSL3_KEY_MAT_PARAMS);
+- if (jSsl3KeyMatParamsClass == NULL) { return ckParam; }
+- fieldID = (*env)->GetFieldID(env, jSsl3KeyMatParamsClass, "ulMacSizeInBits", "J");
+- if (fieldID == NULL) { return ckParam; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamClass, "ulMacSizeInBits", "J");
++ if (fieldID == NULL) { return; }
+ jMacSizeInBits = (*env)->GetLongField(env, jParam, fieldID);
+
+ /* get ulKeySizeInBits */
+- fieldID = (*env)->GetFieldID(env, jSsl3KeyMatParamsClass, "ulKeySizeInBits", "J");
+- if (fieldID == NULL) { return ckParam; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamClass, "ulKeySizeInBits", "J");
++ if (fieldID == NULL) { return; }
+ jKeySizeInBits = (*env)->GetLongField(env, jParam, fieldID);
+
+ /* get ulIVSizeInBits */
+- fieldID = (*env)->GetFieldID(env, jSsl3KeyMatParamsClass, "ulIVSizeInBits", "J");
+- if (fieldID == NULL) { return ckParam; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamClass, "ulIVSizeInBits", "J");
++ if (fieldID == NULL) { return; }
+ jIVSizeInBits = (*env)->GetLongField(env, jParam, fieldID);
+
+ /* get bIsExport */
+- fieldID = (*env)->GetFieldID(env, jSsl3KeyMatParamsClass, "bIsExport", "Z");
+- if (fieldID == NULL) { return ckParam; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamClass, "bIsExport", "Z");
++ if (fieldID == NULL) { return; }
+ jIsExport = (*env)->GetBooleanField(env, jParam, fieldID);
+
+ /* get RandomInfo */
+ jSsl3RandomDataClass = (*env)->FindClass(env, CLASS_SSL3_RANDOM_DATA);
+- if (jSsl3RandomDataClass == NULL) { return ckParam; }
+- fieldID = (*env)->GetFieldID(env, jSsl3KeyMatParamsClass, "RandomInfo", "Lsun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA;");
+- if (fieldID == NULL) { return ckParam; }
++ if (jSsl3RandomDataClass == NULL) { return; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamClass, "RandomInfo",
++ "Lsun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA;");
++ if (fieldID == NULL) { return; }
+ jRandomInfo = (*env)->GetObjectField(env, jParam, fieldID);
+
+ /* get pClientRandom and ulClientRandomLength out of RandomInfo */
+ fieldID = (*env)->GetFieldID(env, jSsl3RandomDataClass, "pClientRandom", "[B");
+- if (fieldID == NULL) { return ckParam; }
++ if (fieldID == NULL) { return; }
+ jRIClientRandom = (*env)->GetObjectField(env, jRandomInfo, fieldID);
+
+ /* get pServerRandom and ulServerRandomLength out of RandomInfo */
+ fieldID = (*env)->GetFieldID(env, jSsl3RandomDataClass, "pServerRandom", "[B");
+- if (fieldID == NULL) { return ckParam; }
++ if (fieldID == NULL) { return; }
+ jRIServerRandom = (*env)->GetObjectField(env, jRandomInfo, fieldID);
+
+ /* get pReturnedKeyMaterial */
+ jSsl3KeyMatOutClass = (*env)->FindClass(env, CLASS_SSL3_KEY_MAT_OUT);
+- if (jSsl3KeyMatOutClass == NULL) { return ckParam; }
+- fieldID = (*env)->GetFieldID(env, jSsl3KeyMatParamsClass, "pReturnedKeyMaterial", "Lsun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT;");
+- if (fieldID == NULL) { return ckParam; }
++ if (jSsl3KeyMatOutClass == NULL) { return; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamClass, "pReturnedKeyMaterial",
++ "Lsun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT;");
++ if (fieldID == NULL) { return; }
+ jReturnedKeyMaterial = (*env)->GetObjectField(env, jParam, fieldID);
+
+ /* get pIVClient out of pReturnedKeyMaterial */
+ fieldID = (*env)->GetFieldID(env, jSsl3KeyMatOutClass, "pIVClient", "[B");
+- if (fieldID == NULL) { return ckParam; }
++ if (fieldID == NULL) { return; }
+ jRMIvClient = (*env)->GetObjectField(env, jReturnedKeyMaterial, fieldID);
+
+ /* get pIVServer out of pReturnedKeyMaterial */
+ fieldID = (*env)->GetFieldID(env, jSsl3KeyMatOutClass, "pIVServer", "[B");
+- if (fieldID == NULL) { return ckParam; }
++ if (fieldID == NULL) { return; }
+ jRMIvServer = (*env)->GetObjectField(env, jReturnedKeyMaterial, fieldID);
+
+ /* populate java values */
+- ckParam.ulMacSizeInBits = jLongToCKULong(jMacSizeInBits);
+- ckParam.ulKeySizeInBits = jLongToCKULong(jKeySizeInBits);
+- ckParam.ulIVSizeInBits = jLongToCKULong(jIVSizeInBits);
+- ckParam.bIsExport = jBooleanToCKBBool(jIsExport);
+- jByteArrayToCKByteArray(env, jRIClientRandom, &(ckParam.RandomInfo.pClientRandom), &(ckParam.RandomInfo.ulClientRandomLen));
+- if ((*env)->ExceptionCheck(env)) { return ckParam; }
+- jByteArrayToCKByteArray(env, jRIServerRandom, &(ckParam.RandomInfo.pServerRandom), &(ckParam.RandomInfo.ulServerRandomLen));
++ *cKKeyMatParamUlMacSizeInBits = jLongToCKULong(jMacSizeInBits);
++ *cKKeyMatParamUlKeySizeInBits = jLongToCKULong(jKeySizeInBits);
++ *cKKeyMatParamUlIVSizeInBits = jLongToCKULong(jIVSizeInBits);
++ *cKKeyMatParamBIsExport = jBooleanToCKBBool(jIsExport);
++ jByteArrayToCKByteArray(env, jRIClientRandom,
++ &(cKKeyMatParamRandomInfo->pClientRandom),
++ &(cKKeyMatParamRandomInfo->ulClientRandomLen));
++ if ((*env)->ExceptionCheck(env)) { return; }
++ jByteArrayToCKByteArray(env, jRIServerRandom,
++ &(cKKeyMatParamRandomInfo->pServerRandom),
++ &(cKKeyMatParamRandomInfo->ulServerRandomLen));
+ if ((*env)->ExceptionCheck(env)) {
+- free(ckParam.RandomInfo.pClientRandom);
+- return ckParam;
++ free(cKKeyMatParamRandomInfo->pClientRandom);
++ return;
+ }
+ /* allocate memory for pRetrunedKeyMaterial */
+- ckParam.pReturnedKeyMaterial = (CK_SSL3_KEY_MAT_OUT_PTR) malloc(sizeof(CK_SSL3_KEY_MAT_OUT));
+- if (ckParam.pReturnedKeyMaterial == NULL) {
+- free(ckParam.RandomInfo.pClientRandom);
+- free(ckParam.RandomInfo.pServerRandom);
++ *cKKeyMatParamPReturnedKeyMaterial =
++ (CK_SSL3_KEY_MAT_OUT_PTR)malloc(sizeof(CK_SSL3_KEY_MAT_OUT));
++ if (*cKKeyMatParamPReturnedKeyMaterial == NULL) {
++ free(cKKeyMatParamRandomInfo->pClientRandom);
++ free(cKKeyMatParamRandomInfo->pServerRandom);
+ throwOutOfMemoryError(env, 0);
+- return ckParam;
++ return;
+ }
+
+ // the handles are output params only, no need to fetch them from Java
+- ckParam.pReturnedKeyMaterial->hClientMacSecret = 0;
+- ckParam.pReturnedKeyMaterial->hServerMacSecret = 0;
+- ckParam.pReturnedKeyMaterial->hClientKey = 0;
+- ckParam.pReturnedKeyMaterial->hServerKey = 0;
++ (*cKKeyMatParamPReturnedKeyMaterial)->hClientMacSecret = 0;
++ (*cKKeyMatParamPReturnedKeyMaterial)->hServerMacSecret = 0;
++ (*cKKeyMatParamPReturnedKeyMaterial)->hClientKey = 0;
++ (*cKKeyMatParamPReturnedKeyMaterial)->hServerKey = 0;
+
+- jByteArrayToCKByteArray(env, jRMIvClient, &(ckParam.pReturnedKeyMaterial->pIVClient), &ckTemp);
++ jByteArrayToCKByteArray(env, jRMIvClient,
++ &((*cKKeyMatParamPReturnedKeyMaterial)->pIVClient), &ckTemp);
+ if ((*env)->ExceptionCheck(env)) {
+- free(ckParam.RandomInfo.pClientRandom);
+- free(ckParam.RandomInfo.pServerRandom);
+- free(ckParam.pReturnedKeyMaterial);
+- return ckParam;
++ free(cKKeyMatParamRandomInfo->pClientRandom);
++ free(cKKeyMatParamRandomInfo->pServerRandom);
++ free((*cKKeyMatParamPReturnedKeyMaterial));
++ return;
+ }
+- jByteArrayToCKByteArray(env, jRMIvServer, &(ckParam.pReturnedKeyMaterial->pIVServer), &ckTemp);
++ jByteArrayToCKByteArray(env, jRMIvServer,
++ &((*cKKeyMatParamPReturnedKeyMaterial)->pIVServer), &ckTemp);
+ if ((*env)->ExceptionCheck(env)) {
+- free(ckParam.RandomInfo.pClientRandom);
+- free(ckParam.RandomInfo.pServerRandom);
+- free(ckParam.pReturnedKeyMaterial->pIVClient);
+- free(ckParam.pReturnedKeyMaterial);
+- return ckParam;
++ free(cKKeyMatParamRandomInfo->pClientRandom);
++ free(cKKeyMatParamRandomInfo->pServerRandom);
++ free((*cKKeyMatParamPReturnedKeyMaterial)->pIVClient);
++ free((*cKKeyMatParamPReturnedKeyMaterial));
++ return;
+ }
+
+- return ckParam ;
++ return;
++}
++/*
++ * converts the Java CK_SSL3_KEY_MAT_PARAMS object to a
++ * CK_SSL3_KEY_MAT_PARAMS structure
++ *
++ * @param env - used to call JNI funktions to get the Java classes and objects
++ * @param jParam - the Java CK_SSL3_KEY_MAT_PARAMS object to convert
++ * @return - the new CK_SSL3_KEY_MAT_PARAMS structure
++ */
++CK_SSL3_KEY_MAT_PARAMS
++jSsl3KeyMatParamToCKSsl3KeyMatParam(JNIEnv *env, jobject jParam)
++{
++ CK_SSL3_KEY_MAT_PARAMS ckParam;
++ jclass jSsl3KeyMatParamsClass;
++ memset(&ckParam, 0, sizeof(CK_SSL3_KEY_MAT_PARAMS));
++ jSsl3KeyMatParamsClass = (*env)->FindClass(env,
++ CLASS_SSL3_KEY_MAT_PARAMS);
++ if (jSsl3KeyMatParamsClass == NULL) { return ckParam; }
++ keyMatParamToCKKeyMatParam(env, jParam, jSsl3KeyMatParamsClass,
++ &ckParam.ulMacSizeInBits, &ckParam.ulKeySizeInBits,
++ &ckParam.ulIVSizeInBits, &ckParam.bIsExport,
++ &ckParam.RandomInfo, &ckParam.pReturnedKeyMaterial);
++ return ckParam;
++}
++
++/*
++ * converts the Java CK_TLS12_KEY_MAT_PARAMS object to a
++ * CK_TLS12_KEY_MAT_PARAMS structure
++ *
++ * @param env - used to call JNI functions to get the Java classes and objects
++ * @param jParam - the Java CK_TLS12_KEY_MAT_PARAMS object to convert
++ * @return - the new CK_TLS12_KEY_MAT_PARAMS structure
++ */
++CK_TLS12_KEY_MAT_PARAMS jTls12KeyMatParamToCKTls12KeyMatParam(JNIEnv *env,
++ jobject jParam)
++{
++ CK_TLS12_KEY_MAT_PARAMS ckParam;
++ jclass jTls12KeyMatParamsClass;
++ jfieldID fieldID;
++ memset(&ckParam, 0, sizeof(CK_TLS12_KEY_MAT_PARAMS));
++ jTls12KeyMatParamsClass = (*env)->FindClass(env,
++ CLASS_TLS12_KEY_MAT_PARAMS);
++ if (jTls12KeyMatParamsClass == NULL) { return ckParam; }
++ keyMatParamToCKKeyMatParam(env, jParam, jTls12KeyMatParamsClass,
++ &ckParam.ulMacSizeInBits, &ckParam.ulKeySizeInBits,
++ &ckParam.ulIVSizeInBits, &ckParam.bIsExport,
++ &ckParam.RandomInfo, &ckParam.pReturnedKeyMaterial);
++ fieldID = (*env)->GetFieldID(env, jTls12KeyMatParamsClass,
++ "prfHashMechanism", "J");
++ if (fieldID != NULL) {
++ jlong prfHashMechanism = (*env)->GetLongField(env, jParam, fieldID);
++ ckParam.prfHashMechanism = (CK_MECHANISM_TYPE)prfHashMechanism;
++ }
++ return ckParam;
+ }
+
+ /*
+@@ -980,8 +1120,11 @@
+ void jMechanismParameterToCKMechanismParameterSlow(JNIEnv *env, jobject jParam, CK_VOID_PTR *ckpParamPtr, CK_ULONG *ckpLength)
+ {
+ /* get all Java mechanism parameter classes */
+- jclass jVersionClass, jSsl3MasterKeyDeriveParamsClass, jSsl3KeyMatParamsClass;
+- jclass jTlsPrfParamsClass, jAesCtrParamsClass, jRsaPkcsOaepParamsClass;
++ jclass jVersionClass, jSsl3MasterKeyDeriveParamsClass;
++ jclass jTls12MasterKeyDeriveParamsClass, jSsl3KeyMatParamsClass;
++ jclass jTls12KeyMatParamsClass;
++ jclass jTlsPrfParamsClass, jTlsMacParamsClass, jAesCtrParamsClass;
++ jclass jRsaPkcsOaepParamsClass;
+ jclass jPbeParamsClass, jPkcs5Pbkd2ParamsClass, jRsaPkcsPssParamsClass;
+ jclass jEcdh1DeriveParamsClass, jEcdh2DeriveParamsClass;
+ jclass jX942Dh1DeriveParamsClass, jX942Dh2DeriveParamsClass;
+@@ -1061,6 +1204,62 @@
+ return;
+ }
+
++ jTls12KeyMatParamsClass = (*env)->FindClass(env, CLASS_TLS12_KEY_MAT_PARAMS);
++ if (jTls12KeyMatParamsClass == NULL) { return; }
++ if ((*env)->IsInstanceOf(env, jParam, jTls12KeyMatParamsClass)) {
++ /*
++ * CK_TLS12_KEY_MAT_PARAMS
++ */
++ CK_TLS12_KEY_MAT_PARAMS_PTR ckpParam;
++
++ ckpParam = (CK_TLS12_KEY_MAT_PARAMS_PTR) malloc(sizeof(CK_TLS12_KEY_MAT_PARAMS));
++ if (ckpParam == NULL) {
++ throwOutOfMemoryError(env, 0);
++ return;
++ }
++
++ /* convert jParameter to CKParameter */
++ *ckpParam = jTls12KeyMatParamToCKTls12KeyMatParam(env, jParam);
++ if ((*env)->ExceptionCheck(env)) {
++ free(ckpParam);
++ return;
++ }
++
++ /* get length and pointer of parameter */
++ *ckpLength = sizeof(CK_TLS12_KEY_MAT_PARAMS);
++ *ckpParamPtr = ckpParam;
++ return;
++ }
++
++ jTls12MasterKeyDeriveParamsClass =
++ (*env)->FindClass(env, CLASS_TLS12_MASTER_KEY_DERIVE_PARAMS);
++ if (jTls12MasterKeyDeriveParamsClass == NULL) { return; }
++ if ((*env)->IsInstanceOf(env, jParam, jTls12MasterKeyDeriveParamsClass)) {
++ /*
++ * CK_TLS12_MASTER_KEY_DERIVE_PARAMS
++ */
++ CK_TLS12_MASTER_KEY_DERIVE_PARAMS_PTR ckpParam;
++
++ ckpParam = (CK_TLS12_MASTER_KEY_DERIVE_PARAMS_PTR)malloc(
++ sizeof(CK_TLS12_MASTER_KEY_DERIVE_PARAMS));
++ if (ckpParam == NULL) {
++ throwOutOfMemoryError(env, 0);
++ return;
++ }
++
++ /* convert jParameter to CKParameter */
++ *ckpParam = jTls12MasterKeyDeriveParamToCKTls12MasterKeyDeriveParam(env, jParam);
++ if ((*env)->ExceptionCheck(env)) {
++ free(ckpParam);
++ return;
++ }
++
++ /* get length and pointer of parameter */
++ *ckpLength = sizeof(CK_TLS12_MASTER_KEY_DERIVE_PARAMS);
++ *ckpParamPtr = ckpParam;
++ return;
++ }
++
+ jTlsPrfParamsClass = (*env)->FindClass(env, CLASS_TLS_PRF_PARAMS);
+ if (jTlsPrfParamsClass == NULL) { return; }
+ if ((*env)->IsInstanceOf(env, jParam, jTlsPrfParamsClass)) {
+@@ -1088,6 +1287,30 @@
+ return;
+ }
+
++ jTlsMacParamsClass = (*env)->FindClass(env, CLASS_TLS_MAC_PARAMS);
++ if (jTlsMacParamsClass == NULL) { return; }
++ if ((*env)->IsInstanceOf(env, jParam, jTlsMacParamsClass)) {
++ CK_TLS_MAC_PARAMS_PTR ckpParam;
++
++ ckpParam = (CK_TLS_MAC_PARAMS_PTR) malloc(sizeof(CK_TLS_MAC_PARAMS));
++ if (ckpParam == NULL) {
++ throwOutOfMemoryError(env, 0);
++ return;
++ }
++
++ /* convert jParameter to CKParameter */
++ *ckpParam = jTlsMacParamsToCKTlsMacParam(env, jParam);
++ if ((*env)->ExceptionCheck(env)) {
++ free(ckpParam);
++ return;
++ }
++
++ /* get length and pointer of parameter */
++ *ckpLength = sizeof(CK_TLS_MAC_PARAMS);
++ *ckpParamPtr = ckpParam;
++ return;
++ }
++
+ jAesCtrParamsClass = (*env)->FindClass(env, CLASS_AES_CTR_PARAMS);
+ if (jAesCtrParamsClass == NULL) { return; }
+ if ((*env)->IsInstanceOf(env, jParam, jAesCtrParamsClass)) {
+diff --git openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
+--- openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
++++ openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+
+ /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
+@@ -355,25 +355,38 @@
+
+ #ifdef P11_ENABLE_C_DERIVEKEY
+
+-void freeMasterKeyDeriveParams(CK_MECHANISM_PTR ckMechanism) {
++static void freeMasterKeyDeriveParams(CK_SSL3_RANDOM_DATA *RandomInfo, CK_VERSION_PTR pVersion) {
++ if (RandomInfo->pClientRandom != NULL) {
++ free(RandomInfo->pClientRandom);
++ }
++ if (RandomInfo->pServerRandom != NULL) {
++ free(RandomInfo->pServerRandom);
++ }
++ if (pVersion != NULL) {
++ free(pVersion);
++ }
++}
++
++void ssl3FreeMasterKeyDeriveParams(CK_MECHANISM_PTR ckMechanism) {
+ CK_SSL3_MASTER_KEY_DERIVE_PARAMS *params = (CK_SSL3_MASTER_KEY_DERIVE_PARAMS *) ckMechanism->pParameter;
+ if (params == NULL) {
+ return;
+ }
++ freeMasterKeyDeriveParams(&(params->RandomInfo), params->pVersion);
++}
+
+- if (params->RandomInfo.pClientRandom != NULL) {
+- free(params->RandomInfo.pClientRandom);
++void tls12FreeMasterKeyDeriveParams(CK_MECHANISM_PTR ckMechanism) {
++ CK_TLS12_MASTER_KEY_DERIVE_PARAMS *params =
++ (CK_TLS12_MASTER_KEY_DERIVE_PARAMS *)ckMechanism->pParameter;
++ if (params == NULL) {
++ return;
+ }
+- if (params->RandomInfo.pServerRandom != NULL) {
+- free(params->RandomInfo.pServerRandom);
+- }
+- if (params->pVersion != NULL) {
+- free(params->pVersion);
+- }
++ freeMasterKeyDeriveParams(&(params->RandomInfo), params->pVersion);
+ }
+
+ void freeEcdh1DeriveParams(CK_MECHANISM_PTR ckMechanism) {
+- CK_ECDH1_DERIVE_PARAMS *params = (CK_ECDH1_DERIVE_PARAMS *) ckMechanism->pParameter;
++ CK_ECDH1_DERIVE_PARAMS *params =
++ (CK_ECDH1_DERIVE_PARAMS *)ckMechanism->pParameter;
+ if (params == NULL) {
+ return;
+ }
+@@ -498,6 +511,7 @@
+ switch (ckMechanism.mechanism) {
+ case CKM_SSL3_KEY_AND_MAC_DERIVE:
+ case CKM_TLS_KEY_AND_MAC_DERIVE:
++ case CKM_TLS12_KEY_AND_MAC_DERIVE:
+ case CKM_TLS_PRF:
+ // these mechanism do not return a key handle via phKey
+ // set to NULL in case pedantic implementations check for it
+@@ -519,17 +533,28 @@
+ case CKM_SSL3_MASTER_KEY_DERIVE:
+ case CKM_TLS_MASTER_KEY_DERIVE:
+ /* we must copy back the client version */
+- copyBackClientVersion(env, &ckMechanism, jMechanism);
+- freeMasterKeyDeriveParams(&ckMechanism);
++ ssl3CopyBackClientVersion(env, &ckMechanism, jMechanism);
++ ssl3FreeMasterKeyDeriveParams(&ckMechanism);
++ break;
++ case CKM_TLS12_MASTER_KEY_DERIVE:
++ tls12CopyBackClientVersion(env, &ckMechanism, jMechanism);
++ tls12FreeMasterKeyDeriveParams(&ckMechanism);
+ break;
+ case CKM_SSL3_MASTER_KEY_DERIVE_DH:
+ case CKM_TLS_MASTER_KEY_DERIVE_DH:
+- freeMasterKeyDeriveParams(&ckMechanism);
++ ssl3FreeMasterKeyDeriveParams(&ckMechanism);
++ break;
++ case CKM_TLS12_MASTER_KEY_DERIVE_DH:
++ tls12FreeMasterKeyDeriveParams(&ckMechanism);
+ break;
+ case CKM_SSL3_KEY_AND_MAC_DERIVE:
+ case CKM_TLS_KEY_AND_MAC_DERIVE:
+ /* we must copy back the unwrapped key info to the jMechanism object */
+- copyBackSSLKeyMatParams(env, &ckMechanism, jMechanism);
++ ssl3CopyBackKeyMatParams(env, &ckMechanism, jMechanism);
++ break;
++ case CKM_TLS12_KEY_AND_MAC_DERIVE:
++ /* we must copy back the unwrapped key info to the jMechanism object */
++ tls12CopyBackKeyMatParams(env, &ckMechanism, jMechanism);
+ break;
+ case CKM_TLS_PRF:
+ copyBackTLSPrfParams(env, &ckMechanism, jMechanism);
+@@ -550,53 +575,42 @@
+ return jKeyHandle ;
+ }
+
+-/*
+- * Copy back the client version information from the native
+- * structure to the Java object. This is only used for the
+- * CKM_SSL3_MASTER_KEY_DERIVE mechanism when used for deriving a key.
+- *
+- */
+-void copyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism)
++static void copyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism,
++ CK_VERSION *ckVersion, const char *class_master_key_derive_params)
+ {
+- jclass jMechanismClass, jSSL3MasterKeyDeriveParamsClass, jVersionClass;
+- CK_SSL3_MASTER_KEY_DERIVE_PARAMS *ckSSL3MasterKeyDeriveParams;
+- CK_VERSION *ckVersion;
+- jfieldID fieldID;
+- CK_MECHANISM_TYPE ckMechanismType;
+- jlong jMechanismType;
+- jobject jSSL3MasterKeyDeriveParams;
+- jobject jVersion;
++ jclass jMasterKeyDeriveParamsClass, jMechanismClass, jVersionClass;
++ jobject jMasterKeyDeriveParams;
++ jfieldID fieldID;
++ CK_MECHANISM_TYPE ckMechanismType;
++ jlong jMechanismType;
++ jobject jVersion;
+
+- /* get mechanism */
+- jMechanismClass = (*env)->FindClass(env, CLASS_MECHANISM);
+- if (jMechanismClass == NULL) { return; }
+- fieldID = (*env)->GetFieldID(env, jMechanismClass, "mechanism", "J");
+- if (fieldID == NULL) { return; }
+- jMechanismType = (*env)->GetLongField(env, jMechanism, fieldID);
+- ckMechanismType = jLongToCKULong(jMechanismType);
+- if (ckMechanismType != ckMechanism->mechanism) {
+- /* we do not have maching types, this should not occur */
+- return;
+- }
++ /* get mechanism */
++ jMechanismClass = (*env)->FindClass(env, CLASS_MECHANISM);
++ if (jMechanismClass == NULL) { return; }
++ fieldID = (*env)->GetFieldID(env, jMechanismClass, "mechanism", "J");
++ if (fieldID == NULL) { return; }
++ jMechanismType = (*env)->GetLongField(env, jMechanism, fieldID);
++ ckMechanismType = jLongToCKULong(jMechanismType);
++ if (ckMechanismType != ckMechanism->mechanism) {
++ /* we do not have maching types, this should not occur */
++ return;
++ }
+
+- /* get the native CK_SSL3_MASTER_KEY_DERIVE_PARAMS */
+- ckSSL3MasterKeyDeriveParams = (CK_SSL3_MASTER_KEY_DERIVE_PARAMS *) ckMechanism->pParameter;
+- if (ckSSL3MasterKeyDeriveParams != NULL_PTR) {
+- /* get the native CK_VERSION */
+- ckVersion = ckSSL3MasterKeyDeriveParams->pVersion;
+ if (ckVersion != NULL_PTR) {
+ /* get the Java CK_SSL3_MASTER_KEY_DERIVE_PARAMS (pParameter) */
+ fieldID = (*env)->GetFieldID(env, jMechanismClass, "pParameter", "Ljava/lang/Object;");
+ if (fieldID == NULL) { return; }
+
+- jSSL3MasterKeyDeriveParams = (*env)->GetObjectField(env, jMechanism, fieldID);
++ jMasterKeyDeriveParams = (*env)->GetObjectField(env, jMechanism, fieldID);
+
+ /* get the Java CK_VERSION */
+- jSSL3MasterKeyDeriveParamsClass = (*env)->FindClass(env, CLASS_SSL3_MASTER_KEY_DERIVE_PARAMS);
+- if (jSSL3MasterKeyDeriveParamsClass == NULL) { return; }
+- fieldID = (*env)->GetFieldID(env, jSSL3MasterKeyDeriveParamsClass, "pVersion", "L"CLASS_VERSION";");
++ jMasterKeyDeriveParamsClass = (*env)->FindClass(env, class_master_key_derive_params);
++ if (jMasterKeyDeriveParamsClass == NULL) { return; }
++ fieldID = (*env)->GetFieldID(env, jMasterKeyDeriveParamsClass,
++ "pVersion", "L"CLASS_VERSION";");
+ if (fieldID == NULL) { return; }
+- jVersion = (*env)->GetObjectField(env, jSSL3MasterKeyDeriveParams, fieldID);
++ jVersion = (*env)->GetObjectField(env, jMasterKeyDeriveParams, fieldID);
+
+ /* now copy back the version from the native structure to the Java structure */
+
+@@ -612,92 +626,126 @@
+ if (fieldID == NULL) { return; }
+ (*env)->SetByteField(env, jVersion, fieldID, ckByteToJByte(ckVersion->minor));
+ }
+- }
+ }
+
++/*
++ * Copy back the client version information from the native
++ * structure to the Java object. This is only used for
++ * CKM_SSL3_MASTER_KEY_DERIVE and CKM_TLS_MASTER_KEY_DERIVE
++ * mechanisms when used for deriving a key.
++ *
++ */
++void ssl3CopyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism,
++ jobject jMechanism)
++{
++ CK_SSL3_MASTER_KEY_DERIVE_PARAMS *ckSSL3MasterKeyDeriveParams;
++ ckSSL3MasterKeyDeriveParams =
++ (CK_SSL3_MASTER_KEY_DERIVE_PARAMS *)ckMechanism->pParameter;
++ if (ckSSL3MasterKeyDeriveParams != NULL_PTR) {
++ copyBackClientVersion(env, ckMechanism, jMechanism,
++ ckSSL3MasterKeyDeriveParams->pVersion,
++ CLASS_SSL3_MASTER_KEY_DERIVE_PARAMS);
++ }
++}
+
+ /*
+- * Copy back the derived keys and initialization vectors from the native
+- * structure to the Java object. This is only used for the
+- * CKM_SSL3_KEY_AND_MAC_DERIVE mechanism when used for deriving a key.
++ * Copy back the client version information from the native
++ * structure to the Java object. This is only used for
++ * CKM_TLS12_MASTER_KEY_DERIVE mechanism when used for deriving a key.
+ *
+ */
+-void copyBackSSLKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism)
++void tls12CopyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism,
++ jobject jMechanism)
+ {
+- jclass jMechanismClass, jSSL3KeyMatParamsClass, jSSL3KeyMatOutClass;
+- CK_SSL3_KEY_MAT_PARAMS *ckSSL3KeyMatParam;
+- CK_SSL3_KEY_MAT_OUT *ckSSL3KeyMatOut;
+- jfieldID fieldID;
+- CK_MECHANISM_TYPE ckMechanismType;
+- jlong jMechanismType;
+- CK_BYTE_PTR iv;
+- jobject jSSL3KeyMatParam;
+- jobject jSSL3KeyMatOut;
+- jobject jIV;
+- jint jLength;
+- jbyte* jBytes;
+- int i;
++ CK_TLS12_MASTER_KEY_DERIVE_PARAMS *ckTLS12MasterKeyDeriveParams;
++ ckTLS12MasterKeyDeriveParams =
++ (CK_TLS12_MASTER_KEY_DERIVE_PARAMS *)ckMechanism->pParameter;
++ if (ckTLS12MasterKeyDeriveParams != NULL_PTR) {
++ copyBackClientVersion(env, ckMechanism, jMechanism,
++ ckTLS12MasterKeyDeriveParams->pVersion,
++ CLASS_TLS12_MASTER_KEY_DERIVE_PARAMS);
++ }
++}
+
+- /* get mechanism */
+- jMechanismClass= (*env)->FindClass(env, CLASS_MECHANISM);
+- if (jMechanismClass == NULL) { return; }
+- fieldID = (*env)->GetFieldID(env, jMechanismClass, "mechanism", "J");
+- if (fieldID == NULL) { return; }
+- jMechanismType = (*env)->GetLongField(env, jMechanism, fieldID);
+- ckMechanismType = jLongToCKULong(jMechanismType);
+- if (ckMechanismType != ckMechanism->mechanism) {
+- /* we do not have maching types, this should not occur */
+- return;
+- }
++static void copyBackKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism,
++ jobject jMechanism, CK_SSL3_RANDOM_DATA *RandomInfo,
++ CK_SSL3_KEY_MAT_OUT_PTR ckSSL3KeyMatOut, const char *class_key_mat_params)
++{
++ jclass jMechanismClass, jKeyMatParamsClass, jSSL3KeyMatOutClass;
++ jfieldID fieldID;
++ CK_MECHANISM_TYPE ckMechanismType;
++ jlong jMechanismType;
++ CK_BYTE_PTR iv;
++ jobject jKeyMatParam;
++ jobject jSSL3KeyMatOut;
++ jobject jIV;
++ jint jLength;
++ jbyte* jBytes;
++ int i;
+
+- /* get the native CK_SSL3_KEY_MAT_PARAMS */
+- ckSSL3KeyMatParam = (CK_SSL3_KEY_MAT_PARAMS *) ckMechanism->pParameter;
+- if (ckSSL3KeyMatParam != NULL_PTR) {
+- // free malloc'd data
+- if (ckSSL3KeyMatParam->RandomInfo.pClientRandom != NULL) {
+- free(ckSSL3KeyMatParam->RandomInfo.pClientRandom);
+- }
+- if (ckSSL3KeyMatParam->RandomInfo.pServerRandom != NULL) {
+- free(ckSSL3KeyMatParam->RandomInfo.pServerRandom);
++ /* get mechanism */
++ jMechanismClass= (*env)->FindClass(env, CLASS_MECHANISM);
++ if (jMechanismClass == NULL) { return; }
++ fieldID = (*env)->GetFieldID(env, jMechanismClass, "mechanism", "J");
++ if (fieldID == NULL) { return; }
++ jMechanismType = (*env)->GetLongField(env, jMechanism, fieldID);
++ ckMechanismType = jLongToCKULong(jMechanismType);
++ if (ckMechanismType != ckMechanism->mechanism) {
++ /* we do not have maching types, this should not occur */
++ return;
+ }
+
+- /* get the native CK_SSL3_KEY_MAT_OUT */
+- ckSSL3KeyMatOut = ckSSL3KeyMatParam->pReturnedKeyMaterial;
++ // free malloc'd data
++ if (RandomInfo->pClientRandom != NULL) {
++ free(RandomInfo->pClientRandom);
++ }
++ if (RandomInfo->pServerRandom != NULL) {
++ free(RandomInfo->pServerRandom);
++ }
++
+ if (ckSSL3KeyMatOut != NULL_PTR) {
+- /* get the Java CK_SSL3_KEY_MAT_PARAMS (pParameter) */
+- fieldID = (*env)->GetFieldID(env, jMechanismClass, "pParameter", "Ljava/lang/Object;");
++ /* get the Java params object (pParameter) */
++ fieldID = (*env)->GetFieldID(env, jMechanismClass, "pParameter",
++ "Ljava/lang/Object;");
+ if (fieldID == NULL) { return; }
+- jSSL3KeyMatParam = (*env)->GetObjectField(env, jMechanism, fieldID);
++ jKeyMatParam = (*env)->GetObjectField(env, jMechanism, fieldID);
+
+ /* get the Java CK_SSL3_KEY_MAT_OUT */
+- jSSL3KeyMatParamsClass = (*env)->FindClass(env, CLASS_SSL3_KEY_MAT_PARAMS);
+- if (jSSL3KeyMatParamsClass == NULL) { return; }
+- fieldID = (*env)->GetFieldID(env, jSSL3KeyMatParamsClass, "pReturnedKeyMaterial", "L"CLASS_SSL3_KEY_MAT_OUT";");
++ jKeyMatParamsClass = (*env)->FindClass(env, class_key_mat_params);
++ if (jKeyMatParamsClass == NULL) { return; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamsClass,
++ "pReturnedKeyMaterial", "L"CLASS_SSL3_KEY_MAT_OUT";");
+ if (fieldID == NULL) { return; }
+- jSSL3KeyMatOut = (*env)->GetObjectField(env, jSSL3KeyMatParam, fieldID);
++ jSSL3KeyMatOut = (*env)->GetObjectField(env, jKeyMatParam, fieldID);
+
+ /* now copy back all the key handles and the initialization vectors */
+ /* copy back client MAC secret handle */
+ jSSL3KeyMatOutClass = (*env)->FindClass(env, CLASS_SSL3_KEY_MAT_OUT);
+ if (jSSL3KeyMatOutClass == NULL) { return; }
+- fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass, "hClientMacSecret", "J");
++ fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass,
++ "hClientMacSecret", "J");
+ if (fieldID == NULL) { return; }
+- (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID, ckULongToJLong(ckSSL3KeyMatOut->hClientMacSecret));
++ (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID,
++ ckULongToJLong(ckSSL3KeyMatOut->hClientMacSecret));
+
+ /* copy back server MAC secret handle */
+- fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass, "hServerMacSecret", "J");
++ fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass,
++ "hServerMacSecret", "J");
+ if (fieldID == NULL) { return; }
+- (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID, ckULongToJLong(ckSSL3KeyMatOut->hServerMacSecret));
++ (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID,
++ ckULongToJLong(ckSSL3KeyMatOut->hServerMacSecret));
+
+ /* copy back client secret key handle */
+ fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass, "hClientKey", "J");
+ if (fieldID == NULL) { return; }
+- (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID, ckULongToJLong(ckSSL3KeyMatOut->hClientKey));
++ (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID,
++ ckULongToJLong(ckSSL3KeyMatOut->hClientKey));
+
+ /* copy back server secret key handle */
+ fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass, "hServerKey", "J");
+ if (fieldID == NULL) { return; }
+- (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID, ckULongToJLong(ckSSL3KeyMatOut->hServerKey));
++ (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID,
++ ckULongToJLong(ckSSL3KeyMatOut->hServerKey));
+
+ /* copy back the client IV */
+ fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass, "pIVClient", "[B");
+@@ -740,7 +788,45 @@
+ free(ckSSL3KeyMatOut->pIVServer);
+ free(ckSSL3KeyMatOut);
+ }
+- }
++}
++
++/*
++ * Copy back the derived keys and initialization vectors from the native
++ * structure to the Java object. This is only used for
++ * CKM_SSL3_KEY_AND_MAC_DERIVE and CKM_TLS_KEY_AND_MAC_DERIVE mechanisms
++ * when used for deriving a key.
++ *
++ */
++void ssl3CopyBackKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism,
++ jobject jMechanism)
++{
++ CK_SSL3_KEY_MAT_PARAMS *ckSSL3KeyMatParam;
++ ckSSL3KeyMatParam = (CK_SSL3_KEY_MAT_PARAMS *)ckMechanism->pParameter;
++ if (ckSSL3KeyMatParam != NULL_PTR) {
++ copyBackKeyMatParams(env, ckMechanism, jMechanism,
++ &(ckSSL3KeyMatParam->RandomInfo),
++ ckSSL3KeyMatParam->pReturnedKeyMaterial,
++ CLASS_SSL3_KEY_MAT_PARAMS);
++ }
++}
++
++/*
++ * Copy back the derived keys and initialization vectors from the native
++ * structure to the Java object. This is only used for
++ * CKM_TLS12_KEY_AND_MAC_DERIVE mechanism when used for deriving a key.
++ *
++ */
++void tls12CopyBackKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism,
++ jobject jMechanism)
++{
++ CK_TLS12_KEY_MAT_PARAMS *ckTLS12KeyMatParam;
++ ckTLS12KeyMatParam = (CK_TLS12_KEY_MAT_PARAMS *) ckMechanism->pParameter;
++ if (ckTLS12KeyMatParam != NULL_PTR) {
++ copyBackKeyMatParams(env, ckMechanism, jMechanism,
++ &(ckTLS12KeyMatParam->RandomInfo),
++ ckTLS12KeyMatParam->pReturnedKeyMaterial,
++ CLASS_TLS12_KEY_MAT_PARAMS);
++ }
+ }
+
+ #endif
+diff --git openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
+--- openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
++++ openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
+@@ -807,6 +807,12 @@
+ #define CKM_WTLS_SERVER_KEY_AND_MAC_DERIVE 0x000003D4
+ #define CKM_WTLS_CLIENT_KEY_AND_MAC_DERIVE 0x000003D5
+
++/* new for v2.40 */
++#define CKM_TLS12_MASTER_KEY_DERIVE 0x000003E0
++#define CKM_TLS12_KEY_AND_MAC_DERIVE 0x000003E1
++#define CKM_TLS12_MASTER_KEY_DERIVE_DH 0x000003E2
++#define CKM_TLS_MAC 0x000003E4
++
+ #define CKM_KEY_WRAP_LYNKS 0x00000400
+ #define CKM_KEY_WRAP_SET_OAEP 0x00000401
+
+@@ -1682,4 +1688,34 @@
+
+ typedef CK_PKCS5_PBKD2_PARAMS CK_PTR CK_PKCS5_PBKD2_PARAMS_PTR;
+
++/* new for v2.40 */
++
++typedef struct CK_TLS12_MASTER_KEY_DERIVE_PARAMS {
++ CK_SSL3_RANDOM_DATA RandomInfo;
++ CK_VERSION_PTR pVersion;
++ CK_MECHANISM_TYPE prfHashMechanism;
++} CK_TLS12_MASTER_KEY_DERIVE_PARAMS;
++
++typedef CK_TLS12_MASTER_KEY_DERIVE_PARAMS CK_PTR CK_TLS12_MASTER_KEY_DERIVE_PARAMS_PTR;
++
++typedef struct CK_TLS12_KEY_MAT_PARAMS {
++ CK_ULONG ulMacSizeInBits;
++ CK_ULONG ulKeySizeInBits;
++ CK_ULONG ulIVSizeInBits;
++ CK_BBOOL bIsExport;
++ CK_SSL3_RANDOM_DATA RandomInfo;
++ CK_SSL3_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
++ CK_MECHANISM_TYPE prfHashMechanism;
++} CK_TLS12_KEY_MAT_PARAMS;
++
++typedef CK_TLS12_KEY_MAT_PARAMS CK_PTR CK_TLS12_KEY_MAT_PARAMS_PTR;
++
++typedef struct CK_TLS_MAC_PARAMS {
++ CK_MECHANISM_TYPE prfMechanism;
++ CK_ULONG ulMacLength;
++ CK_ULONG ulServerOrClient;
++} CK_TLS_MAC_PARAMS;
++
++typedef CK_TLS_MAC_PARAMS CK_PTR CK_TLS_MAC_PARAMS_PTR;
++
+ #endif
+diff --git openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
+--- openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
++++ openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+
+ /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
+@@ -268,10 +268,13 @@
+ #define CLASS_SSL3_RANDOM_DATA "sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA"
+ // CLASS_SSL3_RANDOM_DATA is used by CLASS_SSL3_MASTER_KEY_DERIVE_PARAMS
+ #define CLASS_SSL3_KEY_MAT_OUT "sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT"
+-// CLASS_SSL3_KEY_MAT_OUT is used by CLASS_SSL3_KEY_MAT_PARAMS
++// CLASS_SSL3_KEY_MAT_OUT is used by CLASS_SSL3_KEY_MAT_PARAMS and CK_TLS12_KEY_MAT_PARAMS
+ #define CLASS_SSL3_MASTER_KEY_DERIVE_PARAMS "sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS"
++#define CLASS_TLS12_MASTER_KEY_DERIVE_PARAMS "sun/security/pkcs11/wrapper/CK_TLS12_MASTER_KEY_DERIVE_PARAMS"
+ #define CLASS_SSL3_KEY_MAT_PARAMS "sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_PARAMS"
++#define CLASS_TLS12_KEY_MAT_PARAMS "sun/security/pkcs11/wrapper/CK_TLS12_KEY_MAT_PARAMS"
+ #define CLASS_TLS_PRF_PARAMS "sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS"
++#define CLASS_TLS_MAC_PARAMS "sun/security/pkcs11/wrapper/CK_TLS_MAC_PARAMS"
+ #define CLASS_AES_CTR_PARAMS "sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS"
+
+ /* function to convert a PKCS#11 return value other than CK_OK into a Java Exception
+@@ -361,9 +364,11 @@
+ CK_KEY_WRAP_SET_OAEP_PARAMS jKeyWrapSetOaepParamToCKKeyWrapSetOaepParam(JNIEnv *env, jobject jParam);
+ void copyBackSetUnwrappedKey(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
+ CK_SSL3_MASTER_KEY_DERIVE_PARAMS jSsl3MasterKeyDeriveParamToCKSsl3MasterKeyDeriveParam(JNIEnv *env, jobject jParam);
+-void copyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
++void ssl3CopyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
++void tls12CopyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
+ CK_SSL3_KEY_MAT_PARAMS jSsl3KeyMatParamToCKSsl3KeyMatParam(JNIEnv *env, jobject jParam);
+-void copyBackSSLKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
++void ssl3CopyBackKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
++void tls12CopyBackKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
+ CK_KEY_DERIVATION_STRING_DATA jKeyDerivationStringDataToCKKeyDerivationStringData(JNIEnv *env, jobject jParam);
+ CK_RSA_PKCS_PSS_PARAMS jRsaPkcsPssParamToCKRsaPkcsPssParam(JNIEnv *env, jobject jParam);
+ CK_ECDH1_DERIVE_PARAMS jEcdh1DeriveParamToCKEcdh1DeriveParam(JNIEnv *env, jobject jParam);
+diff --git openjdk.orig/jdk/test/sun/security/pkcs11/fips/TestTLS12.java openjdk/jdk/test/sun/security/pkcs11/fips/TestTLS12.java
+new file mode 100644
+--- /dev/null
++++ openjdk/jdk/test/sun/security/pkcs11/fips/TestTLS12.java
+@@ -0,0 +1,449 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ *
++ * 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.
++ */
++
++/*
++ * @test
++ * @bug 8029661
++ * @summary Test TLS 1.2
++ * @library ..
++ * @run main/othervm/timeout=120 TestTLS12
++ */
++
++import java.io.File;
++import java.io.FileInputStream;
++import java.io.InputStream;
++import java.nio.ByteBuffer;
++
++import java.security.interfaces.RSAPrivateKey;
++import java.security.interfaces.RSAPublicKey;
++import java.security.KeyStore;
++import java.security.NoSuchAlgorithmException;
++import java.security.Provider;
++import java.security.SecureRandom;
++import java.security.Security;
++
++import java.util.Arrays;
++
++import javax.crypto.Cipher;
++import javax.crypto.KeyGenerator;
++import javax.crypto.SecretKey;
++import javax.crypto.spec.SecretKeySpec;
++
++import javax.net.ssl.KeyManagerFactory;
++import javax.net.ssl.SSLContext;
++import javax.net.ssl.SSLEngine;
++import javax.net.ssl.SSLEngineResult;
++import javax.net.ssl.SSLEngineResult.HandshakeStatus;
++import javax.net.ssl.SSLParameters;
++import javax.net.ssl.SSLSession;
++import javax.net.ssl.TrustManagerFactory;
++
++import sun.security.internal.spec.TlsMasterSecretParameterSpec;
++import sun.security.internal.spec.TlsPrfParameterSpec;
++import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
++
++public final class TestTLS12 extends SecmodTest {
++
++ private static final boolean enableDebug = true;
++
++ private static Provider sunPKCS11NSSProvider;
++ private static Provider sunJCEProvider;
++ private static com.sun.net.ssl.internal.ssl.Provider jsseProvider;
++ private static KeyStore ks;
++ private static KeyStore ts;
++ private static char[] passphrase = "JAHshj131@@".toCharArray();
++ private static RSAPrivateKey privateKey;
++ private static RSAPublicKey publicKey;
++
++ public static void main(String[] args) throws Exception {
++ try {
++ initialize();
++ } catch (Exception e) {
++ System.out.println("Test skipped: failure during" +
++ " initialization");
++ return;
++ }
++
++ if (shouldRun()) {
++ // Test against JCE
++ testTlsAuthenticationCodeGeneration();
++
++ // Self-integrity test (complete TLS 1.2 communication)
++ new testTLS12SunPKCS11Communication().run();
++
++ System.out.println("Test PASS - OK");
++ } else {
++ System.out.println("Test skipped: TLS 1.2 mechanisms" +
++ " not supported by current SunPKCS11 back-end");
++ }
++ }
++
++ private static boolean shouldRun() {
++ if (sunPKCS11NSSProvider == null) {
++ return false;
++ }
++ try {
++ KeyGenerator.getInstance("SunTls12MasterSecret",
++ sunPKCS11NSSProvider);
++ KeyGenerator.getInstance(
++ "SunTls12RsaPremasterSecret", sunPKCS11NSSProvider);
++ KeyGenerator.getInstance("SunTls12Prf", sunPKCS11NSSProvider);
++ } catch (NoSuchAlgorithmException e) {
++ return false;
++ }
++ return true;
++ }
++
++ private static void testTlsAuthenticationCodeGeneration()
++ throws Exception {
++ // Generate RSA Pre-Master Secret in SunPKCS11 provider
++ SecretKey rsaPreMasterSecret = null;
++ @SuppressWarnings("deprecation")
++ TlsRsaPremasterSecretParameterSpec rsaPreMasterSecretSpec =
++ new TlsRsaPremasterSecretParameterSpec(0x0303, 0x0303);
++ {
++ KeyGenerator rsaPreMasterSecretKG = KeyGenerator.getInstance(
++ "SunTls12RsaPremasterSecret", sunPKCS11NSSProvider);
++ rsaPreMasterSecretKG.init(rsaPreMasterSecretSpec, null);
++ rsaPreMasterSecret = rsaPreMasterSecretKG.generateKey();
++ }
++
++ // Get RSA Pre-Master Secret in plain (from SunPKCS11 provider)
++ byte[] rsaPlainPreMasterSecret = null;
++ {
++ Cipher rsaPreMasterSecretWrapperCipher =
++ Cipher.getInstance("RSA/ECB/PKCS1Padding",
++ sunPKCS11NSSProvider);
++ rsaPreMasterSecretWrapperCipher.init(Cipher.WRAP_MODE, publicKey,
++ new SecureRandom());
++ byte[] rsaEncryptedPreMasterSecret =
++ rsaPreMasterSecretWrapperCipher.wrap(rsaPreMasterSecret);
++ Cipher rsaPreMasterSecretUnwrapperCipher =
++ Cipher.getInstance("RSA/ECB/PKCS1Padding", sunJCEProvider);
++ rsaPreMasterSecretUnwrapperCipher.init(Cipher.UNWRAP_MODE,
++ privateKey, rsaPreMasterSecretSpec);
++ rsaPlainPreMasterSecret = rsaPreMasterSecretUnwrapperCipher.unwrap(
++ rsaEncryptedPreMasterSecret, "TlsRsaPremasterSecret",
++ Cipher.SECRET_KEY).getEncoded();
++
++ if (enableDebug) {
++ System.out.println("rsaPlainPreMasterSecret:");
++ for (byte b : rsaPlainPreMasterSecret) {
++ System.out.printf("%02X, ", b);
++ }
++ System.out.println("");
++ }
++ }
++
++ // Generate Master Secret
++ SecretKey sunPKCS11MasterSecret = null;
++ SecretKey jceMasterSecret = null;
++ {
++ KeyGenerator sunPKCS11MasterSecretGenerator =
++ KeyGenerator.getInstance("SunTls12MasterSecret",
++ sunPKCS11NSSProvider);
++ KeyGenerator jceMasterSecretGenerator = KeyGenerator.getInstance(
++ "SunTls12MasterSecret", sunJCEProvider);
++ @SuppressWarnings("deprecation")
++ TlsMasterSecretParameterSpec sunPKCS11MasterSecretSpec =
++ new TlsMasterSecretParameterSpec(rsaPreMasterSecret, 3, 3,
++ new byte[32], new byte[32], "SHA-256", 32, 64);
++ @SuppressWarnings("deprecation")
++ TlsMasterSecretParameterSpec jceMasterSecretSpec =
++ new TlsMasterSecretParameterSpec(
++ new SecretKeySpec(rsaPlainPreMasterSecret,
++ "Generic"), 3, 3, new byte[32],
++ new byte[32], "SHA-256", 32, 64);
++ sunPKCS11MasterSecretGenerator.init(sunPKCS11MasterSecretSpec,
++ null);
++ jceMasterSecretGenerator.init(jceMasterSecretSpec, null);
++ sunPKCS11MasterSecret =
++ sunPKCS11MasterSecretGenerator.generateKey();
++ jceMasterSecret = jceMasterSecretGenerator.generateKey();
++ if (enableDebug) {
++ System.out.println("Master Secret (SunJCE):");
++ if (jceMasterSecret != null) {
++ for (byte b : jceMasterSecret.getEncoded()) {
++ System.out.printf("%02X, ", b);
++ }
++ System.out.println("");
++ }
++ }
++ }
++
++ // Generate authentication codes
++ byte[] sunPKCS11AuthenticationCode = null;
++ byte[] jceAuthenticationCode = null;
++ {
++ // Generate SunPKCS11 authentication code
++ {
++ @SuppressWarnings("deprecation")
++ TlsPrfParameterSpec sunPKCS11AuthenticationCodeSpec =
++ new TlsPrfParameterSpec(sunPKCS11MasterSecret,
++ "client finished", "a".getBytes(), 12,
++ "SHA-256", 32, 64);
++ KeyGenerator sunPKCS11AuthCodeGenerator =
++ KeyGenerator.getInstance("SunTls12Prf",
++ sunPKCS11NSSProvider);
++ sunPKCS11AuthCodeGenerator.init(
++ sunPKCS11AuthenticationCodeSpec);
++ sunPKCS11AuthenticationCode =
++ sunPKCS11AuthCodeGenerator.generateKey().getEncoded();
++ }
++
++ // Generate SunJCE authentication code
++ {
++ @SuppressWarnings("deprecation")
++ TlsPrfParameterSpec jceAuthenticationCodeSpec =
++ new TlsPrfParameterSpec(jceMasterSecret,
++ "client finished", "a".getBytes(), 12,
++ "SHA-256", 32, 64);
++ KeyGenerator jceAuthCodeGenerator =
++ KeyGenerator.getInstance("SunTls12Prf",
++ sunJCEProvider);
++ jceAuthCodeGenerator.init(jceAuthenticationCodeSpec);
++ jceAuthenticationCode =
++ jceAuthCodeGenerator.generateKey().getEncoded();
++ }
++
++ if (enableDebug) {
++ System.out.println("SunPKCS11 Authentication Code: ");
++ for (byte b : sunPKCS11AuthenticationCode) {
++ System.out.printf("%02X, ", b);
++ }
++ System.out.println("");
++ System.out.println("SunJCE Authentication Code: ");
++ for (byte b : jceAuthenticationCode) {
++ System.out.printf("%02X, ", b);
++ }
++ System.out.println("");
++ }
++ }
++
++ if (sunPKCS11AuthenticationCode == null ||
++ jceAuthenticationCode == null ||
++ sunPKCS11AuthenticationCode.length == 0 ||
++ jceAuthenticationCode.length == 0 ||
++ !Arrays.equals(sunPKCS11AuthenticationCode,
++ jceAuthenticationCode)) {
++ throw new Exception("Authentication codes from JCE" +
++ " and SunPKCS11 differ.");
++ }
++ }
++
++ private static class testTLS12SunPKCS11Communication {
++ public static void run() throws Exception {
++ SSLEngine[][] enginesToTest = getSSLEnginesToTest();
++
++ for (SSLEngine[] engineToTest : enginesToTest) {
++
++ SSLEngine clientSSLEngine = engineToTest[0];
++ SSLEngine serverSSLEngine = engineToTest[1];
++
++ // SSLEngine code based on RedhandshakeFinished.java
++
++ boolean dataDone = false;
++
++ ByteBuffer clientOut = null;
++ ByteBuffer clientIn = null;
++ ByteBuffer serverOut = null;
++ ByteBuffer serverIn = null;
++ ByteBuffer cTOs;
++ ByteBuffer sTOc;
++
++ SSLSession session = clientSSLEngine.getSession();
++ int appBufferMax = session.getApplicationBufferSize();
++ int netBufferMax = session.getPacketBufferSize();
++
++ clientIn = ByteBuffer.allocate(appBufferMax + 50);
++ serverIn = ByteBuffer.allocate(appBufferMax + 50);
++
++ cTOs = ByteBuffer.allocateDirect(netBufferMax);
++ sTOc = ByteBuffer.allocateDirect(netBufferMax);
++
++ clientOut = ByteBuffer.wrap(
++ "Hi Server, I'm Client".getBytes());
++ serverOut = ByteBuffer.wrap(
++ "Hello Client, I'm Server".getBytes());
++
++ SSLEngineResult clientResult;
++ SSLEngineResult serverResult;
++
++ while (!dataDone) {
++ clientResult = clientSSLEngine.wrap(clientOut, cTOs);
++ runDelegatedTasks(clientResult, clientSSLEngine);
++ serverResult = serverSSLEngine.wrap(serverOut, sTOc);
++ runDelegatedTasks(serverResult, serverSSLEngine);
++ cTOs.flip();
++ sTOc.flip();
++
++ if (enableDebug) {
++ System.out.println("Client -> Network");
++ printTlsNetworkPacket("", cTOs);
++ System.out.println("");
++ System.out.println("Server -> Network");
++ printTlsNetworkPacket("", sTOc);
++ System.out.println("");
++ }
++
++ clientResult = clientSSLEngine.unwrap(sTOc, clientIn);
++ runDelegatedTasks(clientResult, clientSSLEngine);
++ serverResult = serverSSLEngine.unwrap(cTOs, serverIn);
++ runDelegatedTasks(serverResult, serverSSLEngine);
++
++ cTOs.compact();
++ sTOc.compact();
++
++ if (!dataDone &&
++ (clientOut.limit() == serverIn.position()) &&
++ (serverOut.limit() == clientIn.position())) {
++ checkTransfer(serverOut, clientIn);
++ checkTransfer(clientOut, serverIn);
++ dataDone = true;
++ }
++ }
++ }
++ }
++
++ static void printTlsNetworkPacket(String prefix, ByteBuffer bb) {
++ ByteBuffer slice = bb.slice();
++ byte[] buffer = new byte[slice.remaining()];
++ slice.get(buffer);
++ for (int i = 0; i < buffer.length; i++) {
++ System.out.printf("%02X, ", (byte)(buffer[i] & (byte)0xFF));
++ if (i % 8 == 0 && i % 16 != 0) {
++ System.out.print(" ");
++ }
++ if (i % 16 == 0) {
++ System.out.println("");
++ }
++ }
++ System.out.flush();
++ }
++
++ private static void checkTransfer(ByteBuffer a, ByteBuffer b)
++ throws Exception {
++ a.flip();
++ b.flip();
++ if (!a.equals(b)) {
++ throw new Exception("Data didn't transfer cleanly");
++ }
++ a.position(a.limit());
++ b.position(b.limit());
++ a.limit(a.capacity());
++ b.limit(b.capacity());
++ }
++
++ private static void runDelegatedTasks(SSLEngineResult result,
++ SSLEngine engine) throws Exception {
++
++ if (result.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
++ Runnable runnable;
++ while ((runnable = engine.getDelegatedTask()) != null) {
++ runnable.run();
++ }
++ HandshakeStatus hsStatus = engine.getHandshakeStatus();
++ if (hsStatus == HandshakeStatus.NEED_TASK) {
++ throw new Exception(
++ "handshake shouldn't need additional tasks");
++ }
++ }
++ }
++
++ private static SSLEngine[][] getSSLEnginesToTest() throws Exception {
++ SSLEngine[][] enginesToTest = new SSLEngine[2][2];
++ String[][] preferredSuites = new String[][]{ new String[] {
++ "TLS_RSA_WITH_AES_128_CBC_SHA256"
++ }, new String[] {
++ "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"
++ }};
++ for (int i = 0; i < enginesToTest.length; i++) {
++ enginesToTest[i][0] = createSSLEngine(true);
++ enginesToTest[i][1] = createSSLEngine(false);
++ enginesToTest[i][0].setEnabledCipherSuites(preferredSuites[i]);
++ enginesToTest[i][1].setEnabledCipherSuites(preferredSuites[i]);
++ }
++ return enginesToTest;
++ }
++
++ static private SSLEngine createSSLEngine(boolean client)
++ throws Exception {
++ SSLEngine ssle;
++ KeyManagerFactory kmf = KeyManagerFactory.getInstance("PKIX",
++ jsseProvider);
++ kmf.init(ks, passphrase);
++
++ TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX",
++ jsseProvider);
++ tmf.init(ts);
++
++ SSLContext sslCtx = SSLContext.getInstance("TLSv1.2",
++ jsseProvider);
++ sslCtx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
++ ssle = sslCtx.createSSLEngine("localhost", 443);
++ ssle.setUseClientMode(client);
++ SSLParameters sslParameters = ssle.getSSLParameters();
++ ssle.setSSLParameters(sslParameters);
++
++ return ssle;
++ }
++ }
++
++ private static void initialize() throws Exception {
++ if (initSecmod() == false) {
++ return;
++ }
++ String configName = BASE + SEP + "fips.cfg";
++ sunPKCS11NSSProvider = getSunPKCS11(configName);
++ System.out.println("SunPKCS11 provider: " + sunPKCS11NSSProvider);
++ Security.addProvider(sunPKCS11NSSProvider);
++
++ sunJCEProvider = new com.sun.crypto.provider.SunJCE();
++ Security.addProvider(sunJCEProvider);
++
++ Security.removeProvider("SunJSSE");
++ jsseProvider =new com.sun.net.ssl.internal.ssl.Provider(
++ sunPKCS11NSSProvider);
++ Security.addProvider(jsseProvider);
++ System.out.println(jsseProvider.getInfo());
++
++ ks = KeyStore.getInstance("PKCS11", sunPKCS11NSSProvider);
++ ks.load(null, "test12".toCharArray());
++ ts = ks;
++
++ KeyStore ksPlain = readTestKeyStore();
++ privateKey = (RSAPrivateKey)ksPlain.getKey("rh_rsa_sha256",
++ passphrase);
++ publicKey = (RSAPublicKey)ksPlain.getCertificate(
++ "rh_rsa_sha256").getPublicKey();
++ }
++
++ private static KeyStore readTestKeyStore() throws Exception {
++ File file = new File(System.getProperty("test.src", "."), "keystore");
++ InputStream in = new FileInputStream(file);
++ KeyStore ks = KeyStore.getInstance("JKS");
++ ks.load(in, "passphrase".toCharArray());
++ in.close();
++ return ks;
++ }
++}
+\ No newline at end of file
diff --git a/jdk8035341-allow_using_system_installed_libpng.patch b/jdk8035341-allow_using_system_installed_libpng.patch
new file mode 100644
index 0000000..53661d8
--- /dev/null
+++ b/jdk8035341-allow_using_system_installed_libpng.patch
@@ -0,0 +1,115 @@
+diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
+--- jdk8/common/autoconf/libraries.m4 2013-11-14 20:08:01.845065585 -0500
++++ jdk8/common/autoconf/libraries.m4 2013-11-14 20:10:56.186553066 -0500
+@@ -676,6 +676,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
+ #
+
+diff -ruN jdk8/common/autoconf/spec.gmk.in jdk8/common/autoconf/spec.gmk.in
+--- jdk8/common/autoconf/spec.gmk.in 2013-10-31 19:24:33.000000000 -0400
++++ jdk8/common/autoconf/spec.gmk.in 2013-11-14 21:10:56.365976518 -0500
+@@ -548,6 +548,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@
+diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.gmk
+--- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 20:08:01.845065585 -0500
++++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 20:14:10.791982343 -0500
+@@ -1183,7 +1183,6 @@
+
+ ifndef BUILD_HEADLESS_ONLY
+ LIBSPLASHSCREEN_DIRS := \
+- $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
+
+ ifeq ($(USE_EXTERNAL_LIBGIF), true)
+@@ -1200,6 +1199,13 @@
+ LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/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
+@@ -1263,12 +1269,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), \
++ $(LIBZ) $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(LIBPNG_LDFLAGS), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+diff -ruN jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
+--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2013-10-31 19:44:18.000000000 -0400
++++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2013-11-14 20:14:41.363892797 -0500
+@@ -25,8 +25,7 @@
+
+ #include "splashscreen_impl.h"
+
+-#include "../libpng/png.h"
+-
++#include <png.h>
+ #include <setjmp.h>
+
+ #define SIG_BYTES 8
diff --git a/jdk8042159-allow_using_system_installed_lcms2.patch b/jdk8042159-allow_using_system_installed_lcms2.patch
new file mode 100644
index 0000000..6f39b57
--- /dev/null
+++ b/jdk8042159-allow_using_system_installed_lcms2.patch
@@ -0,0 +1,118 @@
+diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
+--- openjdk/common/autoconf/libraries.m4 2013-11-14 22:04:38.039440136 -0500
++++ openjdk/common/autoconf/libraries.m4 2013-11-14 22:05:11.474356424 -0500
+@@ -676,6 +676,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
+ #
+
+diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.gmk
+--- openjdk/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 22:04:38.040440133 -0500
++++ openjdk/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 22:05:11.475356411 -0500
+@@ -666,18 +666,35 @@
+
+ ##########################################################################################
+
++LIBLCMS_DIR := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms
++
++ifeq ($(USE_EXTERNAL_LCMS), true)
++ # If we're using an external library, we'll just need the wrapper part.
++ # By including it explicitely, all other files will be excluded.
++ BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c
++ BUILD_LIBLCMS_HEADERS :=
++else
++ BUILD_LIBLCMS_INCLUDE_FILES :=
++ # If we're using the bundled library, we'll need to include it in the
++ # include path explicitly. Otherwise the system headers will be used.
++ BUILD_LIBLCMS_HEADERS := -I$(LIBLCMS_DIR)
++endif
++
+ # TODO: Update awt lib path when awt is converted
+ $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
+ LIBRARY := lcms, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+- SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
++ SRC := $(LIBLCMS_DIR), \
++ INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
+ LANG := C, \
+ OPTIMIZATION := HIGHEST, \
+ CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
+ -DCMS_DONT_USE_FAST_FLOOR \
+ $(SHARED_LIBRARY_FLAGS) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
+- -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
++ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
++ $(BUILD_LIBLCMS_HEADERS) \
++ $(LCMS_CFLAGS), \
+ CFLAGS_solaris := -xc99=no_lib, \
+ CFLAGS_windows := -DCMS_IS_WINDOWS_, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
+@@ -685,10 +702,10 @@
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
+ 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_aix := -lm -lawt -ljava -ljvm,\
++ LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc $(LCMS_LIBS), \
++ LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm $(LCMS_LIBS), \
++ LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm $(LCMS_LIBS), \
++ LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm $(LCMS_LIBS),\
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=lcms.dll" \
+diff -r 3d1c3b0b73a3 src/share/native/sun/java2d/cmm/lcms/LCMS.c
+--- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Tue Sep 08 22:31:26 2015 +0300
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Thu Oct 15 05:29:28 2015 +0100
+@@ -30,7 +30,7 @@
+ #include "jni_util.h"
+ #include "Trace.h"
+ #include "Disposer.h"
+-#include "lcms2.h"
++#include <lcms2.h>
+ #include "jlong.h"
+
+
diff --git a/jdk8043805-allow_using_system_installed_libjpeg.patch b/jdk8043805-allow_using_system_installed_libjpeg.patch
new file mode 100644
index 0000000..003f32b
--- /dev/null
+++ b/jdk8043805-allow_using_system_installed_libjpeg.patch
@@ -0,0 +1,228 @@
+diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
+--- jdk8/common/autoconf/libraries.m4 2013-10-31 19:24:33.000000000 -0400
++++ jdk8/common/autoconf/libraries.m4 2013-11-14 21:55:20.249903347 -0500
+@@ -601,12 +601,42 @@
+ #
+
+ 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])
+- ])
++ AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg],
++ [use libjpeg from build system or OpenJDK sources (system, bundled) @<:@bundled@:>@])])
++
++ AC_CHECK_LIB(jpeg, jpeg_destroy_compress,
++ [ LIBJPEG_FOUND=yes ],
++ [ LIBJPEG_FOUND=no ])
++
++ 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
++
++ if test "x${with_libjpeg}" = "xbundled"; then
++ USE_EXTERNAL_LIBJPEG=false
++ AC_MSG_RESULT([bundled])
++ elif test "x${with_libjpeg}" = "xsystem"; then
++ if test "x${LIBJPEG_FOUND}" = "xyes"; then
++ USE_EXTERNAL_LIBJPEG=true
++ AC_MSG_RESULT([system])
++ else
++ AC_MSG_RESULT([system not found])
++ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])
++ fi
++ else
++ AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled'])
++ fi
+ AC_SUBST(USE_EXTERNAL_LIBJPEG)
+
++
+ ###############################################################################
+ #
+ # Check for the gif library
+diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.gmk
+--- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-10-31 19:44:18.000000000 -0400
++++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 21:56:01.020796703 -0500
+@@ -693,17 +693,17 @@
+ ##########################################################################################
+
+ 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_LIBJPEG_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
+
+@@ -718,37 +718,38 @@
+ # $(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, \
++$(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \
++ LIBRARY := javajpeg, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+- SRC := $(BUILD_LIBJPEG_CLOSED_SRC) \
++ SRC := $(BUILD_LIBJAVAJPEG_CLOSED_SRC) \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
+ LANG := C, \
+ OPTIMIZATION := HIGHEST, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+- $(BUILD_LIBJPEG_CLOSED_INCLUDES) \
++ $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
+- MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \
+- LDFLAGS := $(LDFLAGS_JDKLIB) \
++ MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
++ LDFLAGS := $(subst -Xlinker --as-needed,, \
++ $(subst -Wl$(COMMA)--as-needed,, $(LDFLAGS_JDKLIB))) -ljpeg \
+ $(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), \
+- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \
++ REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
++ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavajpeg, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+-$(BUILD_LIBJPEG): $(BUILD_LIBJAVA)
++$(BUILD_LIBJAVAJPEG): $(BUILD_LIBJAVA)
+
+-BUILD_LIBRARIES += $(BUILD_LIBJPEG)
++BUILD_LIBRARIES += $(BUILD_LIBJAVAJPEG)
+
+ ##########################################################################################
+
+@@ -1127,7 +1128,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
+
+@@ -1138,6 +1138,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/jpeg
++ endif
++
+ ifneq ($(OPENJDK_TARGET_OS), macosx)
+ LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
+ else
+@@ -1193,11 +1200,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) \
+diff -ruN jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
+--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2013-10-31 19:44:18.000000000 -0400
++++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2013-11-14 21:55:20.250903340 -0500
+@@ -89,7 +89,7 @@
+ java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction<Void>() {
+ public Void run() {
+- System.loadLibrary("jpeg");
++ System.loadLibrary("javajpeg");
+ return null;
+ }
+ });
+diff -ruN jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
+--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2013-10-31 19:44:18.000000000 -0400
++++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2013-11-14 21:55:20.250903340 -0500
+@@ -179,7 +179,7 @@
+ java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction<Void>() {
+ public Void run() {
+- System.loadLibrary("jpeg");
++ System.loadLibrary("javajpeg");
+ return null;
+ }
+ });
+diff -ruN jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java
+--- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2013-10-31 19:44:18.000000000 -0400
++++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2013-11-14 21:55:20.251903376 -0500
+@@ -56,7 +56,7 @@
+ java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction<Void>() {
+ public Void run() {
+- System.loadLibrary("jpeg");
++ System.loadLibrary("javajpeg");
+ return null;
+ }
+ });
+diff -ruN jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
+--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-10-31 19:44:18.000000000 -0400
++++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-11-14 21:55:20.251903376 -0500
+@@ -25,7 +25,6 @@
+
+ #include "splashscreen_impl.h"
+
+-#include "jinclude.h"
+ #include "jpeglib.h"
+ #include "jerror.h"
+
+@@ -107,11 +106,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;
diff --git a/jdk8044235-src_zip_should_include_all_sources.patch b/jdk8044235-src_zip_should_include_all_sources.patch
new file mode 100644
index 0000000..1beda6d
--- /dev/null
+++ b/jdk8044235-src_zip_should_include_all_sources.patch
@@ -0,0 +1,109 @@
+# HG changeset patch
+# User omajid
+# Date 1401638044 14400
+# Sun Jun 01 11:54:04 2014 -0400
+# Node ID fd78f7e83f3f1ce7d363b681b97583138218afcb
+# Parent 8d0af21b5b9789f97b05edacc221a63f851d13b8
+8044235: src.zip should include all sources
+Reviewed-by: andrew, dholmes
+
+diff --git a/make/CreateJars.gmk b/make/CreateJars.gmk
+--- openjdk/jdk/make/CreateJars.gmk
++++ openjdk/jdk/make/CreateJars.gmk
+@@ -584,40 +584,53 @@
+
+ ##########################################################################################
+
+-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 \
+- 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 \
+- #
++ifdef OPENJDK
++ SRC_ZIP_INCLUDES = \
++ com \
++ java \
++ javax \
++ jdk \
++ org \
++ sun \
++ #
++ SRC_ZIP_EXCLUDES =
++else
++ 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 \
++ 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 \
++ #
++ SRC_ZIP_EXCLUDES = javax/swing/beaninfo
++endif
+
+ SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes
+ SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc
+@@ -648,7 +661,7 @@
+ $(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
+ SRC := $(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src, \
+ INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \
+- EXCLUDES := javax/swing/beaninfo, \
++ EXCLUDES := $(SRC_ZIP_EXCLUDES), \
+ SUFFIXES := .java .c .h, \
+ ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
+ EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))
diff --git a/jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch b/jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
new file mode 100644
index 0000000..e91abd3
--- /dev/null
+++ b/jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
@@ -0,0 +1,191 @@
+# HG changeset patch
+# User stefank
+# Date 1525453613 -3600
+# Fri May 04 18:06:53 2018 +0100
+# Node ID 07a1135a327362f157955d470fad5df07cc35164
+# Parent de79964656fc652f2085dac4fe99bcc128b5a3b1
+8062808, PR3548: Turn on the -Wreturn-type warning
+Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett
+
+diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
++++ openjdk/hotspot/make/linux/makefiles/gcc.make
+@@ -210,7 +210,7 @@
+ WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body
+ endif
+
+-WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value
++WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value -Wreturn-type
+
+ ifeq ($(USE_CLANG),)
+ # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
+diff --git openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
+--- openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad
++++ openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
+@@ -1250,6 +1250,7 @@
+
+
+ Unimplemented();
++ return 0; // Mute compiler
+ }
+
+ #ifndef PRODUCT
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+@@ -541,6 +541,7 @@
+ err.report_and_die();
+
+ ShouldNotReachHere();
++ return true; // Mute compiler
+ }
+
+ void os::Linux::init_thread_fpu_state(void) {
+diff --git openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
+--- openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp
++++ openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
+@@ -506,7 +506,7 @@
+ ss.write((const char*)name->bytes(), name->utf8_length());
+ ss.write((const char*)signature->bytes(), signature->utf8_length());
+ ss.print(" is abstract");
+- return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
++ return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
+ }
+
+ Symbol* MethodFamily::generate_conflicts_message(GrowableArray<Method*>* methods, TRAPS) const {
+@@ -521,7 +521,7 @@
+ ss.print(".");
+ ss.write((const char*)name->bytes(), name->utf8_length());
+ }
+- return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
++ return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
+ }
+
+
+diff --git openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
+--- openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp
++++ openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
+@@ -249,7 +249,7 @@
+ MutexLocker ml(SymbolTable_lock, THREAD);
+
+ // Otherwise, add to symbol to table
+- return the_table()->basic_add(index, (u1*)name, len, hashValue, true, CHECK_NULL);
++ return the_table()->basic_add(index, (u1*)name, len, hashValue, true, THREAD);
+ }
+
+ Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) {
+@@ -288,7 +288,7 @@
+ // Grab SymbolTable_lock first.
+ MutexLocker ml(SymbolTable_lock, THREAD);
+
+- return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, CHECK_NULL);
++ return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, THREAD);
+ }
+
+ Symbol* SymbolTable::lookup_only(const char* name, int len,
+diff --git openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
+--- openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp
++++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
+@@ -229,15 +229,15 @@
+ class_name->as_C_string(),
+ class_loader.is_null() ? "null" : class_loader->klass()->name()->as_C_string()));
+ if (FieldType::is_array(class_name)) {
+- return resolve_array_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
++ return resolve_array_class_or_null(class_name, class_loader, protection_domain, THREAD);
+ } else if (FieldType::is_obj(class_name)) {
+ ResourceMark rm(THREAD);
+ // Ignore wrapping L and ;.
+ TempNewSymbol name = SymbolTable::new_symbol(class_name->as_C_string() + 1,
+ class_name->utf8_length() - 2, CHECK_NULL);
+- return resolve_instance_class_or_null(name, class_loader, protection_domain, CHECK_NULL);
++ return resolve_instance_class_or_null(name, class_loader, protection_domain, THREAD);
+ } else {
+- return resolve_instance_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
++ return resolve_instance_class_or_null(class_name, class_loader, protection_domain, THREAD);
+ }
+ }
+
+diff --git openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
+--- openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp
++++ openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
+@@ -367,7 +367,7 @@
+ _csv_format(csv_format), _print_help(print_help),
+ _print_class_stats(print_class_stats), _columns(columns) {}
+ void heap_inspection(outputStream* st) NOT_SERVICES_RETURN;
+- size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN;
++ size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN_(0);
+ static void find_instances_at_safepoint(Klass* k, GrowableArray<oop>* result) NOT_SERVICES_RETURN;
+ private:
+ void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL);
+diff --git openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
+--- openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp
++++ openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
+@@ -93,7 +93,7 @@
+ static void preload_and_dump(TRAPS) NOT_CDS_RETURN;
+ static int preload_and_dump(const char * class_list_path,
+ GrowableArray<Klass*>* class_promote_order,
+- TRAPS) NOT_CDS_RETURN;
++ TRAPS) NOT_CDS_RETURN_(0);
+
+ static ReservedSpace* shared_rs() {
+ CDS_ONLY(return _shared_rs);
+diff --git openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp openjdk/hotspot/src/share/vm/oops/constantPool.hpp
+--- openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp
++++ openjdk/hotspot/src/share/vm/oops/constantPool.hpp
+@@ -352,7 +352,7 @@
+
+ Klass* klass_at(int which, TRAPS) {
+ constantPoolHandle h_this(THREAD, this);
+- return klass_at_impl(h_this, which, CHECK_NULL);
++ return klass_at_impl(h_this, which, THREAD);
+ }
+
+ Symbol* klass_name_at(int which); // Returns the name, w/o resolving.
+diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
+--- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
++++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
+@@ -4244,7 +4244,7 @@
+ JVM_DTraceProvider* providers))
+ JVMWrapper("JVM_DTraceActivate");
+ return DTraceJSDT::activate(
+- version, module_name, providers_count, providers, CHECK_0);
++ version, module_name, providers_count, providers, THREAD);
+ JVM_END
+
+ JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method))
+diff --git openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp openjdk/hotspot/src/share/vm/runtime/reflection.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp
++++ openjdk/hotspot/src/share/vm/runtime/reflection.cpp
+@@ -1093,7 +1093,7 @@
+ } else {
+ if (rtype == T_BOOLEAN || rtype == T_BYTE || rtype == T_CHAR || rtype == T_SHORT)
+ narrow((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
+- return box((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
++ return box((jvalue*) result.get_value_addr(), rtype, THREAD);
+ }
+ }
+
+diff --git openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp
++++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
+@@ -1046,7 +1046,7 @@
+ // last java frame on stack (which includes native call frames)
+ vframeStream vfst(thread, true); // Do not skip and javaCalls
+
+- return find_callee_info_helper(thread, vfst, bc, callinfo, CHECK_(Handle()));
++ return find_callee_info_helper(thread, vfst, bc, callinfo, THREAD);
+ }
+
+
+diff --git openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp openjdk/hotspot/src/share/vm/services/memTracker.hpp
+--- openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp
++++ openjdk/hotspot/src/share/vm/services/memTracker.hpp
+@@ -64,7 +64,7 @@
+ const NativeCallStack& stack, MEMFLAGS flag = mtNone) { }
+ static inline void record_virtual_memory_commit(void* addr, size_t size, const NativeCallStack& stack) { }
+ static inline Tracker get_virtual_memory_uncommit_tracker() { return Tracker(); }
+- static inline Tracker get_virtual_memory_release_tracker() { }
++ static inline Tracker get_virtual_memory_release_tracker() { return Tracker(); }
+ static inline void record_virtual_memory_type(void* addr, MEMFLAGS flag) { }
+ static inline void record_thread_stack(void* addr, size_t size) { }
+ static inline void release_thread_stack(void* addr, size_t size) { }
diff --git a/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch b/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch
new file mode 100644
index 0000000..790ee0d
--- /dev/null
+++ b/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch
@@ -0,0 +1,28 @@
+# HG changeset patch
+# User goetz
+# Date 1415873641 -3600
+# Thu Nov 13 11:14:01 2014 +0100
+# Node ID 1878c4c1d04e1f3c6f67a19d36c35863d6b5f906
+# Parent 533473c67de6ff767710594639033c8e83523fe5
+8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning
+Reviewed-by: stefank, tschatzl
+
+diff --git openjdk.orig/hotspot/src/share/vm/prims/jni.cpp openjdk/hotspot/src/share/vm/prims/jni.cpp
+--- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp
++++ openjdk/hotspot/src/share/vm/prims/jni.cpp
+@@ -708,6 +708,7 @@
+
+ THROW_OOP_(JNIHandles::resolve(obj), JNI_OK);
+ ShouldNotReachHere();
++ return 0; // Mute compiler.
+ JNI_END
+
+ #ifndef USDT2
+@@ -734,6 +735,7 @@
+ Handle protection_domain (THREAD, k->protection_domain());
+ THROW_MSG_LOADER_(name, (char *)message, class_loader, protection_domain, JNI_OK);
+ ShouldNotReachHere();
++ return 0; // Mute compiler.
+ JNI_END
+
+
diff --git a/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_jdk.patch b/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_jdk.patch
new file mode 100644
index 0000000..f79be53
--- /dev/null
+++ b/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_jdk.patch
@@ -0,0 +1,98 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1537884792 -7200
+# Tue Sep 25 16:13:12 2018 +0200
+# Node ID fd140d7550992267e3f0f08a20b461b2ce9fa740
+# Parent 21056af0d1eabbd04d7a223c01a28320c7010bfe
+8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling
+Reviewed-by: erikj, goetz, dholmes
+
+diff --git openjdk.orig/jdk/make/lib/SoundLibraries.gmk openjdk/jdk/make/lib/SoundLibraries.gmk
+--- openjdk/jdk/make/lib/SoundLibraries.gmk Tue Jan 12 21:01:12 2016 +0000
++++ openjdk/jdk/make/lib/SoundLibraries.gmk Wed Jan 13 00:18:02 2016 +0000
+@@ -140,6 +140,10 @@
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC64
+ endif
+
++ ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
++ LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC64LE
++ endif
++
+ ifeq ($(OPENJDK_TARGET_CPU), aarch64)
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_AARCH64
+ endif
+diff -r 1fe56343ecc8 openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
+--- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Tue Jan 12 21:01:12 2016 +0000
++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Wed Jan 13 00:18:02 2016 +0000
+@@ -44,6 +44,8 @@
+ #define X_ARM 7
+ #define X_PPC 8
+ #define X_AARCH64 9
++#define X_PPC64 10
++#define X_PPC64LE 11
+
+ // **********************************
+ // Make sure you set X_PLATFORM and X_ARCH defines correctly.
+diff --git openjdk.orig/jdk/src/solaris/bin/ppc64le/jvm.cfg openjdk/jdk/src/solaris/bin/ppc64le/jvm.cfg
+new file mode 100644
+--- /dev/null
++++ openjdk/jdk/src/solaris/bin/ppc64le/jvm.cfg
+@@ -0,0 +1,34 @@
++# 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
++-client IGNORE
+diff --git openjdk.orig/test/sun/security/pkcs11/PKCS11Test.java openjdk/test/sun/security/pkcs11/PKCS11Test.java
+--- openjdk.orig/jdk/test/sun/security/pkcs11/PKCS11Test.java
++++ openjdk/jdk/test/sun/security/pkcs11/PKCS11Test.java
+@@ -505,6 +505,8 @@
+ osMap.put("Linux-amd64-64", new String[]{
+ "/usr/lib/x86_64-linux-gnu/", "/usr/lib/x86_64-linux-gnu/nss/",
+ "/usr/lib64/"});
++ osMap.put("Linux-ppc64-64", new String[]{"/usr/lib64/"});
++ osMap.put("Linux-ppc64le-64", new String[]{"/usr/lib64/"});
+ osMap.put("Windows-x86-32", new String[]{
+ PKCS11_BASE + "/nss/lib/windows-i586/".replace('/', SEP)});
+ osMap.put("Windows-amd64-64", new String[]{
+diff --git openjdk.orig/jdk/test/tools/launcher/Settings.java openjdk/jdk/test/tools/launcher/Settings.java
+--- openjdk.orig/jdk/test/tools/launcher/Settings.java
++++ openjdk/jdk/test/tools/launcher/Settings.java
+@@ -74,7 +74,7 @@
+
+ static void runTestOptionDefault() throws IOException {
+ String stackSize = "256"; // in kb
+- if (getArch().equals("ppc64")) {
++ if (getArch().equals("ppc64") || getArch().equals("ppc64le")) {
+ stackSize = "800";
+ }
+ TestResult tr = null;
diff --git a/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch b/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch
new file mode 100644
index 0000000..67fc620
--- /dev/null
+++ b/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch
@@ -0,0 +1,47 @@
+# HG changeset patch
+# User asmundak
+# Date 1537883922 -7200
+# Tue Sep 25 15:58:42 2018 +0200
+# Node ID 2fabe07c0bd8bf21400313f3bb9b8e80fcb31724
+# Parent 91867683f73de3882ef88981a79995beeeb1e980
+8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling
+Reviewed-by: erikj, goetz, dholmes
+Contributed-by: Andrew Hughes <gnu.andrew(a)redhat.com>, Alexander Smundak <asmundak(a)google.com>
+
+diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/flags.m4
+--- openjdk.orig///common/autoconf/flags.m4
++++ openjdk///common/autoconf/flags.m4
+@@ -549,6 +549,9 @@
+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN"
+ fi
+ fi
++ if test "x$OPENJDK_TARGET_CPU" = xppc64le; then
++ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DABI_ELFv2"
++ fi
+
+ # Setup target OS define. Use OS target name but in upper case.
+ OPENJDK_TARGET_OS_UPPERCASE=`$ECHO $OPENJDK_TARGET_OS | $TR 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+diff --git openjdk.orig///common/autoconf/jdk-options.m4 openjdk///common/autoconf/jdk-options.m4
+--- openjdk.orig///common/autoconf/jdk-options.m4
++++ openjdk///common/autoconf/jdk-options.m4
+@@ -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
+ AC_SUBST(INCLUDE_SA)
+diff --git openjdk.orig///common/autoconf/platform.m4 openjdk///common/autoconf/platform.m4
+--- openjdk.orig///common/autoconf/platform.m4
++++ openjdk///common/autoconf/platform.m4
+@@ -67,7 +67,7 @@
+ VAR_CPU_ENDIAN=big
+ ;;
+ powerpc64le)
+- VAR_CPU=ppc64
++ VAR_CPU=ppc64le
+ VAR_CPU_ARCH=ppc
+ VAR_CPU_BITS=64
+ VAR_CPU_ENDIAN=little
diff --git a/jdk8073139-pr2236-rh1191652--use_ppc64le_as_the_arch_directory_on_that_platform_and_report_it_in_os_arch_aarch64_forest.patch b/jdk8073139-pr2236-rh1191652--use_ppc64le_as_the_arch_directory_on_that_platform_and_report_it_in_os_arch_aarch64_forest.patch
new file mode 100644
index 0000000..a5afea0
--- /dev/null
+++ b/jdk8073139-pr2236-rh1191652--use_ppc64le_as_the_arch_directory_on_that_platform_and_report_it_in_os_arch_aarch64_forest.patch
@@ -0,0 +1,130 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1537885415 -7200
+# Tue Sep 25 16:23:35 2018 +0200
+# Node ID 5044428520866481f438bfd1375da75adbc89243
+# Parent a3df1579a8647b06559f41d345da7bea162b26e9
+8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling
+Reviewed-by: erikj, goetz, dholmes
+
+diff --git a/make/defs.make b/make/defs.make
+--- openjdk/hotspot/make/defs.make
++++ openjdk/hotspot/make/defs.make
+@@ -285,7 +285,7 @@ ifneq ($(OSNAME),windows)
+
+ # Use uname output for SRCARCH, but deal with platform differences. If ARCH
+ # is not explicitly listed below, it is treated as x86.
+- SRCARCH ?= $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 ppc ppc64 zero aarch64,$(ARCH)))
++ SRCARCH ?= $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 ppc ppc64 ppc64le zero aarch64,$(ARCH)))
+ ARCH/ = x86
+ ARCH/sparc = sparc
+ ARCH/sparc64= sparc
+@@ -293,6 +293,7 @@ ifneq ($(OSNAME),windows)
+ ARCH/amd64 = x86
+ ARCH/x86_64 = x86
+ ARCH/ppc64 = ppc
++ ARCH/ppc64le= ppc
+ ARCH/ppc = ppc
+ ARCH/zero = zero
+ ARCH/aarch64 = aarch64
+@@ -316,7 +317,12 @@
+ endif
+ endif
+
+- # LIBARCH is 1:1 mapping from BUILDARCH
++ # LIBARCH is 1:1 mapping from BUILDARCH, except for ARCH=ppc64le
++ ifeq ($(ARCH),ppc64le)
++ LIBARCH ?= ppc64le
++ else
++ LIBARCH ?= $(LIBARCH/$(BUILDARCH))
++ endif
+ LIBARCH ?= $(LIBARCH/$(BUILDARCH))
+ LIBARCH/i486 = i386
+ LIBARCH/amd64 = amd64
+diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -1956,7 +1956,7 @@
+ {EM_SPARCV9, EM_SPARCV9, ELFCLASS64, ELFDATA2MSB, (char*)"Sparc v9 64"},
+ {EM_PPC, EM_PPC, ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"},
+ #if defined(VM_LITTLE_ENDIAN)
+- {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2LSB, (char*)"Power PC 64"},
++ {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2LSB, (char*)"Power PC 64 LE"},
+ #else
+ {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"},
+ #endif
+diff --git a/src/share/tools/hsdis/Makefile b/src/share/tools/hsdis/Makefile
+--- openjdk/hotspot/src/share/tools/hsdis/Makefile
++++ openjdk/hotspot/src/share/tools/hsdis/Makefile
+@@ -97,6 +97,7 @@
+ CFLAGS/sparcv9 += -m64
+ CFLAGS/amd64 += -m64
+ CFLAGS/ppc64 += -m64
++CFLAGS/ppc64le += -m64 -DABI_ELFv2
+ else
+ ARCH=$(ARCH1:amd64=i386)
+ CFLAGS/i386 += -m32
+diff --git a/src/share/tools/hsdis/hsdis-demo.c b/src/share/tools/hsdis/hsdis-demo.c
+--- openjdk/hotspot/src/share/tools/hsdis/hsdis-demo.c
++++ openjdk/hotspot/src/share/tools/hsdis/hsdis-demo.c
+@@ -88,7 +88,7 @@
+ printf("...And now for something completely different:\n");
+ void *start = (void*) &main;
+ void *end = (void*) &end_of_file;
+-#if defined(__ia64) || defined(__powerpc__)
++#if defined(__ia64) || (defined(__powerpc__) && !defined(ABI_ELFv2))
+ /* On IA64 and PPC function pointers are pointers to function descriptors */
+ start = *((void**)start);
+ end = *((void**)end);
+diff --git a/src/share/tools/hsdis/hsdis.c b/src/share/tools/hsdis/hsdis.c
+--- openjdk/hotspot/src/share/tools/hsdis/hsdis.c
++++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c
+@@ -461,7 +461,7 @@ static const char* native_arch_name() {
+ #ifdef LIBARCH_sparcv9
+ res = "sparc:v9b";
+ #endif
+-#ifdef LIBARCH_ppc64
++#if defined(LIBARCH_ppc64) || defined(LIBARCH_ppc64le)
+ res = "powerpc:common64";
+ #endif
+ #else
+diff --git a/src/share/vm/runtime/vm_version.cpp b/src/share/vm/runtime/vm_version.cpp
+--- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
+@@ -187,11 +187,16 @@ const char* Abstract_VM_Version::jre_release_version() {
+ #ifndef CPU
+ #ifdef ZERO
+ #define CPU ZERO_LIBARCH
++#elif defined(PPC64)
++#if defined(VM_LITTLE_ENDIAN)
++#define CPU "ppc64le"
++#else
++#define CPU "ppc64"
++#endif
+ #else
+ #define CPU IA32_ONLY("x86") \
+ IA64_ONLY("ia64") \
+ AMD64_ONLY("amd64") \
+- PPC64_ONLY("ppc64") \
+ AARCH64_ONLY("aarch64") \
+ SPARC_ONLY("sparc")
+ #endif // ZERO
+diff --git a/test/test_env.sh b/test/test_env.sh
+--- openjdk/hotspot/test/test_env.sh
++++ openjdk/hotspot/test/test_env.sh
+@@ -185,6 +185,15 @@
+ if [ $? = 0 ]
+ then
+ VM_CPU="ppc"
++ if [ $VM_BITS = "64" ]
++ then
++ VM_CPU="ppc64"
++ grep "ppc64le" vm_version.out > ${NULL}
++ if [ $? = 0 ]
++ then
++ VM_CPU="ppc64le"
++ fi
++ fi
+ fi
+ grep "ia64" vm_version.out > ${NULL}
+ if [ $? = 0 ]
diff --git a/jdk8131048-pr3574-rh1498936-ppc_crc32.patch b/jdk8131048-pr3574-rh1498936-ppc_crc32.patch
new file mode 100644
index 0000000..d7b94e6
--- /dev/null
+++ b/jdk8131048-pr3574-rh1498936-ppc_crc32.patch
@@ -0,0 +1,1417 @@
+# HG changeset patch
+# User gromero
+# Date 1537823918 14400
+# Mon Sep 24 17:18:38 2018 -0400
+# Node ID 567e95df42f866b890dc3f0670e086d266915112
+# Parent 678bb67e02aedd54e32819a9011962326164274e
+8131048, PR3574, RH1498936: ppc implement CRC32 intrinsic
+Reviewed-by: goetz
+
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp openjdk/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp
+@@ -33,5 +33,7 @@
+ address generate_abstract_entry(void);
+ address generate_accessor_entry(void);
+ address generate_Reference_get_entry(void);
++ address generate_CRC32_update_entry();
++ address generate_CRC32_updateBytes_entry(AbstractInterpreter::MethodKind kind);
+
+ #endif // CPU_PPC_VM_INTERPRETERGENERATOR_PPC_HPP
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
+@@ -49,6 +49,7 @@
+ #else
+ #define BLOCK_COMMENT(str) block_comment(str)
+ #endif
++#define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
+
+ #ifdef ASSERT
+ // On RISC, there's no benefit to verifying instruction boundaries.
+@@ -3022,6 +3023,418 @@
+ bind(Ldone_false);
+ }
+
++// Helpers for Intrinsic Emitters
++//
++// Revert the byte order of a 32bit value in a register
++// src: 0x44556677
++// dst: 0x77665544
++// Three steps to obtain the result:
++// 1) Rotate src (as doubleword) left 5 bytes. That puts the leftmost byte of the src word
++// into the rightmost byte position. Afterwards, everything left of the rightmost byte is cleared.
++// This value initializes dst.
++// 2) Rotate src (as word) left 3 bytes. That puts the rightmost byte of the src word into the leftmost
++// byte position. Furthermore, byte 5 is rotated into byte 6 position where it is supposed to go.
++// This value is mask inserted into dst with a [0..23] mask of 1s.
++// 3) Rotate src (as word) left 1 byte. That puts byte 6 into byte 5 position.
++// This value is mask inserted into dst with a [8..15] mask of 1s.
++void MacroAssembler::load_reverse_32(Register dst, Register src) {
++ assert_different_registers(dst, src);
++
++ rldicl(dst, src, (4+1)*8, 56); // Rotate byte 4 into position 7 (rightmost), clear all to the left.
++ rlwimi(dst, src, 3*8, 0, 23); // Insert byte 5 into position 6, 7 into 4, leave pos 7 alone.
++ rlwimi(dst, src, 1*8, 8, 15); // Insert byte 6 into position 5, leave the rest alone.
++}
++
++// Calculate the column addresses of the crc32 lookup table into distinct registers.
++// This loop-invariant calculation is moved out of the loop body, reducing the loop
++// body size from 20 to 16 instructions.
++// Returns the offset that was used to calculate the address of column tc3.
++// Due to register shortage, setting tc3 may overwrite table. With the return offset
++// at hand, the original table address can be easily reconstructed.
++int MacroAssembler::crc32_table_columns(Register table, Register tc0, Register tc1, Register tc2, Register tc3) {
++
++#ifdef VM_LITTLE_ENDIAN
++ // This is what we implement (the DOLIT4 part):
++ // ========================================================================= */
++ // #define DOLIT4 c ^= *buf4++; \
++ // c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
++ // crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
++ // #define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
++ // ========================================================================= */
++ const int ix0 = 3*(4*CRC32_COLUMN_SIZE);
++ const int ix1 = 2*(4*CRC32_COLUMN_SIZE);
++ const int ix2 = 1*(4*CRC32_COLUMN_SIZE);
++ const int ix3 = 0*(4*CRC32_COLUMN_SIZE);
++#else
++ // This is what we implement (the DOBIG4 part):
++ // =========================================================================
++ // #define DOBIG4 c ^= *++buf4; \
++ // c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
++ // crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
++ // #define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
++ // =========================================================================
++ const int ix0 = 4*(4*CRC32_COLUMN_SIZE);
++ const int ix1 = 5*(4*CRC32_COLUMN_SIZE);
++ const int ix2 = 6*(4*CRC32_COLUMN_SIZE);
++ const int ix3 = 7*(4*CRC32_COLUMN_SIZE);
++#endif
++ assert_different_registers(table, tc0, tc1, tc2);
++ assert(table == tc3, "must be!");
++
++ if (ix0 != 0) addi(tc0, table, ix0);
++ if (ix1 != 0) addi(tc1, table, ix1);
++ if (ix2 != 0) addi(tc2, table, ix2);
++ if (ix3 != 0) addi(tc3, table, ix3);
++
++ return ix3;
++}
++
++/**
++ * uint32_t crc;
++ * timesXtoThe32[crc & 0xFF] ^ (crc >> 8);
++ */
++void MacroAssembler::fold_byte_crc32(Register crc, Register val, Register table, Register tmp) {
++ assert_different_registers(crc, table, tmp);
++ assert_different_registers(val, table);
++
++ if (crc == val) { // Must rotate first to use the unmodified value.
++ rlwinm(tmp, val, 2, 24-2, 31-2); // Insert (rightmost) byte 7 of val, shifted left by 2, into byte 6..7 of tmp, clear the rest.
++ // As we use a word (4-byte) instruction, we have to adapt the mask bit positions.
++ srwi(crc, crc, 8); // Unsigned shift, clear leftmost 8 bits.
++ } else {
++ srwi(crc, crc, 8); // Unsigned shift, clear leftmost 8 bits.
++ rlwinm(tmp, val, 2, 24-2, 31-2); // Insert (rightmost) byte 7 of val, shifted left by 2, into byte 6..7 of tmp, clear the rest.
++ }
++ lwzx(tmp, table, tmp);
++ xorr(crc, crc, tmp);
++}
++
++/**
++ * uint32_t crc;
++ * timesXtoThe32[crc & 0xFF] ^ (crc >> 8);
++ */
++void MacroAssembler::fold_8bit_crc32(Register crc, Register table, Register tmp) {
++ fold_byte_crc32(crc, crc, table, tmp);
++}
++
++/**
++ * Emits code to update CRC-32 with a byte value according to constants in table.
++ *
++ * @param [in,out]crc Register containing the crc.
++ * @param [in]val Register containing the byte to fold into the CRC.
++ * @param [in]table Register containing the table of crc constants.
++ *
++ * uint32_t crc;
++ * val = crc_table[(val ^ crc) & 0xFF];
++ * crc = val ^ (crc >> 8);
++ */
++void MacroAssembler::update_byte_crc32(Register crc, Register val, Register table) {
++ BLOCK_COMMENT("update_byte_crc32:");
++ xorr(val, val, crc);
++ fold_byte_crc32(crc, val, table, val);
++}
++
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param table register pointing to CRC table
++ */
++void MacroAssembler::update_byteLoop_crc32(Register crc, Register buf, Register len, Register table,
++ Register data, bool loopAlignment, bool invertCRC) {
++ assert_different_registers(crc, buf, len, table, data);
++
++ Label L_mainLoop, L_done;
++ const int mainLoop_stepping = 1;
++ const int mainLoop_alignment = loopAlignment ? 32 : 4; // (InputForNewCode > 4 ? InputForNewCode : 32) : 4;
++
++ // Process all bytes in a single-byte loop.
++ cmpdi(CCR0, len, 0); // Anything to do?
++ mtctr(len);
++ beq(CCR0, L_done);
++
++ if (invertCRC) {
++ nand(crc, crc, crc); // ~c
++ }
++
++ align(mainLoop_alignment);
++ BIND(L_mainLoop);
++ lbz(data, 0, buf); // Byte from buffer, zero-extended.
++ addi(buf, buf, mainLoop_stepping); // Advance buffer position.
++ update_byte_crc32(crc, data, table);
++ bdnz(L_mainLoop); // Iterate.
++
++ if (invertCRC) {
++ nand(crc, crc, crc); // ~c
++ }
++
++ bind(L_done);
++}
++
++/**
++ * Emits code to update CRC-32 with a 4-byte value according to constants in table
++ * Implementation according to jdk/src/share/native/java/util/zip/zlib-1.2.8/crc32.c
++ */
++// A not on the lookup table address(es):
++// The lookup table consists of two sets of four columns each.
++// The columns {0..3} are used for little-endian machines.
++// The columns {4..7} are used for big-endian machines.
++// To save the effort of adding the column offset to the table address each time
++// a table element is looked up, it is possible to pass the pre-calculated
++// column addresses.
++// Uses R9..R12 as work register. Must be saved/restored by caller, if necessary.
++void MacroAssembler::update_1word_crc32(Register crc, Register buf, Register table, int bufDisp, int bufInc,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3) {
++ assert_different_registers(crc, t3);
++
++ // XOR crc with next four bytes of buffer.
++ lwz(t3, bufDisp, buf);
++ if (bufInc != 0) {
++ addi(buf, buf, bufInc);
++ }
++ xorr(t3, t3, crc);
++
++ // Chop crc into 4 single-byte pieces, shifted left 2 bits, to form the table indices.
++ rlwinm(t0, t3, 2, 24-2, 31-2); // ((t1 >> 0) & 0xff) << 2
++ rlwinm(t1, t3, 32+(2- 8), 24-2, 31-2); // ((t1 >> 8) & 0xff) << 2
++ rlwinm(t2, t3, 32+(2-16), 24-2, 31-2); // ((t1 >> 16) & 0xff) << 2
++ rlwinm(t3, t3, 32+(2-24), 24-2, 31-2); // ((t1 >> 24) & 0xff) << 2
++
++ // Use the pre-calculated column addresses.
++ // Load pre-calculated table values.
++ lwzx(t0, tc0, t0);
++ lwzx(t1, tc1, t1);
++ lwzx(t2, tc2, t2);
++ lwzx(t3, tc3, t3);
++
++ // Calculate new crc from table values.
++ xorr(t0, t0, t1);
++ xorr(t2, t2, t3);
++ xorr(crc, t0, t2); // Now crc contains the final checksum value.
++}
++
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param table register pointing to CRC table
++ *
++ * Uses R9..R12 as work register. Must be saved/restored by caller!
++ */
++void MacroAssembler::kernel_crc32_2word(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3) {
++ assert_different_registers(crc, buf, len, table);
++
++ Label L_mainLoop, L_tail;
++ Register tmp = t0;
++ Register data = t0;
++ Register tmp2 = t1;
++ const int mainLoop_stepping = 8;
++ const int tailLoop_stepping = 1;
++ const int log_stepping = exact_log2(mainLoop_stepping);
++ const int mainLoop_alignment = 32; // InputForNewCode > 4 ? InputForNewCode : 32;
++ const int complexThreshold = 2*mainLoop_stepping;
++
++ // Don't test for len <= 0 here. This pathological case should not occur anyway.
++ // Optimizing for it by adding a test and a branch seems to be a waste of CPU cycles.
++ // The situation itself is detected and handled correctly by the conditional branches
++ // following aghi(len, -stepping) and aghi(len, +stepping).
++ assert(tailLoop_stepping == 1, "check tailLoop_stepping!");
++
++ BLOCK_COMMENT("kernel_crc32_2word {");
++
++ nand(crc, crc, crc); // ~c
++
++ // Check for short (<mainLoop_stepping) buffer.
++ cmpdi(CCR0, len, complexThreshold);
++ blt(CCR0, L_tail);
++
++ // Pre-mainLoop alignment did show a slight (1%) positive effect on performance.
++ // We leave the code in for reference. Maybe we need alignment when we exploit vector instructions.
++ {
++ // Align buf addr to mainLoop_stepping boundary.
++ neg(tmp2, buf); // Calculate # preLoop iterations for alignment.
++ rldicl(tmp2, tmp2, 0, 64-log_stepping); // Rotate tmp2 0 bits, insert into tmp2, anding with mask with 1s from 62..63.
++
++ if (complexThreshold > mainLoop_stepping) {
++ sub(len, len, tmp2); // Remaining bytes for main loop (>=mainLoop_stepping is guaranteed).
++ } else {
++ sub(tmp, len, tmp2); // Remaining bytes for main loop.
++ cmpdi(CCR0, tmp, mainLoop_stepping);
++ blt(CCR0, L_tail); // For less than one mainloop_stepping left, do only tail processing
++ mr(len, tmp); // remaining bytes for main loop (>=mainLoop_stepping is guaranteed).
++ }
++ update_byteLoop_crc32(crc, buf, tmp2, table, data, false, false);
++ }
++
++ srdi(tmp2, len, log_stepping); // #iterations for mainLoop
++ andi(len, len, mainLoop_stepping-1); // remaining bytes for tailLoop
++ mtctr(tmp2);
++
++#ifdef VM_LITTLE_ENDIAN
++ Register crc_rv = crc;
++#else
++ Register crc_rv = tmp; // Load_reverse needs separate registers to work on.
++ // Occupies tmp, but frees up crc.
++ load_reverse_32(crc_rv, crc); // Revert byte order because we are dealing with big-endian data.
++ tmp = crc;
++#endif
++
++ int reconstructTableOffset = crc32_table_columns(table, tc0, tc1, tc2, tc3);
++
++ align(mainLoop_alignment); // Octoword-aligned loop address. Shows 2% improvement.
++ BIND(L_mainLoop);
++ update_1word_crc32(crc_rv, buf, table, 0, 0, crc_rv, t1, t2, t3, tc0, tc1, tc2, tc3);
++ update_1word_crc32(crc_rv, buf, table, 4, mainLoop_stepping, crc_rv, t1, t2, t3, tc0, tc1, tc2, tc3);
++ bdnz(L_mainLoop);
++
++#ifndef VM_LITTLE_ENDIAN
++ load_reverse_32(crc, crc_rv); // Revert byte order because we are dealing with big-endian data.
++ tmp = crc_rv; // Tmp uses it's original register again.
++#endif
++
++ // Restore original table address for tailLoop.
++ if (reconstructTableOffset != 0) {
++ addi(table, table, -reconstructTableOffset);
++ }
++
++ // Process last few (<complexThreshold) bytes of buffer.
++ BIND(L_tail);
++ update_byteLoop_crc32(crc, buf, len, table, data, false, false);
++
++ nand(crc, crc, crc); // ~c
++ BLOCK_COMMENT("} kernel_crc32_2word");
++}
++
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param table register pointing to CRC table
++ *
++ * uses R9..R12 as work register. Must be saved/restored by caller!
++ */
++void MacroAssembler::kernel_crc32_1word(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3) {
++ assert_different_registers(crc, buf, len, table);
++
++ Label L_mainLoop, L_tail;
++ Register tmp = t0;
++ Register data = t0;
++ Register tmp2 = t1;
++ const int mainLoop_stepping = 4;
++ const int tailLoop_stepping = 1;
++ const int log_stepping = exact_log2(mainLoop_stepping);
++ const int mainLoop_alignment = 32; // InputForNewCode > 4 ? InputForNewCode : 32;
++ const int complexThreshold = 2*mainLoop_stepping;
++
++ // Don't test for len <= 0 here. This pathological case should not occur anyway.
++ // Optimizing for it by adding a test and a branch seems to be a waste of CPU cycles.
++ // The situation itself is detected and handled correctly by the conditional branches
++ // following aghi(len, -stepping) and aghi(len, +stepping).
++ assert(tailLoop_stepping == 1, "check tailLoop_stepping!");
++
++ BLOCK_COMMENT("kernel_crc32_1word {");
++
++ nand(crc, crc, crc); // ~c
++
++ // Check for short (<mainLoop_stepping) buffer.
++ cmpdi(CCR0, len, complexThreshold);
++ blt(CCR0, L_tail);
++
++ // Pre-mainLoop alignment did show a slight (1%) positive effect on performance.
++ // We leave the code in for reference. Maybe we need alignment when we exploit vector instructions.
++ {
++ // Align buf addr to mainLoop_stepping boundary.
++ neg(tmp2, buf); // Calculate # preLoop iterations for alignment.
++ rldicl(tmp2, tmp2, 0, 64-log_stepping); // Rotate tmp2 0 bits, insert into tmp2, anding with mask with 1s from 62..63.
++
++ if (complexThreshold > mainLoop_stepping) {
++ sub(len, len, tmp2); // Remaining bytes for main loop (>=mainLoop_stepping is guaranteed).
++ } else {
++ sub(tmp, len, tmp2); // Remaining bytes for main loop.
++ cmpdi(CCR0, tmp, mainLoop_stepping);
++ blt(CCR0, L_tail); // For less than one mainloop_stepping left, do only tail processing
++ mr(len, tmp); // remaining bytes for main loop (>=mainLoop_stepping is guaranteed).
++ }
++ update_byteLoop_crc32(crc, buf, tmp2, table, data, false, false);
++ }
++
++ srdi(tmp2, len, log_stepping); // #iterations for mainLoop
++ andi(len, len, mainLoop_stepping-1); // remaining bytes for tailLoop
++ mtctr(tmp2);
++
++#ifdef VM_LITTLE_ENDIAN
++ Register crc_rv = crc;
++#else
++ Register crc_rv = tmp; // Load_reverse needs separate registers to work on.
++ // Occupies tmp, but frees up crc.
++ load_reverse_32(crc_rv, crc); // evert byte order because we are dealing with big-endian data.
++ tmp = crc;
++#endif
++
++ int reconstructTableOffset = crc32_table_columns(table, tc0, tc1, tc2, tc3);
++
++ align(mainLoop_alignment); // Octoword-aligned loop address. Shows 2% improvement.
++ BIND(L_mainLoop);
++ update_1word_crc32(crc_rv, buf, table, 0, mainLoop_stepping, crc_rv, t1, t2, t3, tc0, tc1, tc2, tc3);
++ bdnz(L_mainLoop);
++
++#ifndef VM_LITTLE_ENDIAN
++ load_reverse_32(crc, crc_rv); // Revert byte order because we are dealing with big-endian data.
++ tmp = crc_rv; // Tmp uses it's original register again.
++#endif
++
++ // Restore original table address for tailLoop.
++ if (reconstructTableOffset != 0) {
++ addi(table, table, -reconstructTableOffset);
++ }
++
++ // Process last few (<complexThreshold) bytes of buffer.
++ BIND(L_tail);
++ update_byteLoop_crc32(crc, buf, len, table, data, false, false);
++
++ nand(crc, crc, crc); // ~c
++ BLOCK_COMMENT("} kernel_crc32_1word");
++}
++
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param table register pointing to CRC table
++ *
++ * Uses R7_ARG5, R8_ARG6 as work registers.
++ */
++void MacroAssembler::kernel_crc32_1byte(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3) {
++ assert_different_registers(crc, buf, len, table);
++
++ Register data = t0; // Holds the current byte to be folded into crc.
++
++ BLOCK_COMMENT("kernel_crc32_1byte {");
++
++ // Process all bytes in a single-byte loop.
++ update_byteLoop_crc32(crc, buf, len, table, data, true, true);
++
++ BLOCK_COMMENT("} kernel_crc32_1byte");
++}
++
++void MacroAssembler::kernel_crc32_singleByte(Register crc, Register buf, Register len, Register table, Register tmp) {
++ assert_different_registers(crc, buf, /* len, not used!! */ table, tmp);
++
++ BLOCK_COMMENT("kernel_crc32_singleByte:");
++ nand(crc, crc, crc); // ~c
++
++ lbz(tmp, 0, buf); // Byte from buffer, zero-extended.
++ update_byte_crc32(crc, tmp, table);
++
++ nand(crc, crc, crc); // ~c
++}
++
+
+ void MacroAssembler::asm_assert(bool check_equal, const char *msg, int id) {
+ #ifdef ASSERT
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
+@@ -637,6 +637,27 @@
+ void char_arrays_equalsImm(Register str1_reg, Register str2_reg, int cntval, Register result_reg,
+ Register tmp1_reg, Register tmp2_reg);
+
++ // CRC32 Intrinsics.
++ void load_reverse_32(Register dst, Register src);
++ int crc32_table_columns(Register table, Register tc0, Register tc1, Register tc2, Register tc3);
++ void fold_byte_crc32(Register crc, Register val, Register table, Register tmp);
++ void fold_8bit_crc32(Register crc, Register table, Register tmp);
++ void update_byte_crc32(Register crc, Register val, Register table);
++ void update_byteLoop_crc32(Register crc, Register buf, Register len, Register table,
++ Register data, bool loopAlignment, bool invertCRC);
++ void update_1word_crc32(Register crc, Register buf, Register table, int bufDisp, int bufInc,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3);
++ void kernel_crc32_2word(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3);
++ void kernel_crc32_1word(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3);
++ void kernel_crc32_1byte(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3);
++ void kernel_crc32_singleByte(Register crc, Register buf, Register len, Register table, Register tmp);
++
+ //
+ // Debugging
+ //
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
+@@ -2473,6 +2473,54 @@
+ __ blr();
+ }
+
++ /**
++ * Arguments:
++ *
++ * Inputs:
++ * R3_ARG1 - int crc
++ * R4_ARG2 - byte* buf
++ * R5_ARG3 - int length (of buffer)
++ *
++ * scratch:
++ * R6_ARG4 - crc table address
++ * R7_ARG5 - tmp1
++ * R8_ARG6 - tmp2
++ *
++ * Ouput:
++ * R3_RET - int crc result
++ */
++ // Compute CRC32 function.
++ address generate_CRC32_updateBytes(const char* name) {
++ __ align(CodeEntryAlignment);
++ StubCodeMark mark(this, "StubRoutines", name);
++ address start = __ function_entry(); // Remember stub start address (is rtn value).
++
++ // arguments to kernel_crc32:
++ Register crc = R3_ARG1; // Current checksum, preset by caller or result from previous call.
++ Register data = R4_ARG2; // source byte array
++ Register dataLen = R5_ARG3; // #bytes to process
++ Register table = R6_ARG4; // crc table address
++
++ Register t0 = R9; // work reg for kernel* emitters
++ Register t1 = R10; // work reg for kernel* emitters
++ Register t2 = R11; // work reg for kernel* emitters
++ Register t3 = R12; // work reg for kernel* emitters
++
++ BLOCK_COMMENT("Stub body {");
++ assert_different_registers(crc, data, dataLen, table);
++
++ StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
++
++ __ kernel_crc32_1byte(crc, data, dataLen, table, t0, t1, t2, t3);
++
++ BLOCK_COMMENT("return");
++ __ mr_if_needed(R3_RET, crc); // Updated crc is function result. No copying required (R3_ARG1 == R3_RET).
++ __ blr();
++
++ BLOCK_COMMENT("} Stub body");
++ return start;
++ }
++
+ // Initialization
+ void generate_initial() {
+ // Generates all stubs and initializes the entry points
+@@ -2491,6 +2539,12 @@
+ StubRoutines::_throw_StackOverflowError_entry =
+ generate_throw_exception("StackOverflowError throw_exception",
+ CAST_FROM_FN_PTR(address, SharedRuntime::throw_StackOverflowError), false);
++
++ // CRC32 Intrinsics.
++ if (UseCRC32Intrinsics) {
++ StubRoutines::_crc_table_adr = (address)StubRoutines::ppc64::_crc_table;
++ StubRoutines::_updateBytesCRC32 = generate_CRC32_updateBytes("CRC32_updateBytes");
++ }
+ }
+
+ void generate_all() {
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
+@@ -1,6 +1,6 @@
+ /*
+- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+- * Copyright 2012, 2014 SAP AG. All rights reserved.
++ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 2018 SAP SE. 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
+@@ -23,7 +23,457 @@
+ *
+ */
+
++#include "asm/macroAssembler.inline.hpp"
++#include "runtime/stubRoutines.hpp"
++
+ // Implementation of the platform-specific part of StubRoutines - for
+ // a description of how to extend it, see the stubRoutines.hpp file.
+
+
++#define __ masm->
++
++// CRC32 Intrinsics.
++void StubRoutines::ppc64::generate_load_crc_table_addr(MacroAssembler* masm, Register table) {
++ __ load_const(table, StubRoutines::_crc_table_adr);
++}
++
++// CRC32 Intrinsics.
++/**
++ * crc_table[] from jdk/src/share/native/java/util/zip/zlib-1.2.8/crc32.h
++ */
++juint StubRoutines::ppc64::_crc_table[CRC32_TABLES][CRC32_COLUMN_SIZE] = {
++ {
++ 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
++ 0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
++ 0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
++ 0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
++ 0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
++ 0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
++ 0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
++ 0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
++ 0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
++ 0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
++ 0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
++ 0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
++ 0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
++ 0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
++ 0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
++ 0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
++ 0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
++ 0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
++ 0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
++ 0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
++ 0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
++ 0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
++ 0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
++ 0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
++ 0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
++ 0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
++ 0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
++ 0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
++ 0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
++ 0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
++ 0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
++ 0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
++ 0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
++ 0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
++ 0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
++ 0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
++ 0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
++ 0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
++ 0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
++ 0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
++ 0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
++ 0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
++ 0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
++ 0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
++ 0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
++ 0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
++ 0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
++ 0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
++ 0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
++ 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
++ 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
++ 0x2d02ef8dUL
++#ifdef CRC32_BYFOUR
++ },
++ {
++ 0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
++ 0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
++ 0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
++ 0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
++ 0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
++ 0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
++ 0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
++ 0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
++ 0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
++ 0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
++ 0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
++ 0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
++ 0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
++ 0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
++ 0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
++ 0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
++ 0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
++ 0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
++ 0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
++ 0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
++ 0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
++ 0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
++ 0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
++ 0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
++ 0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
++ 0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
++ 0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
++ 0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
++ 0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
++ 0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
++ 0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
++ 0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
++ 0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
++ 0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
++ 0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
++ 0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
++ 0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
++ 0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
++ 0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
++ 0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
++ 0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
++ 0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
++ 0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
++ 0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
++ 0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
++ 0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
++ 0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
++ 0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
++ 0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
++ 0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
++ 0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
++ 0x9324fd72UL
++ },
++ {
++ 0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
++ 0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
++ 0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
++ 0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
++ 0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
++ 0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
++ 0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
++ 0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
++ 0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
++ 0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
++ 0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
++ 0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
++ 0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
++ 0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
++ 0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
++ 0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
++ 0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
++ 0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
++ 0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
++ 0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
++ 0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
++ 0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
++ 0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
++ 0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
++ 0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
++ 0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
++ 0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
++ 0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
++ 0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
++ 0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
++ 0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
++ 0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
++ 0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
++ 0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
++ 0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
++ 0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
++ 0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
++ 0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
++ 0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
++ 0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
++ 0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
++ 0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
++ 0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
++ 0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
++ 0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
++ 0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
++ 0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
++ 0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
++ 0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
++ 0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
++ 0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
++ 0xbe9834edUL
++ },
++ {
++ 0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
++ 0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
++ 0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
++ 0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
++ 0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
++ 0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
++ 0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
++ 0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
++ 0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
++ 0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
++ 0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
++ 0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
++ 0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
++ 0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
++ 0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
++ 0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
++ 0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
++ 0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
++ 0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
++ 0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
++ 0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
++ 0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
++ 0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
++ 0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
++ 0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
++ 0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
++ 0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
++ 0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
++ 0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
++ 0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
++ 0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
++ 0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
++ 0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
++ 0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
++ 0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
++ 0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
++ 0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
++ 0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
++ 0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
++ 0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
++ 0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
++ 0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
++ 0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
++ 0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
++ 0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
++ 0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
++ 0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
++ 0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
++ 0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
++ 0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
++ 0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
++ 0xde0506f1UL
++ },
++ {
++ 0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
++ 0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
++ 0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
++ 0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
++ 0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
++ 0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
++ 0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
++ 0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
++ 0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
++ 0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
++ 0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
++ 0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
++ 0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
++ 0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
++ 0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
++ 0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
++ 0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
++ 0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
++ 0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
++ 0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
++ 0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
++ 0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
++ 0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
++ 0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
++ 0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
++ 0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
++ 0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
++ 0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
++ 0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
++ 0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
++ 0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
++ 0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
++ 0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
++ 0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
++ 0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
++ 0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
++ 0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
++ 0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
++ 0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
++ 0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
++ 0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
++ 0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
++ 0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
++ 0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
++ 0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
++ 0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
++ 0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
++ 0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
++ 0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
++ 0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
++ 0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
++ 0x8def022dUL
++ },
++ {
++ 0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
++ 0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
++ 0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
++ 0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
++ 0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
++ 0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
++ 0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
++ 0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
++ 0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
++ 0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
++ 0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
++ 0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
++ 0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
++ 0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
++ 0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
++ 0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
++ 0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
++ 0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
++ 0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
++ 0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
++ 0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
++ 0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
++ 0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
++ 0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
++ 0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
++ 0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
++ 0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
++ 0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
++ 0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
++ 0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
++ 0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
++ 0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
++ 0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
++ 0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
++ 0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
++ 0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
++ 0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
++ 0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
++ 0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
++ 0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
++ 0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
++ 0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
++ 0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
++ 0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
++ 0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
++ 0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
++ 0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
++ 0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
++ 0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
++ 0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
++ 0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
++ 0x72fd2493UL
++ },
++ {
++ 0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
++ 0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
++ 0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
++ 0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
++ 0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
++ 0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
++ 0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
++ 0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
++ 0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
++ 0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
++ 0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
++ 0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
++ 0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
++ 0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
++ 0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
++ 0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
++ 0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
++ 0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
++ 0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
++ 0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
++ 0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
++ 0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
++ 0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
++ 0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
++ 0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
++ 0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
++ 0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
++ 0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
++ 0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
++ 0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
++ 0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
++ 0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
++ 0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
++ 0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
++ 0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
++ 0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
++ 0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
++ 0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
++ 0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
++ 0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
++ 0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
++ 0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
++ 0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
++ 0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
++ 0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
++ 0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
++ 0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
++ 0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
++ 0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
++ 0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
++ 0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
++ 0xed3498beUL
++ },
++ {
++ 0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
++ 0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
++ 0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
++ 0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
++ 0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
++ 0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
++ 0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
++ 0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
++ 0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
++ 0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
++ 0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
++ 0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
++ 0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
++ 0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
++ 0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
++ 0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
++ 0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
++ 0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
++ 0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
++ 0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
++ 0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
++ 0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
++ 0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
++ 0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
++ 0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
++ 0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
++ 0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
++ 0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
++ 0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
++ 0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
++ 0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
++ 0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
++ 0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
++ 0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
++ 0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
++ 0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
++ 0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
++ 0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
++ 0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
++ 0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
++ 0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
++ 0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
++ 0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
++ 0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
++ 0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
++ 0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
++ 0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
++ 0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
++ 0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
++ 0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
++ 0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
++ 0xf10605deUL
++#endif
++ }
++};
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
+@@ -1,6 +1,6 @@
+ /*
+- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+- * Copyright 2012, 2013 SAP AG. All rights reserved.
++ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 2018 SAP SE. 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
+@@ -30,11 +30,35 @@
+ // definition. See stubRoutines.hpp for a description on how to
+ // extend it.
+
+-static bool returns_to_call_stub(address return_pc) { return return_pc == _call_stub_return_address; }
++static bool returns_to_call_stub(address return_pc) { return return_pc == _call_stub_return_address; }
+
+ enum platform_dependent_constants {
+ code_size1 = 20000, // simply increase if too small (assembler will crash if too small)
+ code_size2 = 20000 // simply increase if too small (assembler will crash if too small)
+ };
+
++// CRC32 Intrinsics.
++#define CRC32_COLUMN_SIZE 256
++#define CRC32_BYFOUR
++#ifdef CRC32_BYFOUR
++ #define CRC32_TABLES 8
++#else
++ #define CRC32_TABLES 1
++#endif
++
++class ppc64 {
++ friend class StubGenerator;
++
++ private:
++
++ // CRC32 Intrinsics.
++ static juint _crc_table[CRC32_TABLES][CRC32_COLUMN_SIZE];
++
++ public:
++
++ // CRC32 Intrinsics.
++ static void generate_load_crc_table_addr(MacroAssembler* masm, Register table);
++
++};
++
+ #endif // CPU_PPC_VM_STUBROUTINES_PPC_64_HPP
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp
+@@ -57,7 +57,7 @@
+ #define BLOCK_COMMENT(str) __ block_comment(str)
+ #endif
+
+-#define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
++#define BIND(label) __ bind(label); BLOCK_COMMENT(#label ":")
+
+ //-----------------------------------------------------------------------------
+
+@@ -783,7 +783,7 @@
+ }
+ generate_counter_incr(&invocation_counter_overflow, NULL, NULL);
+
+- __ BIND(continue_after_compile);
++ BIND(continue_after_compile);
+ // Reset the _do_not_unlock_if_synchronized flag.
+ if (synchronized) {
+ __ li(R0, 0);
+@@ -843,7 +843,7 @@
+ __ ld(signature_handler_fd, method_(signature_handler));
+ __ twi_0(signature_handler_fd); // Order wrt. load of klass mirror and entry point (isync is below).
+
+- __ BIND(call_signature_handler);
++ BIND(call_signature_handler);
+
+ // Before we call the signature handler we push a new frame to
+ // protect the interpreter frame volatile registers when we return
+@@ -913,7 +913,7 @@
+ __ std(R0/*mirror*/, _ijava_state_neg(oop_tmp), R11_scratch1);
+ // R4_ARG2 = &state->_oop_temp;
+ __ addi(R4_ARG2, R11_scratch1, _ijava_state_neg(oop_tmp));
+- __ BIND(method_is_not_static);
++ BIND(method_is_not_static);
+ }
+
+ // At this point, arguments have been copied off the stack into
+@@ -1126,14 +1126,14 @@
+ // interpreter will do the correct thing. If it isn't interpreted
+ // (call stub/compiled code) we will change our return and continue.
+
+- __ BIND(exception_return_sync_check);
++ BIND(exception_return_sync_check);
+
+ if (synchronized) {
+ // Don't check for exceptions since we're still in the i2n frame. Do that
+ // manually afterwards.
+ unlock_method(false);
+ }
+- __ BIND(exception_return_sync_check_already_unlocked);
++ BIND(exception_return_sync_check_already_unlocked);
+
+ const Register return_pc = R31;
+
+@@ -1327,6 +1327,12 @@
+ case Interpreter::java_lang_math_exp : entry_point = ((InterpreterGenerator*) this)->generate_math_entry(kind); break;
+ case Interpreter::java_lang_ref_reference_get
+ : entry_point = ((InterpreterGenerator*)this)->generate_Reference_get_entry(); break;
++ case Interpreter::java_util_zip_CRC32_update
++ : entry_point = ((InterpreterGenerator*)this)->generate_CRC32_update_entry(); break;
++ case Interpreter::java_util_zip_CRC32_updateBytes
++ : // fall thru
++ case Interpreter::java_util_zip_CRC32_updateByteBuffer
++ : entry_point = ((InterpreterGenerator*)this)->generate_CRC32_updateBytes_entry(kind); break;
+ default : ShouldNotReachHere(); break;
+ }
+
+@@ -1337,6 +1343,179 @@
+ return ((InterpreterGenerator*) this)->generate_normal_entry(synchronized);
+ }
+
++// CRC32 Intrinsics.
++//
++// Contract on scratch and work registers.
++// =======================================
++//
++// On ppc, the register set {R2..R12} is available in the interpreter as scratch/work registers.
++// You should, however, keep in mind that {R3_ARG1..R10_ARG8} is the C-ABI argument register set.
++// You can't rely on these registers across calls.
++//
++// The generators for CRC32_update and for CRC32_updateBytes use the
++// scratch/work register set internally, passing the work registers
++// as arguments to the MacroAssembler emitters as required.
++//
++// R3_ARG1..R6_ARG4 are preset to hold the incoming java arguments.
++// Their contents is not constant but may change according to the requirements
++// of the emitted code.
++//
++// All other registers from the scratch/work register set are used "internally"
++// and contain garbage (i.e. unpredictable values) once blr() is reached.
++// Basically, only R3_RET contains a defined value which is the function result.
++//
++/**
++ * Method entry for static native methods:
++ * int java.util.zip.CRC32.update(int crc, int b)
++ */
++address InterpreterGenerator::generate_CRC32_update_entry() {
++ address start = __ pc(); // Remember stub start address (is rtn value).
++
++ if (UseCRC32Intrinsics) {
++ Label slow_path;
++
++ // Safepoint check
++ const Register sync_state = R11_scratch1;
++ int sync_state_offs = __ load_const_optimized(sync_state, SafepointSynchronize::address_of_state(), /*temp*/R0, true);
++ __ lwz(sync_state, sync_state_offs, sync_state);
++ __ cmpwi(CCR0, sync_state, SafepointSynchronize::_not_synchronized);
++ __ bne(CCR0, slow_path);
++
++ // We don't generate local frame and don't align stack because
++ // we not even call stub code (we generate the code inline)
++ // and there is no safepoint on this path.
++
++ // Load java parameters.
++ // R15_esp is callers operand stack pointer, i.e. it points to the parameters.
++ const Register argP = R15_esp;
++ const Register crc = R3_ARG1; // crc value
++ const Register data = R4_ARG2; // address of java byte value (kernel_crc32 needs address)
++ const Register dataLen = R5_ARG3; // source data len (1 byte). Not used because calling the single-byte emitter.
++ const Register table = R6_ARG4; // address of crc32 table
++ const Register tmp = dataLen; // Reuse unused len register to show we don't actually need a separate tmp here.
++
++ BLOCK_COMMENT("CRC32_update {");
++
++ // Arguments are reversed on java expression stack
++#ifdef VM_LITTLE_ENDIAN
++ __ addi(data, argP, 0+1*wordSize); // (stack) address of byte value. Emitter expects address, not value.
++ // Being passed as an int, the single byte is at offset +0.
++#else
++ __ addi(data, argP, 3+1*wordSize); // (stack) address of byte value. Emitter expects address, not value.
++ // Being passed from java as an int, the single byte is at offset +3.
++#endif
++ __ lwz(crc, 2*wordSize, argP); // Current crc state, zero extend to 64 bit to have a clean register.
++
++ StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
++ __ kernel_crc32_singleByte(crc, data, dataLen, table, tmp);
++
++ // Restore caller sp for c2i case and return.
++ __ mr(R1_SP, R21_sender_SP); // Cut the stack back to where the caller started.
++ __ blr();
++
++ // Generate a vanilla native entry as the slow path.
++ BLOCK_COMMENT("} CRC32_update");
++ BIND(slow_path);
++ }
++
++ (void) generate_native_entry(false);
++
++ return start;
++}
++
++// CRC32 Intrinsics.
++/**
++ * Method entry for static native methods:
++ * int java.util.zip.CRC32.updateBytes( int crc, byte[] b, int off, int len)
++ * int java.util.zip.CRC32.updateByteBuffer(int crc, long* buf, int off, int len)
++ */
++address InterpreterGenerator::generate_CRC32_updateBytes_entry(AbstractInterpreter::MethodKind kind) {
++ address start = __ pc(); // Remember stub start address (is rtn value).
++
++ if (UseCRC32Intrinsics) {
++ Label slow_path;
++
++ // Safepoint check
++ const Register sync_state = R11_scratch1;
++ int sync_state_offs = __ load_const_optimized(sync_state, SafepointSynchronize::address_of_state(), /*temp*/R0, true);
++ __ lwz(sync_state, sync_state_offs, sync_state);
++ __ cmpwi(CCR0, sync_state, SafepointSynchronize::_not_synchronized);
++ __ bne(CCR0, slow_path);
++
++ // We don't generate local frame and don't align stack because
++ // we not even call stub code (we generate the code inline)
++ // and there is no safepoint on this path.
++
++ // Load parameters.
++ // Z_esp is callers operand stack pointer, i.e. it points to the parameters.
++ const Register argP = R15_esp;
++ const Register crc = R3_ARG1; // crc value
++ const Register data = R4_ARG2; // address of java byte array
++ const Register dataLen = R5_ARG3; // source data len
++ const Register table = R6_ARG4; // address of crc32 table
++
++ const Register t0 = R9; // scratch registers for crc calculation
++ const Register t1 = R10;
++ const Register t2 = R11;
++ const Register t3 = R12;
++
++ const Register tc0 = R2; // registers to hold pre-calculated column addresses
++ const Register tc1 = R7;
++ const Register tc2 = R8;
++ const Register tc3 = table; // table address is reconstructed at the end of kernel_crc32_* emitters
++
++ const Register tmp = t0; // Only used very locally to calculate byte buffer address.
++
++ // Arguments are reversed on java expression stack.
++ // Calculate address of start element.
++ if (kind == Interpreter::java_util_zip_CRC32_updateByteBuffer) { // Used for "updateByteBuffer direct".
++ BLOCK_COMMENT("CRC32_updateByteBuffer {");
++ // crc @ (SP + 5W) (32bit)
++ // buf @ (SP + 3W) (64bit ptr to long array)
++ // off @ (SP + 2W) (32bit)
++ // dataLen @ (SP + 1W) (32bit)
++ // data = buf + off
++ __ ld( data, 3*wordSize, argP); // start of byte buffer
++ __ lwa( tmp, 2*wordSize, argP); // byte buffer offset
++ __ lwa( dataLen, 1*wordSize, argP); // #bytes to process
++ __ lwz( crc, 5*wordSize, argP); // current crc state
++ __ add( data, data, tmp); // Add byte buffer offset.
++ } else { // Used for "updateBytes update".
++ BLOCK_COMMENT("CRC32_updateBytes {");
++ // crc @ (SP + 4W) (32bit)
++ // buf @ (SP + 3W) (64bit ptr to byte array)
++ // off @ (SP + 2W) (32bit)
++ // dataLen @ (SP + 1W) (32bit)
++ // data = buf + off + base_offset
++ __ ld( data, 3*wordSize, argP); // start of byte buffer
++ __ lwa( tmp, 2*wordSize, argP); // byte buffer offset
++ __ lwa( dataLen, 1*wordSize, argP); // #bytes to process
++ __ add( data, data, tmp); // add byte buffer offset
++ __ lwz( crc, 4*wordSize, argP); // current crc state
++ __ addi(data, data, arrayOopDesc::base_offset_in_bytes(T_BYTE));
++ }
++
++ StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
++
++ // Performance measurements show the 1word and 2word variants to be almost equivalent,
++ // with very light advantages for the 1word variant. We chose the 1word variant for
++ // code compactness.
++ __ kernel_crc32_1word(crc, data, dataLen, table, t0, t1, t2, t3, tc0, tc1, tc2, tc3);
++
++ // Restore caller sp for c2i case and return.
++ __ mr(R1_SP, R21_sender_SP); // Cut the stack back to where the caller started.
++ __ blr();
++
++ // Generate a vanilla native entry as the slow path.
++ BLOCK_COMMENT("} CRC32_updateBytes(Buffer)");
++ BIND(slow_path);
++ }
++
++ (void) generate_native_entry(false);
++
++ return start;
++}
++
+ // These should never be compiled since the interpreter will prefer
+ // the compiled version to the intrinsic version.
+ bool AbstractInterpreter::can_be_compiled(methodHandle m) {
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
+@@ -150,10 +150,12 @@
+
+ assert(AllocatePrefetchStyle >= 0, "AllocatePrefetchStyle should be positive");
+
+- if (UseCRC32Intrinsics) {
+- if (!FLAG_IS_DEFAULT(UseCRC32Intrinsics))
+- warning("CRC32 intrinsics are not available on this CPU");
+- FLAG_SET_DEFAULT(UseCRC32Intrinsics, false);
++ // Implementation does not use any of the vector instructions
++ // available with Power8. Their exploitation is still pending.
++ if (!UseCRC32Intrinsics) {
++ if (FLAG_IS_DEFAULT(UseCRC32Intrinsics)) {
++ FLAG_SET_DEFAULT(UseCRC32Intrinsics, true);
++ }
+ }
+
+ // The AES intrinsic stubs require AES instruction support.
+diff --git openjdk.orig/hotspot/src/share/vm/opto/library_call.cpp openjdk/hotspot/src/share/vm/opto/library_call.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/library_call.cpp
++++ openjdk/hotspot/src/share/vm/opto/library_call.cpp
+@@ -6225,10 +6225,16 @@
+ // Call the stub.
+ address stubAddr = StubRoutines::updateBytesCRC32();
+ const char *stubName = "updateBytesCRC32";
+-
+- Node* call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
+- stubAddr, stubName, TypePtr::BOTTOM,
+- crc, src_start, length);
++ Node* call;
++ if (CCallingConventionRequiresIntsAsLongs) {
++ call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
++ stubAddr, stubName, TypePtr::BOTTOM,
++ crc XTOP, src_start, length XTOP);
++ } else {
++ call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
++ stubAddr, stubName, TypePtr::BOTTOM,
++ crc, src_start, length);
++ }
+ Node* result = _gvn.transform(new (C) ProjNode(call, TypeFunc::Parms));
+ set_result(result);
+ return true;
+@@ -6257,10 +6263,16 @@
+ // Call the stub.
+ address stubAddr = StubRoutines::updateBytesCRC32();
+ const char *stubName = "updateBytesCRC32";
+-
+- Node* call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
+- stubAddr, stubName, TypePtr::BOTTOM,
+- crc, src_start, length);
++ Node* call;
++ if (CCallingConventionRequiresIntsAsLongs) {
++ call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
++ stubAddr, stubName, TypePtr::BOTTOM,
++ crc XTOP, src_start, length XTOP);
++ } else {
++ call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
++ stubAddr, stubName, TypePtr::BOTTOM,
++ crc, src_start, length);
++ }
+ Node* result = _gvn.transform(new (C) ProjNode(call, TypeFunc::Parms));
+ set_result(result);
+ return true;
+diff --git openjdk.orig/hotspot/src/share/vm/opto/runtime.cpp openjdk/hotspot/src/share/vm/opto/runtime.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/runtime.cpp
++++ openjdk/hotspot/src/share/vm/opto/runtime.cpp
+@@ -848,13 +848,24 @@
+ */
+ const TypeFunc* OptoRuntime::updateBytesCRC32_Type() {
+ // create input type (domain)
+- int num_args = 3;
++ int num_args = 3;
+ int argcnt = num_args;
++ if (CCallingConventionRequiresIntsAsLongs) {
++ argcnt += 2;
++ }
+ const Type** fields = TypeTuple::fields(argcnt);
+ int argp = TypeFunc::Parms;
+- fields[argp++] = TypeInt::INT; // crc
+- fields[argp++] = TypePtr::NOTNULL; // src
+- fields[argp++] = TypeInt::INT; // len
++ if (CCallingConventionRequiresIntsAsLongs) {
++ fields[argp++] = TypeLong::LONG; // crc
++ fields[argp++] = Type::HALF;
++ fields[argp++] = TypePtr::NOTNULL; // src
++ fields[argp++] = TypeLong::LONG; // len
++ fields[argp++] = Type::HALF;
++ } else {
++ fields[argp++] = TypeInt::INT; // crc
++ fields[argp++] = TypePtr::NOTNULL; // src
++ fields[argp++] = TypeInt::INT; // len
++ }
+ assert(argp == TypeFunc::Parms+argcnt, "correct decoding");
+ const TypeTuple* domain = TypeTuple::make(TypeFunc::Parms+argcnt, fields);
+
diff --git a/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch b/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch
new file mode 100644
index 0000000..f1e3215
--- /dev/null
+++ b/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch
@@ -0,0 +1,55 @@
+# HG changeset patch
+# User coleenp
+# Date 1525713256 -3600
+# Mon May 07 18:14:16 2018 +0100
+# Node ID bcbc64dfb629c5f188bbf59b8f986ad95963ed60
+# Parent 07a1135a327362f157955d470fad5df07cc35164
+8141570, PR3548: Fix Zero interpreter build for --disable-precompiled-headers
+Summary: change to include atomic.inline.hpp and allocation.inline.hpp only in .cpp files and some build fixes from Kim to build on ubuntu without devkits
+Reviewed-by: kbarrett, sgehwolf, erikj
+
+diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
+--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ # Copyright 2007, 2008 Red Hat, Inc.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+@@ -25,8 +25,15 @@
+
+ # Setup common to Zero (non-Shark) and Shark versions of VM
+
+-# override this from the main file because some version of llvm do not like -Wundef
+-WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wunused-function -Wunused-value
++# Some versions of llvm do not like -Wundef
++ifeq ($(USE_CLANG), true)
++ WARNING_FLAGS += -Wno-undef
++endif
++# Suppress some warning flags that are normally turned on for hotspot,
++# because some of the zero code has not been updated accordingly.
++WARNING_FLAGS += -Wno-return-type \
++ -Wno-format-nonliteral -Wno-format-security \
++ -Wno-maybe-uninitialized
+
+ # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+@@ -42,5 +49,3 @@
+ ifeq ($(ARCH_DATA_MODEL), 64)
+ CFLAGS += -D_LP64=1
+ endif
+-
+-OPT_CFLAGS/compactingPermGenGen.o = -O1
+diff --git openjdk.orig/hotspot/src/share/vm/runtime/java.cpp openjdk/hotspot/src/share/vm/runtime/java.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/java.cpp
++++ openjdk/hotspot/src/share/vm/runtime/java.cpp
+@@ -45,6 +45,7 @@
+ #include "runtime/arguments.hpp"
+ #include "runtime/biasedLocking.hpp"
+ #include "runtime/compilationPolicy.hpp"
++#include "runtime/deoptimization.hpp"
+ #include "runtime/fprofiler.hpp"
+ #include "runtime/init.hpp"
+ #include "runtime/interfaceSupport.hpp"
diff --git a/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch b/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
new file mode 100644
index 0000000..b0a88ea
--- /dev/null
+++ b/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
@@ -0,0 +1,146 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1525714161 -3600
+# Mon May 07 18:29:21 2018 +0100
+# Node ID afb31413c73cbc06420fdb447aa90a7a38258904
+# Parent bcbc64dfb629c5f188bbf59b8f986ad95963ed60
+8143245, PR3548: Zero build requires disabled warnings
+Reviewed-by: dholmes, coleenp
+
+diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
+--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ # Copyright 2007, 2008 Red Hat, Inc.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+@@ -29,11 +29,6 @@
+ ifeq ($(USE_CLANG), true)
+ WARNING_FLAGS += -Wno-undef
+ endif
+-# Suppress some warning flags that are normally turned on for hotspot,
+-# because some of the zero code has not been updated accordingly.
+-WARNING_FLAGS += -Wno-return-type \
+- -Wno-format-nonliteral -Wno-format-security \
+- -Wno-maybe-uninitialized
+
+ # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+diff --git openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+--- openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
++++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+@@ -100,7 +100,7 @@
+ case T_DOUBLE:
+ case T_VOID:
+ return result;
+- default : ShouldNotReachHere();
++ default : ShouldNotReachHere(); return NULL_WORD;
+ }
+ }
+
+diff --git openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
+--- openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
++++ openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2007, 2008, 2010 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+@@ -62,7 +62,7 @@
+ }
+
+ void InterpreterRuntime::SignatureHandlerGeneratorBase::push(BasicType type) {
+- ffi_type *ftype;
++ ffi_type *ftype = NULL;
+ switch (type) {
+ case T_VOID:
+ ftype = &ffi_type_void;
+diff --git a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+@@ -1,6 +1,6 @@
+ /*
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+- * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
++ * Copyright 2016 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
+@@ -61,6 +61,7 @@
+
+ frame os::get_sender_for_C_frame(frame* fr) {
+ ShouldNotCallThis();
++ return frame(NULL, NULL); // silence compile warning.
+ }
+
+ frame os::current_frame() {
+@@ -98,16 +99,19 @@
+
+ address os::Linux::ucontext_get_pc(ucontext_t* uc) {
+ ShouldNotCallThis();
++ return NULL; // silence compile warnings
+ }
+
+ ExtendedPC os::fetch_frame_from_context(void* ucVoid,
+ intptr_t** ret_sp,
+ intptr_t** ret_fp) {
+ ShouldNotCallThis();
++ return NULL; // silence compile warnings
+ }
+
+ frame os::fetch_frame_from_context(void* ucVoid) {
+ ShouldNotCallThis();
++ return frame(NULL, NULL); // silence compile warnings
+ }
+
+ extern "C" JNIEXPORT int
+@@ -247,11 +251,16 @@
+ }
+ #endif // !PRODUCT
+
+- const char *fmt = "caught unhandled signal %d";
+ char buf[64];
+
+- sprintf(buf, fmt, sig);
++ sprintf(buf, "caught unhandled signal %d", sig);
++
++// Silence -Wformat-security warning for fatal()
++PRAGMA_DIAG_PUSH
++PRAGMA_FORMAT_NONLITERAL_IGNORED
+ fatal(buf);
++PRAGMA_DIAG_POP
++ return true; // silence compiler warnings
+ }
+
+ void os::Linux::init_thread_fpu_state(void) {
+@@ -260,6 +269,7 @@
+
+ int os::Linux::get_fpu_control_word() {
+ ShouldNotCallThis();
++ return -1; // silence compile warnings
+ }
+
+ void os::Linux::set_fpu_control_word(int fpu) {
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+@@ -110,6 +110,7 @@
+ void* ucontext,
+ bool isInJava) {
+ ShouldNotCallThis();
++ return false; // silence compile warning
+ }
+
+ // These routines are only used on cpu architectures that
diff --git a/jdk8145096-pr3693-undefined_behaviour.patch b/jdk8145096-pr3693-undefined_behaviour.patch
new file mode 100644
index 0000000..51aed3c
--- /dev/null
+++ b/jdk8145096-pr3693-undefined_behaviour.patch
@@ -0,0 +1,280 @@
+# HG changeset patch
+# User aph
+# Date 1549014450 -3600
+# Fri Feb 01 10:47:30 2019 +0100
+# Node ID f43f77de876acfbf29c02803418d4d06d83e7dc3
+# Parent 28f68e5c6fb323c521a489cfc92e8a129379378f
+8145096: Undefined behaviour in HotSpot
+Summary: Fix some integer overflows
+Reviewed-by: jrose, kvn, kbarrett, adinn, iklam
+
+diff --git openjdk.orig/hotspot/src/os/posix/vm/os_posix.cpp openjdk/hotspot/src/os/posix/vm/os_posix.cpp
+--- openjdk.orig/hotspot/src/os/posix/vm/os_posix.cpp
++++ openjdk/hotspot/src/os/posix/vm/os_posix.cpp
+@@ -604,7 +604,11 @@
+ strncpy(buffer, "none", size);
+
+ const struct {
+- int i;
++ // NB: i is an unsigned int here because SA_RESETHAND is on some
++ // systems 0x80000000, which is implicitly unsigned. Assignining
++ // it to an int field would be an overflow in unsigned-to-signed
++ // conversion.
++ unsigned int i;
+ const char* s;
+ } flaginfo [] = {
+ { SA_NOCLDSTOP, "SA_NOCLDSTOP" },
+diff --git openjdk.orig/hotspot/src/share/vm/opto/addnode.cpp openjdk/hotspot/src/share/vm/opto/addnode.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/addnode.cpp
++++ openjdk/hotspot/src/share/vm/opto/addnode.cpp
+@@ -344,8 +344,8 @@
+ const Type *AddINode::add_ring( const Type *t0, const Type *t1 ) const {
+ const TypeInt *r0 = t0->is_int(); // Handy access
+ const TypeInt *r1 = t1->is_int();
+- int lo = r0->_lo + r1->_lo;
+- int hi = r0->_hi + r1->_hi;
++ int lo = java_add(r0->_lo, r1->_lo);
++ int hi = java_add(r0->_hi, r1->_hi);
+ if( !(r0->is_con() && r1->is_con()) ) {
+ // Not both constants, compute approximate result
+ if( (r0->_lo & r1->_lo) < 0 && lo >= 0 ) {
+@@ -462,8 +462,8 @@
+ const Type *AddLNode::add_ring( const Type *t0, const Type *t1 ) const {
+ const TypeLong *r0 = t0->is_long(); // Handy access
+ const TypeLong *r1 = t1->is_long();
+- jlong lo = r0->_lo + r1->_lo;
+- jlong hi = r0->_hi + r1->_hi;
++ jlong lo = java_add(r0->_lo, r1->_lo);
++ jlong hi = java_add(r0->_hi, r1->_hi);
+ if( !(r0->is_con() && r1->is_con()) ) {
+ // Not both constants, compute approximate result
+ if( (r0->_lo & r1->_lo) < 0 && lo >= 0 ) {
+diff --git openjdk.orig/hotspot/src/share/vm/opto/loopTransform.cpp openjdk/hotspot/src/share/vm/opto/loopTransform.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/loopTransform.cpp
++++ openjdk/hotspot/src/share/vm/opto/loopTransform.cpp
+@@ -1310,8 +1310,8 @@
+ limit = new (C) Opaque2Node( C, limit );
+ register_new_node( limit, opaq_ctrl );
+ }
+- if (stride_con > 0 && ((limit_type->_lo - stride_con) < limit_type->_lo) ||
+- stride_con < 0 && ((limit_type->_hi - stride_con) > limit_type->_hi)) {
++ if (stride_con > 0 && (java_subtract(limit_type->_lo, stride_con) < limit_type->_lo) ||
++ stride_con < 0 && (java_subtract(limit_type->_hi, stride_con) > limit_type->_hi)) {
+ // No underflow.
+ new_limit = new (C) SubINode(limit, stride);
+ } else {
+diff --git openjdk.orig/hotspot/src/share/vm/opto/mulnode.cpp openjdk/hotspot/src/share/vm/opto/mulnode.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/mulnode.cpp
++++ openjdk/hotspot/src/share/vm/opto/mulnode.cpp
+@@ -244,13 +244,13 @@
+ double d = (double)hi1;
+
+ // Compute all endpoints & check for overflow
+- int32 A = lo0*lo1;
++ int32 A = java_multiply(lo0, lo1);
+ if( (double)A != a*c ) return TypeInt::INT; // Overflow?
+- int32 B = lo0*hi1;
++ int32 B = java_multiply(lo0, hi1);
+ if( (double)B != a*d ) return TypeInt::INT; // Overflow?
+- int32 C = hi0*lo1;
++ int32 C = java_multiply(hi0, lo1);
+ if( (double)C != b*c ) return TypeInt::INT; // Overflow?
+- int32 D = hi0*hi1;
++ int32 D = java_multiply(hi0, hi1);
+ if( (double)D != b*d ) return TypeInt::INT; // Overflow?
+
+ if( A < B ) { lo0 = A; hi0 = B; } // Sort range endpoints
+@@ -340,13 +340,13 @@
+ double d = (double)hi1;
+
+ // Compute all endpoints & check for overflow
+- jlong A = lo0*lo1;
++ jlong A = java_multiply(lo0, lo1);
+ if( (double)A != a*c ) return TypeLong::LONG; // Overflow?
+- jlong B = lo0*hi1;
++ jlong B = java_multiply(lo0, hi1);
+ if( (double)B != a*d ) return TypeLong::LONG; // Overflow?
+- jlong C = hi0*lo1;
++ jlong C = java_multiply(hi0, lo1);
+ if( (double)C != b*c ) return TypeLong::LONG; // Overflow?
+- jlong D = hi0*hi1;
++ jlong D = java_multiply(hi0, hi1);
+ if( (double)D != b*d ) return TypeLong::LONG; // Overflow?
+
+ if( A < B ) { lo0 = A; hi0 = B; } // Sort range endpoints
+@@ -573,7 +573,8 @@
+ // Masking off high bits which are always zero is useless.
+ const TypeLong* t1 = phase->type( in(1) )->isa_long();
+ if (t1 != NULL && t1->_lo >= 0) {
+- jlong t1_support = ((jlong)1 << (1 + log2_long(t1->_hi))) - 1;
++ int bit_count = log2_long(t1->_hi) + 1;
++ jlong t1_support = jlong(max_julong >> (BitsPerJavaLong - bit_count));
+ if ((t1_support & con) == t1_support)
+ return usr;
+ }
+@@ -801,7 +802,7 @@
+
+ // Check for ((x & ((CONST64(1)<<(64-c0))-1)) << c0) which ANDs off high bits
+ // before shifting them away.
+- const jlong bits_mask = ((jlong)CONST64(1) << (jlong)(BitsPerJavaLong - con)) - CONST64(1);
++ const jlong bits_mask = jlong(max_julong >> con);
+ if( add1_op == Op_AndL &&
+ phase->type(add1->in(2)) == TypeLong::make( bits_mask ) )
+ return new (phase->C) LShiftLNode( add1->in(1), in(2) );
+@@ -1253,7 +1254,7 @@
+ if ( con == 0 ) return NULL; // let Identity() handle a 0 shift count
+ // note: mask computation below does not work for 0 shift count
+ // We'll be wanting the right-shift amount as a mask of that many bits
+- const jlong mask = (((jlong)CONST64(1) << (jlong)(BitsPerJavaLong - con)) -1);
++ const jlong mask = jlong(max_julong >> con);
+
+ // Check for ((x << z) + Y) >>> z. Replace with x + con>>>z
+ // The idiom for rounding to a power of 2 is "(Q+(2^z-1)) >>> z".
+diff --git openjdk.orig/hotspot/src/share/vm/opto/subnode.cpp openjdk/hotspot/src/share/vm/opto/subnode.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/subnode.cpp
++++ openjdk/hotspot/src/share/vm/opto/subnode.cpp
+@@ -252,8 +252,8 @@
+ const Type *SubINode::sub( const Type *t1, const Type *t2 ) const {
+ const TypeInt *r0 = t1->is_int(); // Handy access
+ const TypeInt *r1 = t2->is_int();
+- int32 lo = r0->_lo - r1->_hi;
+- int32 hi = r0->_hi - r1->_lo;
++ int32 lo = java_subtract(r0->_lo, r1->_hi);
++ int32 hi = java_subtract(r0->_hi, r1->_lo);
+
+ // We next check for 32-bit overflow.
+ // If that happens, we just assume all integers are possible.
+@@ -361,8 +361,8 @@
+ const Type *SubLNode::sub( const Type *t1, const Type *t2 ) const {
+ const TypeLong *r0 = t1->is_long(); // Handy access
+ const TypeLong *r1 = t2->is_long();
+- jlong lo = r0->_lo - r1->_hi;
+- jlong hi = r0->_hi - r1->_lo;
++ jlong lo = java_subtract(r0->_lo, r1->_hi);
++ jlong hi = java_subtract(r0->_hi, r1->_lo);
+
+ // We next check for 32-bit overflow.
+ // If that happens, we just assume all integers are possible.
+diff --git openjdk.orig/hotspot/src/share/vm/opto/type.cpp openjdk/hotspot/src/share/vm/opto/type.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/type.cpp
++++ openjdk/hotspot/src/share/vm/opto/type.cpp
+@@ -1329,8 +1329,8 @@
+
+ // The new type narrows the old type, so look for a "death march".
+ // See comments on PhaseTransform::saturate.
+- juint nrange = _hi - _lo;
+- juint orange = ohi - olo;
++ juint nrange = (juint)_hi - _lo;
++ juint orange = (juint)ohi - olo;
+ if (nrange < max_juint - 1 && nrange > (orange >> 1) + (SMALLINT*2)) {
+ // Use the new type only if the range shrinks a lot.
+ // We do not want the optimizer computing 2^31 point by point.
+@@ -1363,7 +1363,7 @@
+ //------------------------------hash-------------------------------------------
+ // Type-specific hashing function.
+ int TypeInt::hash(void) const {
+- return _lo+_hi+_widen+(int)Type::Int;
++ return java_add(java_add(_lo, _hi), java_add(_widen, (int)Type::Int));
+ }
+
+ //------------------------------is_finite--------------------------------------
+@@ -1544,7 +1544,7 @@
+ // If neither endpoint is extremal yet, push out the endpoint
+ // which is closer to its respective limit.
+ if (_lo >= 0 || // easy common case
+- (julong)(_lo - min) >= (julong)(max - _hi)) {
++ ((julong)_lo - min) >= ((julong)max - _hi)) {
+ // Try to widen to an unsigned range type of 32/63 bits:
+ if (max >= max_juint && _hi < max_juint)
+ return make(_lo, max_juint, WidenMax);
+@@ -2314,7 +2314,7 @@
+ //------------------------------hash-------------------------------------------
+ // Type-specific hashing function.
+ int TypePtr::hash(void) const {
+- return _ptr + _offset;
++ return java_add(_ptr, _offset);
+ }
+
+ //------------------------------dump2------------------------------------------
+@@ -2904,12 +2904,8 @@
+ // Type-specific hashing function.
+ int TypeOopPtr::hash(void) const {
+ return
+- (const_oop() ? const_oop()->hash() : 0) +
+- _klass_is_exact +
+- _instance_id +
+- hash_speculative() +
+- _inline_depth +
+- TypePtr::hash();
++ java_add(java_add(java_add(const_oop() ? const_oop()->hash() : 0, _klass_is_exact),
++ java_add(_instance_id , hash_speculative())), java_add(_inline_depth , TypePtr::hash()));
+ }
+
+ //------------------------------dump2------------------------------------------
+@@ -3635,7 +3631,7 @@
+ //------------------------------hash-------------------------------------------
+ // Type-specific hashing function.
+ int TypeInstPtr::hash(void) const {
+- int hash = klass()->hash() + TypeOopPtr::hash();
++ int hash = java_add(klass()->hash(), TypeOopPtr::hash());
+ return hash;
+ }
+
+@@ -4530,7 +4526,7 @@
+ //------------------------------hash-------------------------------------------
+ // Type-specific hashing function.
+ int TypeKlassPtr::hash(void) const {
+- return klass()->hash() + TypePtr::hash();
++ return java_add(klass()->hash(), TypePtr::hash());
+ }
+
+ //------------------------------singleton--------------------------------------
+diff --git openjdk.orig/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp openjdk/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
++++ openjdk/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
+@@ -131,7 +131,8 @@
+ }
+
+ double AdvancedThresholdPolicy::weight(Method* method) {
+- return (method->rate() + 1) * ((method->invocation_count() + 1) * (method->backedge_count() + 1));
++ return (double)(method->rate() + 1) *
++ (method->invocation_count() + 1) * (method->backedge_count() + 1);
+ }
+
+ // Apply heuristics and return true if x should be compiled before y
+diff --git openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp
++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+@@ -1403,6 +1403,32 @@
+
+ #define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0]))
+
++//----------------------------------------------------------------------------------------------------
++// Sum and product which can never overflow: they wrap, just like the
++// Java operations. Note that we don't intend these to be used for
++// general-purpose arithmetic: their purpose is to emulate Java
++// operations.
++
++// The goal of this code to avoid undefined or implementation-defined
++// behaviour. The use of an lvalue to reference cast is explicitly
++// permitted by Lvalues and rvalues [basic.lval]. [Section 3.10 Para
++// 15 in C++03]
++#define JAVA_INTEGER_OP(OP, NAME, TYPE, UNSIGNED_TYPE) \
++inline TYPE NAME (TYPE in1, TYPE in2) { \
++ UNSIGNED_TYPE ures = static_cast<UNSIGNED_TYPE>(in1); \
++ ures OP ## = static_cast<UNSIGNED_TYPE>(in2); \
++ return reinterpret_cast<TYPE&>(ures); \
++}
++
++JAVA_INTEGER_OP(+, java_add, jint, juint)
++JAVA_INTEGER_OP(-, java_subtract, jint, juint)
++JAVA_INTEGER_OP(*, java_multiply, jint, juint)
++JAVA_INTEGER_OP(+, java_add, jlong, julong)
++JAVA_INTEGER_OP(-, java_subtract, jlong, julong)
++JAVA_INTEGER_OP(*, java_multiply, jlong, julong)
++
++#undef JAVA_INTEGER_OP
++
+ // Dereference vptr
+ // All C++ compilers that we know of have the vtbl pointer in the first
+ // word. If there are exceptions, this function needs to be made compiler
diff --git a/jdk8154313-generated_javadoc_scattered_all_over_the_place.patch b/jdk8154313-generated_javadoc_scattered_all_over_the_place.patch
new file mode 100644
index 0000000..3a43c5f
--- /dev/null
+++ b/jdk8154313-generated_javadoc_scattered_all_over_the_place.patch
@@ -0,0 +1,68 @@
+--- jdk8/make/Javadoc.gmk 2016-04-01 16:53:41.069477682 +0200
++++ jdk8/make/Javadoc.gmk 2016-04-01 16:53:41.014477059 +0200
+@@ -220,6 +220,12 @@
+ JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
+ PLATFORM_DOCSDIR = $(DOCSDIR)/platform
+
++
++JAVADOC_ARCHIVE_NAME := jdk-$(FULL_VERSION)-docs.zip
++JAVADOC_ARCHIVE_ASSEMBLY_DIR := $(DOCSTMPDIR)/zip-docs
++JAVADOC_ARCHIVE_DIR := $(OUTPUT_ROOT)/bundles
++JAVADOC_ARCHIVE := $(JAVADOC_ARCHIVE_DIR)/$(JAVADOC_ARCHIVE_NAME)
++
+ # The non-core api javadocs need to be able to access the root of the core
+ # api directory, so for jdk/api or jre/api to get to the core api/
+ # directory we would use this:
+@@ -319,6 +325,37 @@
+ all: docs
+ docs: coredocs otherdocs
+
++#
++# Optional target which bundles all generated javadocs into a zip
++# archive. The dependency on docs is handled in Main.gmk. Incremental
++# building of docs is currently broken so if you invoke zip-docs after
++# docs, the docs are always rebuilt.
++#
++
++zip-docs: $(JAVADOC_ARCHIVE)
++
++#
++# Add the core docs as prerequisite to the archive to trigger a rebuild
++# if the core docs were rebuilt. Ideally any doc rebuild should trigger
++# this, but the way prerequisites are currently setup in this file, that
++# is hard to achieve.
++#
++
++$(JAVADOC_ARCHIVE): $(COREAPI_INDEX_FILE)
++ @$(ECHO) "Compressing javadoc to single $(JAVADOC_ARCHIVE_NAME)" ;
++ $(MKDIR) -p $(JAVADOC_ARCHIVE_DIR) ;
++ $(RM) -r $(JAVADOC_ARCHIVE_ASSEMBLY_DIR) ;
++ $(MKDIR) -p $(JAVADOC_ARCHIVE_ASSEMBLY_DIR);
++ all_roots=`$(FIND) $(DOCSDIR) | $(GREP) index.html `; \
++ pushd $(JAVADOC_ARCHIVE_ASSEMBLY_DIR); \
++ for index_file in $${all_roots} ; do \
++ target_dir=`dirname $${index_file}`; \
++ name=`$(ECHO) $${target_dir} | $(SED) "s;/spec;;" | $(SED) "s;.*/;;"`; \
++ $(LN) -s $${target_dir} $${name}; \
++ done; \
++ $(ZIP) -q -r $(JAVADOC_ARCHIVE) * ; \
++ popd ;
++
+ #################################################################
+ # Production Targets -- USE THESE TARGETS WHEN:
+ # a) You're generating docs outside of release engineering's
+--- jdk8/make/Main.gmk 2016-04-01 16:53:41.311480424 +0200
++++ jdk8/make/Main.gmk 2016-04-01 16:53:41.266479914 +0200
+@@ -165,6 +165,12 @@
+ @($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
+ @$(call TargetExit)
+
++zip-docs: docs zip-docs-only
++zip-docs-only: start-make
++ @$(call TargetEnter)
++ @($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk zip-docs)
++ @$(call TargetExit)
++
+ sign-jars: jdk sign-jars-only
+ sign-jars-only: start-make
+ @$(call TargetEnter)
diff --git a/jdk8160748-aarch64_ideal_reg.patch b/jdk8160748-aarch64_ideal_reg.patch
new file mode 100644
index 0000000..b3e6ea6
--- /dev/null
+++ b/jdk8160748-aarch64_ideal_reg.patch
@@ -0,0 +1,39 @@
+# HG changeset patch
+# User kbarrett
+# Date 1547614745 0
+# Wed Jan 16 04:59:05 2019 +0000
+# Node ID bca8195a3bc70df281a73d9a40032c673971676c
+# Parent 09abae195e9a7e134a1cfd9b375a6f4d95091de7
+8160748: [AArch64] Inconsistent types for ideal_reg
+Summary: Made ideal_reg consistently uint.
+Reviewed-by: kvn, iveresov
+
+diff --git openjdk.orig/hotspot/src/cpu/aarch64/vm/aarch64.ad openjdk/hotspot/src/cpu/aarch64/vm/aarch64.ad
+--- openjdk.orig/hotspot/src/cpu/aarch64/vm/aarch64.ad
++++ openjdk/hotspot/src/cpu/aarch64/vm/aarch64.ad
+@@ -1,6 +1,6 @@
+ //
++// Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ // Copyright (c) 2013, Red Hat Inc.
+-// Copyright (c) 2003, 2012, Oracle and/or its affiliates.
+ // All rights reserved.
+ // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ //
+@@ -3449,7 +3449,7 @@
+ }
+
+ // Vector ideal reg.
+-const int Matcher::vector_ideal_reg(int len) {
++const uint Matcher::vector_ideal_reg(int len) {
+ switch(len) {
+ case 8: return Op_VecD;
+ case 16: return Op_VecX;
+@@ -3458,7 +3458,7 @@
+ return 0;
+ }
+
+-const int Matcher::vector_shift_count_ideal_reg(int size) {
++const uint Matcher::vector_shift_count_ideal_reg(int size) {
+ return Op_VecX;
+ }
+
diff --git a/jdk8164920-pr3574-rh1498936-ppc_crc32_enhancement.patch b/jdk8164920-pr3574-rh1498936-ppc_crc32_enhancement.patch
new file mode 100644
index 0000000..27a2ed4
--- /dev/null
+++ b/jdk8164920-pr3574-rh1498936-ppc_crc32_enhancement.patch
@@ -0,0 +1,1152 @@
+# HG changeset patch
+# User mdoerr
+# Date 1474539444 -7200
+# Thu Sep 22 12:17:24 2016 +0200
+# Node ID de4f1f9fbcc5b7b30e1a796b7cf88a16943e785f
+# Parent 567e95df42f866b890dc3f0670e086d266915112
+8164920, PR3574, RH1498936: ppc: enhancement of CRC32 intrinsic
+Reviewed-by: goetz, mdoerr
+Contributed-by: Hiroshi H Horii <horii(a)jp.ibm.com>
+
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp openjdk/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
+@@ -468,6 +468,10 @@
+ LVSL_OPCODE = (31u << OPCODE_SHIFT | 6u << 1),
+ LVSR_OPCODE = (31u << OPCODE_SHIFT | 38u << 1),
+
++ // Vector-Scalar (VSX) instruction support.
++ MTVSRD_OPCODE = (31u << OPCODE_SHIFT | 179u << 1),
++ MFVSRD_OPCODE = (31u << OPCODE_SHIFT | 51u << 1),
++
+ // Vector Permute and Formatting
+ VPKPX_OPCODE = (4u << OPCODE_SHIFT | 782u ),
+ VPKSHSS_OPCODE = (4u << OPCODE_SHIFT | 398u ),
+@@ -1938,6 +1942,10 @@
+ inline void mtvscr( VectorRegister b);
+ inline void mfvscr( VectorRegister d);
+
++ // Vector-Scalar (VSX) instructions.
++ inline void mtvrd( VectorRegister d, Register a);
++ inline void mfvrd( Register a, VectorRegister d);
++
+ // AES (introduced with Power 8)
+ inline void vcipher( VectorRegister d, VectorRegister a, VectorRegister b);
+ inline void vcipherlast( VectorRegister d, VectorRegister a, VectorRegister b);
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp openjdk/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp
+@@ -623,6 +623,10 @@
+ inline void Assembler::lvsl( VectorRegister d, Register s1, Register s2) { emit_int32( LVSL_OPCODE | vrt(d) | ra0mem(s1) | rb(s2)); }
+ inline void Assembler::lvsr( VectorRegister d, Register s1, Register s2) { emit_int32( LVSR_OPCODE | vrt(d) | ra0mem(s1) | rb(s2)); }
+
++// Vector-Scalar (VSX) instructions.
++inline void Assembler::mtvrd( VectorRegister d, Register a) { emit_int32( MTVSRD_OPCODE | vrt(d) | ra(a) | 1u); } // 1u: d is treated as Vector (VMX/Altivec).
++inline void Assembler::mfvrd( Register a, VectorRegister d) { emit_int32( MFVSRD_OPCODE | vrt(d) | ra(a) | 1u); } // 1u: d is treated as Vector (VMX/Altivec).
++
+ inline void Assembler::vpkpx( VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VPKPX_OPCODE | vrt(d) | vra(a) | vrb(b)); }
+ inline void Assembler::vpkshss( VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VPKSHSS_OPCODE | vrt(d) | vra(a) | vrb(b)); }
+ inline void Assembler::vpkswss( VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VPKSWSS_OPCODE | vrt(d) | vra(a) | vrb(b)); }
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
+@@ -3423,6 +3423,565 @@
+ BLOCK_COMMENT("} kernel_crc32_1byte");
+ }
+
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param table register pointing to CRC table
++ * @param constants register pointing to CRC table for 128-bit aligned memory
++ * @param barretConstants register pointing to table for barrett reduction
++ * @param t0 volatile register
++ * @param t1 volatile register
++ * @param t2 volatile register
++ * @param t3 volatile register
++ */
++void MacroAssembler::kernel_crc32_1word_vpmsumd(Register crc, Register buf, Register len, Register table,
++ Register constants, Register barretConstants,
++ Register t0, Register t1, Register t2, Register t3, Register t4) {
++ assert_different_registers(crc, buf, len, table);
++
++ Label L_alignedHead, L_tail, L_alignTail, L_start, L_end;
++
++ Register prealign = t0;
++ Register postalign = t0;
++
++ BLOCK_COMMENT("kernel_crc32_1word_vpmsumb {");
++
++ // 1. use kernel_crc32_1word for shorter than 384bit
++ clrldi(len, len, 32);
++ cmpdi(CCR0, len, 384);
++ bge(CCR0, L_start);
++
++ Register tc0 = t4;
++ Register tc1 = constants;
++ Register tc2 = barretConstants;
++ kernel_crc32_1word(crc, buf, len, table,t0, t1, t2, t3, tc0, tc1, tc2, table);
++ b(L_end);
++
++ BIND(L_start);
++
++ // 2. ~c
++ nand(crc, crc, crc);
++
++ // 3. calculate from 0 to first 128bit-aligned address
++ clrldi_(prealign, buf, 57);
++ beq(CCR0, L_alignedHead);
++
++ subfic(prealign, prealign, 128);
++
++ subf(len, prealign, len);
++ update_byteLoop_crc32(crc, buf, prealign, table, t2, false, false);
++
++ // 4. calculate from first 128bit-aligned address to last 128bit-aligned address
++ BIND(L_alignedHead);
++
++ clrldi(postalign, len, 57);
++ subf(len, postalign, len);
++
++ // len must be more than 256bit
++ kernel_crc32_1word_aligned(crc, buf, len, constants, barretConstants, t1, t2, t3);
++
++ // 5. calculate remaining
++ cmpdi(CCR0, postalign, 0);
++ beq(CCR0, L_tail);
++
++ update_byteLoop_crc32(crc, buf, postalign, table, t2, false, false);
++
++ BIND(L_tail);
++
++ // 6. ~c
++ nand(crc, crc, crc);
++
++ BIND(L_end);
++
++ BLOCK_COMMENT("} kernel_crc32_1word_vpmsumb");
++}
++
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param constants register pointing to CRC table for 128-bit aligned memory
++ * @param barretConstants register pointing to table for barrett reduction
++ * @param t0 volatile register
++ * @param t1 volatile register
++ * @param t2 volatile register
++ */
++void MacroAssembler::kernel_crc32_1word_aligned(Register crc, Register buf, Register len,
++ Register constants, Register barretConstants, Register t0, Register t1, Register t2) {
++ Label L_mainLoop, L_tail, L_alignTail, L_barrett_reduction, L_end, L_first_warm_up_done, L_first_cool_down, L_second_cool_down, L_XOR, L_test;
++ Label L_lv0, L_lv1, L_lv2, L_lv3, L_lv4, L_lv5, L_lv6, L_lv7, L_lv8, L_lv9, L_lv10, L_lv11, L_lv12, L_lv13, L_lv14, L_lv15;
++ Label L_1, L_2, L_3, L_4;
++
++ Register rLoaded = t0;
++ Register rTmp1 = t1;
++ Register rTmp2 = t2;
++ Register off16 = R22;
++ Register off32 = R23;
++ Register off48 = R24;
++ Register off64 = R25;
++ Register off80 = R26;
++ Register off96 = R27;
++ Register off112 = R28;
++ Register rIdx = R29;
++ Register rMax = R30;
++ Register constantsPos = R31;
++
++ VectorRegister mask_32bit = VR24;
++ VectorRegister mask_64bit = VR25;
++ VectorRegister zeroes = VR26;
++ VectorRegister const1 = VR27;
++ VectorRegister const2 = VR28;
++
++ // Save non-volatile vector registers (frameless).
++ Register offset = t1; int offsetInt = 0;
++ offsetInt -= 16; li(offset, -16); stvx(VR20, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR21, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR22, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR23, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR24, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR25, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR26, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR27, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR28, offset, R1_SP);
++ offsetInt -= 8; std(R22, offsetInt, R1_SP);
++ offsetInt -= 8; std(R23, offsetInt, R1_SP);
++ offsetInt -= 8; std(R24, offsetInt, R1_SP);
++ offsetInt -= 8; std(R25, offsetInt, R1_SP);
++ offsetInt -= 8; std(R26, offsetInt, R1_SP);
++ offsetInt -= 8; std(R27, offsetInt, R1_SP);
++ offsetInt -= 8; std(R28, offsetInt, R1_SP);
++ offsetInt -= 8; std(R29, offsetInt, R1_SP);
++ offsetInt -= 8; std(R30, offsetInt, R1_SP);
++ offsetInt -= 8; std(R31, offsetInt, R1_SP);
++
++ // Set constants
++ li(off16, 16);
++ li(off32, 32);
++ li(off48, 48);
++ li(off64, 64);
++ li(off80, 80);
++ li(off96, 96);
++ li(off112, 112);
++
++ clrldi(crc, crc, 32);
++
++ vxor(zeroes, zeroes, zeroes);
++ vspltisw(VR0, -1);
++
++ vsldoi(mask_32bit, zeroes, VR0, 4);
++ vsldoi(mask_64bit, zeroes, VR0, -8);
++
++ // Get the initial value into v8
++ vxor(VR8, VR8, VR8);
++ mtvrd(VR8, crc);
++ vsldoi(VR8, zeroes, VR8, -8); // shift into bottom 32 bits
++
++ li (rLoaded, 0);
++
++ rldicr(rIdx, len, 0, 56);
++
++ {
++ BIND(L_1);
++ // Checksum in blocks of MAX_SIZE (32768)
++ lis(rMax, 0);
++ ori(rMax, rMax, 32768);
++ mr(rTmp2, rMax);
++ cmpd(CCR0, rIdx, rMax);
++ bgt(CCR0, L_2);
++ mr(rMax, rIdx);
++
++ BIND(L_2);
++ subf(rIdx, rMax, rIdx);
++
++ // our main loop does 128 bytes at a time
++ srdi(rMax, rMax, 7);
++
++ /*
++ * Work out the offset into the constants table to start at. Each
++ * constant is 16 bytes, and it is used against 128 bytes of input
++ * data - 128 / 16 = 8
++ */
++ sldi(rTmp1, rMax, 4);
++ srdi(rTmp2, rTmp2, 3);
++ subf(rTmp1, rTmp1, rTmp2);
++
++ // We reduce our final 128 bytes in a separate step
++ addi(rMax, rMax, -1);
++ mtctr(rMax);
++
++ // Find the start of our constants
++ add(constantsPos, constants, rTmp1);
++
++ // zero VR0-v7 which will contain our checksums
++ vxor(VR0, VR0, VR0);
++ vxor(VR1, VR1, VR1);
++ vxor(VR2, VR2, VR2);
++ vxor(VR3, VR3, VR3);
++ vxor(VR4, VR4, VR4);
++ vxor(VR5, VR5, VR5);
++ vxor(VR6, VR6, VR6);
++ vxor(VR7, VR7, VR7);
++
++ lvx(const1, constantsPos);
++
++ /*
++ * If we are looping back to consume more data we use the values
++ * already in VR16-v23.
++ */
++ cmpdi(CCR0, rLoaded, 1);
++ beq(CCR0, L_3);
++ {
++
++ // First warm up pass
++ lvx(VR16, buf);
++ lvx(VR17, off16, buf);
++ lvx(VR18, off32, buf);
++ lvx(VR19, off48, buf);
++ lvx(VR20, off64, buf);
++ lvx(VR21, off80, buf);
++ lvx(VR22, off96, buf);
++ lvx(VR23, off112, buf);
++ addi(buf, buf, 8*16);
++
++ // xor in initial value
++ vxor(VR16, VR16, VR8);
++ }
++
++ BIND(L_3);
++ bdz(L_first_warm_up_done);
++
++ addi(constantsPos, constantsPos, 16);
++ lvx(const2, constantsPos);
++
++ // Second warm up pass
++ vpmsumd(VR8, VR16, const1);
++ lvx(VR16, buf);
++
++ vpmsumd(VR9, VR17, const1);
++ lvx(VR17, off16, buf);
++
++ vpmsumd(VR10, VR18, const1);
++ lvx(VR18, off32, buf);
++
++ vpmsumd(VR11, VR19, const1);
++ lvx(VR19, off48, buf);
++
++ vpmsumd(VR12, VR20, const1);
++ lvx(VR20, off64, buf);
++
++ vpmsumd(VR13, VR21, const1);
++ lvx(VR21, off80, buf);
++
++ vpmsumd(VR14, VR22, const1);
++ lvx(VR22, off96, buf);
++
++ vpmsumd(VR15, VR23, const1);
++ lvx(VR23, off112, buf);
++
++ addi(buf, buf, 8 * 16);
++
++ bdz(L_first_cool_down);
++
++ /*
++ * main loop. We modulo schedule it such that it takes three iterations
++ * to complete - first iteration load, second iteration vpmsum, third
++ * iteration xor.
++ */
++ {
++ BIND(L_4);
++ lvx(const1, constantsPos); addi(constantsPos, constantsPos, 16);
++
++ vxor(VR0, VR0, VR8);
++ vpmsumd(VR8, VR16, const2);
++ lvx(VR16, buf);
++
++ vxor(VR1, VR1, VR9);
++ vpmsumd(VR9, VR17, const2);
++ lvx(VR17, off16, buf);
++
++ vxor(VR2, VR2, VR10);
++ vpmsumd(VR10, VR18, const2);
++ lvx(VR18, off32, buf);
++
++ vxor(VR3, VR3, VR11);
++ vpmsumd(VR11, VR19, const2);
++ lvx(VR19, off48, buf);
++ lvx(const2, constantsPos);
++
++ vxor(VR4, VR4, VR12);
++ vpmsumd(VR12, VR20, const1);
++ lvx(VR20, off64, buf);
++
++ vxor(VR5, VR5, VR13);
++ vpmsumd(VR13, VR21, const1);
++ lvx(VR21, off80, buf);
++
++ vxor(VR6, VR6, VR14);
++ vpmsumd(VR14, VR22, const1);
++ lvx(VR22, off96, buf);
++
++ vxor(VR7, VR7, VR15);
++ vpmsumd(VR15, VR23, const1);
++ lvx(VR23, off112, buf);
++
++ addi(buf, buf, 8 * 16);
++
++ bdnz(L_4);
++ }
++
++ BIND(L_first_cool_down);
++
++ // First cool down pass
++ lvx(const1, constantsPos);
++ addi(constantsPos, constantsPos, 16);
++
++ vxor(VR0, VR0, VR8);
++ vpmsumd(VR8, VR16, const1);
++
++ vxor(VR1, VR1, VR9);
++ vpmsumd(VR9, VR17, const1);
++
++ vxor(VR2, VR2, VR10);
++ vpmsumd(VR10, VR18, const1);
++
++ vxor(VR3, VR3, VR11);
++ vpmsumd(VR11, VR19, const1);
++
++ vxor(VR4, VR4, VR12);
++ vpmsumd(VR12, VR20, const1);
++
++ vxor(VR5, VR5, VR13);
++ vpmsumd(VR13, VR21, const1);
++
++ vxor(VR6, VR6, VR14);
++ vpmsumd(VR14, VR22, const1);
++
++ vxor(VR7, VR7, VR15);
++ vpmsumd(VR15, VR23, const1);
++
++ BIND(L_second_cool_down);
++ // Second cool down pass
++ vxor(VR0, VR0, VR8);
++ vxor(VR1, VR1, VR9);
++ vxor(VR2, VR2, VR10);
++ vxor(VR3, VR3, VR11);
++ vxor(VR4, VR4, VR12);
++ vxor(VR5, VR5, VR13);
++ vxor(VR6, VR6, VR14);
++ vxor(VR7, VR7, VR15);
++
++ /*
++ * vpmsumd produces a 96 bit result in the least significant bits
++ * of the register. Since we are bit reflected we have to shift it
++ * left 32 bits so it occupies the least significant bits in the
++ * bit reflected domain.
++ */
++ vsldoi(VR0, VR0, zeroes, 4);
++ vsldoi(VR1, VR1, zeroes, 4);
++ vsldoi(VR2, VR2, zeroes, 4);
++ vsldoi(VR3, VR3, zeroes, 4);
++ vsldoi(VR4, VR4, zeroes, 4);
++ vsldoi(VR5, VR5, zeroes, 4);
++ vsldoi(VR6, VR6, zeroes, 4);
++ vsldoi(VR7, VR7, zeroes, 4);
++
++ // xor with last 1024 bits
++ lvx(VR8, buf);
++ lvx(VR9, off16, buf);
++ lvx(VR10, off32, buf);
++ lvx(VR11, off48, buf);
++ lvx(VR12, off64, buf);
++ lvx(VR13, off80, buf);
++ lvx(VR14, off96, buf);
++ lvx(VR15, off112, buf);
++ addi(buf, buf, 8 * 16);
++
++ vxor(VR16, VR0, VR8);
++ vxor(VR17, VR1, VR9);
++ vxor(VR18, VR2, VR10);
++ vxor(VR19, VR3, VR11);
++ vxor(VR20, VR4, VR12);
++ vxor(VR21, VR5, VR13);
++ vxor(VR22, VR6, VR14);
++ vxor(VR23, VR7, VR15);
++
++ li(rLoaded, 1);
++ cmpdi(CCR0, rIdx, 0);
++ addi(rIdx, rIdx, 128);
++ bne(CCR0, L_1);
++ }
++
++ // Work out how many bytes we have left
++ andi_(len, len, 127);
++
++ // Calculate where in the constant table we need to start
++ subfic(rTmp1, len, 128);
++ add(constantsPos, constantsPos, rTmp1);
++
++ // How many 16 byte chunks are in the tail
++ srdi(rIdx, len, 4);
++ mtctr(rIdx);
++
++ /*
++ * Reduce the previously calculated 1024 bits to 64 bits, shifting
++ * 32 bits to include the trailing 32 bits of zeros
++ */
++ lvx(VR0, constantsPos);
++ lvx(VR1, off16, constantsPos);
++ lvx(VR2, off32, constantsPos);
++ lvx(VR3, off48, constantsPos);
++ lvx(VR4, off64, constantsPos);
++ lvx(VR5, off80, constantsPos);
++ lvx(VR6, off96, constantsPos);
++ lvx(VR7, off112, constantsPos);
++ addi(constantsPos, constantsPos, 8 * 16);
++
++ vpmsumw(VR0, VR16, VR0);
++ vpmsumw(VR1, VR17, VR1);
++ vpmsumw(VR2, VR18, VR2);
++ vpmsumw(VR3, VR19, VR3);
++ vpmsumw(VR4, VR20, VR4);
++ vpmsumw(VR5, VR21, VR5);
++ vpmsumw(VR6, VR22, VR6);
++ vpmsumw(VR7, VR23, VR7);
++
++ // Now reduce the tail (0 - 112 bytes)
++ cmpdi(CCR0, rIdx, 0);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off16, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off32, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off48,constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off64, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off80, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off96, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++
++ // Now xor all the parallel chunks together
++ BIND(L_XOR);
++ vxor(VR0, VR0, VR1);
++ vxor(VR2, VR2, VR3);
++ vxor(VR4, VR4, VR5);
++ vxor(VR6, VR6, VR7);
++
++ vxor(VR0, VR0, VR2);
++ vxor(VR4, VR4, VR6);
++
++ vxor(VR0, VR0, VR4);
++
++ b(L_barrett_reduction);
++
++ BIND(L_first_warm_up_done);
++ lvx(const1, constantsPos);
++ addi(constantsPos, constantsPos, 16);
++ vpmsumd(VR8, VR16, const1);
++ vpmsumd(VR9, VR17, const1);
++ vpmsumd(VR10, VR18, const1);
++ vpmsumd(VR11, VR19, const1);
++ vpmsumd(VR12, VR20, const1);
++ vpmsumd(VR13, VR21, const1);
++ vpmsumd(VR14, VR22, const1);
++ vpmsumd(VR15, VR23, const1);
++ b(L_second_cool_down);
++
++ BIND(L_barrett_reduction);
++
++ lvx(const1, barretConstants);
++ addi(barretConstants, barretConstants, 16);
++ lvx(const2, barretConstants);
++
++ vsldoi(VR1, VR0, VR0, -8);
++ vxor(VR0, VR0, VR1); // xor two 64 bit results together
++
++ // shift left one bit
++ vspltisb(VR1, 1);
++ vsl(VR0, VR0, VR1);
++
++ vand(VR0, VR0, mask_64bit);
++
++ /*
++ * The reflected version of Barrett reduction. Instead of bit
++ * reflecting our data (which is expensive to do), we bit reflect our
++ * constants and our algorithm, which means the intermediate data in
++ * our vector registers goes from 0-63 instead of 63-0. We can reflect
++ * the algorithm because we don't carry in mod 2 arithmetic.
++ */
++ vand(VR1, VR0, mask_32bit); // bottom 32 bits of a
++ vpmsumd(VR1, VR1, const1); // ma
++ vand(VR1, VR1, mask_32bit); // bottom 32bits of ma
++ vpmsumd(VR1, VR1, const2); // qn */
++ vxor(VR0, VR0, VR1); // a - qn, subtraction is xor in GF(2)
++
++ /*
++ * Since we are bit reflected, the result (ie the low 32 bits) is in
++ * the high 32 bits. We just need to shift it left 4 bytes
++ * V0 [ 0 1 X 3 ]
++ * V0 [ 0 X 2 3 ]
++ */
++ vsldoi(VR0, VR0, zeroes, 4); // shift result into top 64 bits of
++
++ // Get it into r3
++ mfvrd(crc, VR0);
++
++ BIND(L_end);
++
++ offsetInt = 0;
++ // Restore non-volatile Vector registers (frameless).
++ offsetInt -= 16; li(offset, -16); lvx(VR20, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR21, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR22, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR23, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR24, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR25, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR26, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR27, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR28, offset, R1_SP);
++ offsetInt -= 8; ld(R22, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R23, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R24, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R25, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R26, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R27, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R28, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R29, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R30, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R31, offsetInt, R1_SP);
++}
++
+ void MacroAssembler::kernel_crc32_singleByte(Register crc, Register buf, Register len, Register table, Register tmp) {
+ assert_different_registers(crc, buf, /* len, not used!! */ table, tmp);
+
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
+@@ -656,6 +656,13 @@
+ Register tc0, Register tc1, Register tc2, Register tc3);
+ void kernel_crc32_1byte(Register crc, Register buf, Register len, Register table,
+ Register t0, Register t1, Register t2, Register t3);
++ void kernel_crc32_1word_vpmsumd(Register crc, Register buf, Register len, Register table,
++ Register constants, Register barretConstants,
++ Register t0, Register t1, Register t2, Register t3, Register t4);
++ void kernel_crc32_1word_aligned(Register crc, Register buf, Register len,
++ Register constants, Register barretConstants,
++ Register t0, Register t1, Register t2);
++
+ void kernel_crc32_singleByte(Register crc, Register buf, Register len, Register table, Register tmp);
+
+ //
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
+@@ -2482,9 +2482,7 @@
+ * R5_ARG3 - int length (of buffer)
+ *
+ * scratch:
+- * R6_ARG4 - crc table address
+- * R7_ARG5 - tmp1
+- * R8_ARG6 - tmp2
++ * R2, R6-R12
+ *
+ * Ouput:
+ * R3_RET - int crc result
+@@ -2496,28 +2494,62 @@
+ address start = __ function_entry(); // Remember stub start address (is rtn value).
+
+ // arguments to kernel_crc32:
+- Register crc = R3_ARG1; // Current checksum, preset by caller or result from previous call.
+- Register data = R4_ARG2; // source byte array
+- Register dataLen = R5_ARG3; // #bytes to process
+- Register table = R6_ARG4; // crc table address
+-
+- Register t0 = R9; // work reg for kernel* emitters
+- Register t1 = R10; // work reg for kernel* emitters
+- Register t2 = R11; // work reg for kernel* emitters
+- Register t3 = R12; // work reg for kernel* emitters
+-
+- BLOCK_COMMENT("Stub body {");
+- assert_different_registers(crc, data, dataLen, table);
+-
+- StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
+-
+- __ kernel_crc32_1byte(crc, data, dataLen, table, t0, t1, t2, t3);
+-
+- BLOCK_COMMENT("return");
+- __ mr_if_needed(R3_RET, crc); // Updated crc is function result. No copying required (R3_ARG1 == R3_RET).
+- __ blr();
+-
+- BLOCK_COMMENT("} Stub body");
++ const Register crc = R3_ARG1; // Current checksum, preset by caller or result from previous call.
++ const Register data = R4_ARG2; // source byte array
++ const Register dataLen = R5_ARG3; // #bytes to process
++
++ const Register table = R6; // crc table address
++
++#ifdef VM_LITTLE_ENDIAN
++ if (VM_Version::has_vpmsumb()) {
++ const Register constants = R2; // constants address
++ const Register bconstants = R8; // barret table address
++
++ const Register t0 = R9;
++ const Register t1 = R10;
++ const Register t2 = R11;
++ const Register t3 = R12;
++ const Register t4 = R7;
++
++ BLOCK_COMMENT("Stub body {");
++ assert_different_registers(crc, data, dataLen, table);
++
++ StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
++ StubRoutines::ppc64::generate_load_crc_constants_addr(_masm, constants);
++ StubRoutines::ppc64::generate_load_crc_barret_constants_addr(_masm, bconstants);
++
++ __ kernel_crc32_1word_vpmsumd(crc, data, dataLen, table, constants, bconstants, t0, t1, t2, t3, t4);
++
++ BLOCK_COMMENT("return");
++ __ mr_if_needed(R3_RET, crc); // Updated crc is function result. No copying required (R3_ARG1 == R3_RET).
++ __ blr();
++
++ BLOCK_COMMENT("} Stub body");
++ } else
++#endif
++ {
++ const Register t0 = R2;
++ const Register t1 = R7;
++ const Register t2 = R8;
++ const Register t3 = R9;
++ const Register tc0 = R10;
++ const Register tc1 = R11;
++ const Register tc2 = R12;
++
++ BLOCK_COMMENT("Stub body {");
++ assert_different_registers(crc, data, dataLen, table);
++
++ StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
++
++ __ kernel_crc32_1word(crc, data, dataLen, table, t0, t1, t2, t3, tc0, tc1, tc2, table);
++
++ BLOCK_COMMENT("return");
++ __ mr_if_needed(R3_RET, crc); // Updated crc is function result. No copying required (R3_ARG1 == R3_RET).
++ __ blr();
++
++ BLOCK_COMMENT("} Stub body");
++ }
++
+ return start;
+ }
+
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
+@@ -37,6 +37,311 @@
+ __ load_const(table, StubRoutines::_crc_table_adr);
+ }
+
++void StubRoutines::ppc64::generate_load_crc_constants_addr(MacroAssembler* masm, Register table) {
++ __ load_const_optimized(table, (address)StubRoutines::ppc64::_constants, R0);
++}
++
++void StubRoutines::ppc64::generate_load_crc_barret_constants_addr(MacroAssembler* masm, Register table) {
++ __ load_const_optimized(table, (address)StubRoutines::ppc64::_barret_constants, R0);
++}
++
++juint* StubRoutines::ppc64::generate_crc_constants() {
++ juint constants[CRC32_CONSTANTS_SIZE] = {
++ // Reduce 262144 kbits to 1024 bits
++ 0x99ea94a8UL, 0x00000000UL, 0x651797d2UL, 0x00000001UL, // x^261120 mod p(x)` << 1, x^261184 mod p(x)` << 1
++ 0x945a8420UL, 0x00000000UL, 0x21e0d56cUL, 0x00000000UL, // x^260096 mod p(x)` << 1, x^260160 mod p(x)` << 1
++ 0x30762706UL, 0x00000000UL, 0x0f95ecaaUL, 0x00000000UL, // x^259072 mod p(x)` << 1, x^259136 mod p(x)` << 1
++ 0xa52fc582UL, 0x00000001UL, 0xebd224acUL, 0x00000001UL, // x^258048 mod p(x)` << 1, x^258112 mod p(x)` << 1
++ 0xa4a7167aUL, 0x00000001UL, 0x0ccb97caUL, 0x00000000UL, // x^257024 mod p(x)` << 1, x^257088 mod p(x)` << 1
++ 0x0c18249aUL, 0x00000000UL, 0x006ec8a8UL, 0x00000001UL, // x^256000 mod p(x)` << 1, x^256064 mod p(x)` << 1
++ 0xa924ae7cUL, 0x00000000UL, 0x4f58f196UL, 0x00000001UL, // x^254976 mod p(x)` << 1, x^255040 mod p(x)` << 1
++ 0xe12ccc12UL, 0x00000001UL, 0xa7192ca6UL, 0x00000001UL, // x^253952 mod p(x)` << 1, x^254016 mod p(x)` << 1
++ 0xa0b9d4acUL, 0x00000000UL, 0x9a64bab2UL, 0x00000001UL, // x^252928 mod p(x)` << 1, x^252992 mod p(x)` << 1
++ 0x95e8ddfeUL, 0x00000000UL, 0x14f4ed2eUL, 0x00000000UL, // x^251904 mod p(x)` << 1, x^251968 mod p(x)` << 1
++ 0x233fddc4UL, 0x00000000UL, 0x1092b6a2UL, 0x00000001UL, // x^250880 mod p(x)` << 1, x^250944 mod p(x)` << 1
++ 0xb4529b62UL, 0x00000001UL, 0xc8a1629cUL, 0x00000000UL, // x^249856 mod p(x)` << 1, x^249920 mod p(x)` << 1
++ 0xa7fa0e64UL, 0x00000001UL, 0x7bf32e8eUL, 0x00000001UL, // x^248832 mod p(x)` << 1, x^248896 mod p(x)` << 1
++ 0xb5334592UL, 0x00000001UL, 0xf8cc6582UL, 0x00000001UL, // x^247808 mod p(x)` << 1, x^247872 mod p(x)` << 1
++ 0x1f8ee1b4UL, 0x00000001UL, 0x8631ddf0UL, 0x00000000UL, // x^246784 mod p(x)` << 1, x^246848 mod p(x)` << 1
++ 0x6252e632UL, 0x00000000UL, 0x7e5a76d0UL, 0x00000000UL, // x^245760 mod p(x)` << 1, x^245824 mod p(x)` << 1
++ 0xab973e84UL, 0x00000000UL, 0x2b09b31cUL, 0x00000000UL, // x^244736 mod p(x)` << 1, x^244800 mod p(x)` << 1
++ 0x7734f5ecUL, 0x00000000UL, 0xb2df1f84UL, 0x00000001UL, // x^243712 mod p(x)` << 1, x^243776 mod p(x)` << 1
++ 0x7c547798UL, 0x00000000UL, 0xd6f56afcUL, 0x00000001UL, // x^242688 mod p(x)` << 1, x^242752 mod p(x)` << 1
++ 0x7ec40210UL, 0x00000000UL, 0xb9b5e70cUL, 0x00000001UL, // x^241664 mod p(x)` << 1, x^241728 mod p(x)` << 1
++ 0xab1695a8UL, 0x00000001UL, 0x34b626d2UL, 0x00000000UL, // x^240640 mod p(x)` << 1, x^240704 mod p(x)` << 1
++ 0x90494bbaUL, 0x00000000UL, 0x4c53479aUL, 0x00000001UL, // x^239616 mod p(x)` << 1, x^239680 mod p(x)` << 1
++ 0x123fb816UL, 0x00000001UL, 0xa6d179a4UL, 0x00000001UL, // x^238592 mod p(x)` << 1, x^238656 mod p(x)` << 1
++ 0xe188c74cUL, 0x00000001UL, 0x5abd16b4UL, 0x00000001UL, // x^237568 mod p(x)` << 1, x^237632 mod p(x)` << 1
++ 0xc2d3451cUL, 0x00000001UL, 0x018f9852UL, 0x00000000UL, // x^236544 mod p(x)` << 1, x^236608 mod p(x)` << 1
++ 0xf55cf1caUL, 0x00000000UL, 0x1fb3084aUL, 0x00000000UL, // x^235520 mod p(x)` << 1, x^235584 mod p(x)` << 1
++ 0xa0531540UL, 0x00000001UL, 0xc53dfb04UL, 0x00000000UL, // x^234496 mod p(x)` << 1, x^234560 mod p(x)` << 1
++ 0x32cd7ebcUL, 0x00000001UL, 0xe10c9ad6UL, 0x00000000UL, // x^233472 mod p(x)` << 1, x^233536 mod p(x)` << 1
++ 0x73ab7f36UL, 0x00000000UL, 0x25aa994aUL, 0x00000000UL, // x^232448 mod p(x)` << 1, x^232512 mod p(x)` << 1
++ 0x41aed1c2UL, 0x00000000UL, 0xfa3a74c4UL, 0x00000000UL, // x^231424 mod p(x)` << 1, x^231488 mod p(x)` << 1
++ 0x36c53800UL, 0x00000001UL, 0x33eb3f40UL, 0x00000000UL, // x^230400 mod p(x)` << 1, x^230464 mod p(x)` << 1
++ 0x26835a30UL, 0x00000001UL, 0x7193f296UL, 0x00000001UL, // x^229376 mod p(x)` << 1, x^229440 mod p(x)` << 1
++ 0x6241b502UL, 0x00000000UL, 0x43f6c86aUL, 0x00000000UL, // x^228352 mod p(x)` << 1, x^228416 mod p(x)` << 1
++ 0xd5196ad4UL, 0x00000000UL, 0x6b513ec6UL, 0x00000001UL, // x^227328 mod p(x)` << 1, x^227392 mod p(x)` << 1
++ 0x9cfa769aUL, 0x00000000UL, 0xc8f25b4eUL, 0x00000000UL, // x^226304 mod p(x)` << 1, x^226368 mod p(x)` << 1
++ 0x920e5df4UL, 0x00000000UL, 0xa45048ecUL, 0x00000001UL, // x^225280 mod p(x)` << 1, x^225344 mod p(x)` << 1
++ 0x69dc310eUL, 0x00000001UL, 0x0c441004UL, 0x00000000UL, // x^224256 mod p(x)` << 1, x^224320 mod p(x)` << 1
++ 0x09fc331cUL, 0x00000000UL, 0x0e17cad6UL, 0x00000000UL, // x^223232 mod p(x)` << 1, x^223296 mod p(x)` << 1
++ 0x0d94a81eUL, 0x00000001UL, 0x253ae964UL, 0x00000001UL, // x^222208 mod p(x)` << 1, x^222272 mod p(x)` << 1
++ 0x27a20ab2UL, 0x00000000UL, 0xd7c88ebcUL, 0x00000001UL, // x^221184 mod p(x)` << 1, x^221248 mod p(x)` << 1
++ 0x14f87504UL, 0x00000001UL, 0xe7ca913aUL, 0x00000001UL, // x^220160 mod p(x)` << 1, x^220224 mod p(x)` << 1
++ 0x4b076d96UL, 0x00000000UL, 0x33ed078aUL, 0x00000000UL, // x^219136 mod p(x)` << 1, x^219200 mod p(x)` << 1
++ 0xda4d1e74UL, 0x00000000UL, 0xe1839c78UL, 0x00000000UL, // x^218112 mod p(x)` << 1, x^218176 mod p(x)` << 1
++ 0x1b81f672UL, 0x00000000UL, 0x322b267eUL, 0x00000001UL, // x^217088 mod p(x)` << 1, x^217152 mod p(x)` << 1
++ 0x9367c988UL, 0x00000000UL, 0x638231b6UL, 0x00000000UL, // x^216064 mod p(x)` << 1, x^216128 mod p(x)` << 1
++ 0x717214caUL, 0x00000001UL, 0xee7f16f4UL, 0x00000001UL, // x^215040 mod p(x)` << 1, x^215104 mod p(x)` << 1
++ 0x9f47d820UL, 0x00000000UL, 0x17d9924aUL, 0x00000001UL, // x^214016 mod p(x)` << 1, x^214080 mod p(x)` << 1
++ 0x0d9a47d2UL, 0x00000001UL, 0xe1a9e0c4UL, 0x00000000UL, // x^212992 mod p(x)` << 1, x^213056 mod p(x)` << 1
++ 0xa696c58cUL, 0x00000000UL, 0x403731dcUL, 0x00000001UL, // x^211968 mod p(x)` << 1, x^212032 mod p(x)` << 1
++ 0x2aa28ec6UL, 0x00000000UL, 0xa5ea9682UL, 0x00000001UL, // x^210944 mod p(x)` << 1, x^211008 mod p(x)` << 1
++ 0xfe18fd9aUL, 0x00000001UL, 0x01c5c578UL, 0x00000001UL, // x^209920 mod p(x)` << 1, x^209984 mod p(x)` << 1
++ 0x9d4fc1aeUL, 0x00000001UL, 0xdddf6494UL, 0x00000000UL, // x^208896 mod p(x)` << 1, x^208960 mod p(x)` << 1
++ 0xba0e3deaUL, 0x00000001UL, 0xf1c3db28UL, 0x00000000UL, // x^207872 mod p(x)` << 1, x^207936 mod p(x)` << 1
++ 0x74b59a5eUL, 0x00000000UL, 0x3112fb9cUL, 0x00000001UL, // x^206848 mod p(x)` << 1, x^206912 mod p(x)` << 1
++ 0xf2b5ea98UL, 0x00000000UL, 0xb680b906UL, 0x00000000UL, // x^205824 mod p(x)` << 1, x^205888 mod p(x)` << 1
++ 0x87132676UL, 0x00000001UL, 0x1a282932UL, 0x00000000UL, // x^204800 mod p(x)` << 1, x^204864 mod p(x)` << 1
++ 0x0a8c6ad4UL, 0x00000001UL, 0x89406e7eUL, 0x00000000UL, // x^203776 mod p(x)` << 1, x^203840 mod p(x)` << 1
++ 0xe21dfe70UL, 0x00000001UL, 0xdef6be8cUL, 0x00000001UL, // x^202752 mod p(x)` << 1, x^202816 mod p(x)` << 1
++ 0xda0050e4UL, 0x00000001UL, 0x75258728UL, 0x00000000UL, // x^201728 mod p(x)` << 1, x^201792 mod p(x)` << 1
++ 0x772172aeUL, 0x00000000UL, 0x9536090aUL, 0x00000001UL, // x^200704 mod p(x)` << 1, x^200768 mod p(x)` << 1
++ 0xe47724aaUL, 0x00000000UL, 0xf2455bfcUL, 0x00000000UL, // x^199680 mod p(x)` << 1, x^199744 mod p(x)` << 1
++ 0x3cd63ac4UL, 0x00000000UL, 0x8c40baf4UL, 0x00000001UL, // x^198656 mod p(x)` << 1, x^198720 mod p(x)` << 1
++ 0xbf47d352UL, 0x00000001UL, 0x4cd390d4UL, 0x00000000UL, // x^197632 mod p(x)` << 1, x^197696 mod p(x)` << 1
++ 0x8dc1d708UL, 0x00000001UL, 0xe4ece95aUL, 0x00000001UL, // x^196608 mod p(x)` << 1, x^196672 mod p(x)` << 1
++ 0x2d4620a4UL, 0x00000000UL, 0x1a3ee918UL, 0x00000000UL, // x^195584 mod p(x)` << 1, x^195648 mod p(x)` << 1
++ 0x58fd1740UL, 0x00000000UL, 0x7c652fb8UL, 0x00000000UL, // x^194560 mod p(x)` << 1, x^194624 mod p(x)` << 1
++ 0xdadd9bfcUL, 0x00000000UL, 0x1c67842cUL, 0x00000001UL, // x^193536 mod p(x)` << 1, x^193600 mod p(x)` << 1
++ 0xea2140beUL, 0x00000001UL, 0x254f759cUL, 0x00000000UL, // x^192512 mod p(x)` << 1, x^192576 mod p(x)` << 1
++ 0x9de128baUL, 0x00000000UL, 0x7ece94caUL, 0x00000000UL, // x^191488 mod p(x)` << 1, x^191552 mod p(x)` << 1
++ 0x3ac3aa8eUL, 0x00000001UL, 0x38f258c2UL, 0x00000000UL, // x^190464 mod p(x)` << 1, x^190528 mod p(x)` << 1
++ 0x99980562UL, 0x00000000UL, 0xcdf17b00UL, 0x00000001UL, // x^189440 mod p(x)` << 1, x^189504 mod p(x)` << 1
++ 0xc1579c86UL, 0x00000001UL, 0x1f882c16UL, 0x00000001UL, // x^188416 mod p(x)` << 1, x^188480 mod p(x)` << 1
++ 0x68dbbf94UL, 0x00000000UL, 0x00093fc8UL, 0x00000001UL, // x^187392 mod p(x)` << 1, x^187456 mod p(x)` << 1
++ 0x4509fb04UL, 0x00000000UL, 0xcd684f16UL, 0x00000001UL, // x^186368 mod p(x)` << 1, x^186432 mod p(x)` << 1
++ 0x202f6398UL, 0x00000001UL, 0x4bc6a70aUL, 0x00000000UL, // x^185344 mod p(x)` << 1, x^185408 mod p(x)` << 1
++ 0x3aea243eUL, 0x00000001UL, 0x4fc7e8e4UL, 0x00000000UL, // x^184320 mod p(x)` << 1, x^184384 mod p(x)` << 1
++ 0xb4052ae6UL, 0x00000001UL, 0x30103f1cUL, 0x00000001UL, // x^183296 mod p(x)` << 1, x^183360 mod p(x)` << 1
++ 0xcd2a0ae8UL, 0x00000001UL, 0x11b0024cUL, 0x00000001UL, // x^182272 mod p(x)` << 1, x^182336 mod p(x)` << 1
++ 0xfe4aa8b4UL, 0x00000001UL, 0x0b3079daUL, 0x00000001UL, // x^181248 mod p(x)` << 1, x^181312 mod p(x)` << 1
++ 0xd1559a42UL, 0x00000001UL, 0x0192bcc2UL, 0x00000001UL, // x^180224 mod p(x)` << 1, x^180288 mod p(x)` << 1
++ 0xf3e05eccUL, 0x00000001UL, 0x74838d50UL, 0x00000000UL, // x^179200 mod p(x)` << 1, x^179264 mod p(x)` << 1
++ 0x04ddd2ccUL, 0x00000001UL, 0x1b20f520UL, 0x00000000UL, // x^178176 mod p(x)` << 1, x^178240 mod p(x)` << 1
++ 0x5393153cUL, 0x00000001UL, 0x50c3590aUL, 0x00000000UL, // x^177152 mod p(x)` << 1, x^177216 mod p(x)` << 1
++ 0x57e942c6UL, 0x00000000UL, 0xb41cac8eUL, 0x00000000UL, // x^176128 mod p(x)` << 1, x^176192 mod p(x)` << 1
++ 0x2c633850UL, 0x00000001UL, 0x0c72cc78UL, 0x00000000UL, // x^175104 mod p(x)` << 1, x^175168 mod p(x)` << 1
++ 0xebcaae4cUL, 0x00000000UL, 0x30cdb032UL, 0x00000000UL, // x^174080 mod p(x)` << 1, x^174144 mod p(x)` << 1
++ 0x3ee532a6UL, 0x00000001UL, 0x3e09fc32UL, 0x00000001UL, // x^173056 mod p(x)` << 1, x^173120 mod p(x)` << 1
++ 0xbf0cbc7eUL, 0x00000001UL, 0x1ed624d2UL, 0x00000000UL, // x^172032 mod p(x)` << 1, x^172096 mod p(x)` << 1
++ 0xd50b7a5aUL, 0x00000000UL, 0x781aee1aUL, 0x00000000UL, // x^171008 mod p(x)` << 1, x^171072 mod p(x)` << 1
++ 0x02fca6e8UL, 0x00000000UL, 0xc4d8348cUL, 0x00000001UL, // x^169984 mod p(x)` << 1, x^170048 mod p(x)` << 1
++ 0x7af40044UL, 0x00000000UL, 0x57a40336UL, 0x00000000UL, // x^168960 mod p(x)` << 1, x^169024 mod p(x)` << 1
++ 0x16178744UL, 0x00000000UL, 0x85544940UL, 0x00000000UL, // x^167936 mod p(x)` << 1, x^168000 mod p(x)` << 1
++ 0x4c177458UL, 0x00000001UL, 0x9cd21e80UL, 0x00000001UL, // x^166912 mod p(x)` << 1, x^166976 mod p(x)` << 1
++ 0x1b6ddf04UL, 0x00000001UL, 0x3eb95bc0UL, 0x00000001UL, // x^165888 mod p(x)` << 1, x^165952 mod p(x)` << 1
++ 0xf3e29cccUL, 0x00000001UL, 0xdfc9fdfcUL, 0x00000001UL, // x^164864 mod p(x)` << 1, x^164928 mod p(x)` << 1
++ 0x35ae7562UL, 0x00000001UL, 0xcd028bc2UL, 0x00000000UL, // x^163840 mod p(x)` << 1, x^163904 mod p(x)` << 1
++ 0x90ef812cUL, 0x00000001UL, 0x90db8c44UL, 0x00000000UL, // x^162816 mod p(x)` << 1, x^162880 mod p(x)` << 1
++ 0x67a2c786UL, 0x00000000UL, 0x0010a4ceUL, 0x00000001UL, // x^161792 mod p(x)` << 1, x^161856 mod p(x)` << 1
++ 0x48b9496cUL, 0x00000000UL, 0xc8f4c72cUL, 0x00000001UL, // x^160768 mod p(x)` << 1, x^160832 mod p(x)` << 1
++ 0x5a422de6UL, 0x00000001UL, 0x1c26170cUL, 0x00000000UL, // x^159744 mod p(x)` << 1, x^159808 mod p(x)` << 1
++ 0xef0e3640UL, 0x00000001UL, 0xe3fccf68UL, 0x00000000UL, // x^158720 mod p(x)` << 1, x^158784 mod p(x)` << 1
++ 0x006d2d26UL, 0x00000001UL, 0xd513ed24UL, 0x00000000UL, // x^157696 mod p(x)` << 1, x^157760 mod p(x)` << 1
++ 0x170d56d6UL, 0x00000001UL, 0x141beadaUL, 0x00000000UL, // x^156672 mod p(x)` << 1, x^156736 mod p(x)` << 1
++ 0xa5fb613cUL, 0x00000000UL, 0x1071aea0UL, 0x00000001UL, // x^155648 mod p(x)` << 1, x^155712 mod p(x)` << 1
++ 0x40bbf7fcUL, 0x00000000UL, 0x2e19080aUL, 0x00000001UL, // x^154624 mod p(x)` << 1, x^154688 mod p(x)` << 1
++ 0x6ac3a5b2UL, 0x00000001UL, 0x00ecf826UL, 0x00000001UL, // x^153600 mod p(x)` << 1, x^153664 mod p(x)` << 1
++ 0xabf16230UL, 0x00000000UL, 0x69b09412UL, 0x00000000UL, // x^152576 mod p(x)` << 1, x^152640 mod p(x)` << 1
++ 0xebe23facUL, 0x00000001UL, 0x22297bacUL, 0x00000001UL, // x^151552 mod p(x)` << 1, x^151616 mod p(x)` << 1
++ 0x8b6a0894UL, 0x00000000UL, 0xe9e4b068UL, 0x00000000UL, // x^150528 mod p(x)` << 1, x^150592 mod p(x)` << 1
++ 0x288ea478UL, 0x00000001UL, 0x4b38651aUL, 0x00000000UL, // x^149504 mod p(x)` << 1, x^149568 mod p(x)` << 1
++ 0x6619c442UL, 0x00000001UL, 0x468360e2UL, 0x00000001UL, // x^148480 mod p(x)` << 1, x^148544 mod p(x)` << 1
++ 0x86230038UL, 0x00000000UL, 0x121c2408UL, 0x00000000UL, // x^147456 mod p(x)` << 1, x^147520 mod p(x)` << 1
++ 0x7746a756UL, 0x00000001UL, 0xda7e7d08UL, 0x00000000UL, // x^146432 mod p(x)` << 1, x^146496 mod p(x)` << 1
++ 0x91b8f8f8UL, 0x00000001UL, 0x058d7652UL, 0x00000001UL, // x^145408 mod p(x)` << 1, x^145472 mod p(x)` << 1
++ 0x8e167708UL, 0x00000000UL, 0x4a098a90UL, 0x00000001UL, // x^144384 mod p(x)` << 1, x^144448 mod p(x)` << 1
++ 0x48b22d54UL, 0x00000001UL, 0x20dbe72eUL, 0x00000000UL, // x^143360 mod p(x)` << 1, x^143424 mod p(x)` << 1
++ 0x44ba2c3cUL, 0x00000000UL, 0x1e7323e8UL, 0x00000001UL, // x^142336 mod p(x)` << 1, x^142400 mod p(x)` << 1
++ 0xb54d2b52UL, 0x00000000UL, 0xd5d4bf94UL, 0x00000000UL, // x^141312 mod p(x)` << 1, x^141376 mod p(x)` << 1
++ 0x05a4fd8aUL, 0x00000000UL, 0x99d8746cUL, 0x00000001UL, // x^140288 mod p(x)` << 1, x^140352 mod p(x)` << 1
++ 0x39f9fc46UL, 0x00000001UL, 0xce9ca8a0UL, 0x00000000UL, // x^139264 mod p(x)` << 1, x^139328 mod p(x)` << 1
++ 0x5a1fa824UL, 0x00000001UL, 0x136edeceUL, 0x00000000UL, // x^138240 mod p(x)` << 1, x^138304 mod p(x)` << 1
++ 0x0a61ae4cUL, 0x00000000UL, 0x9b92a068UL, 0x00000001UL, // x^137216 mod p(x)` << 1, x^137280 mod p(x)` << 1
++ 0x45e9113eUL, 0x00000001UL, 0x71d62206UL, 0x00000000UL, // x^136192 mod p(x)` << 1, x^136256 mod p(x)` << 1
++ 0x6a348448UL, 0x00000000UL, 0xdfc50158UL, 0x00000000UL, // x^135168 mod p(x)` << 1, x^135232 mod p(x)` << 1
++ 0x4d80a08cUL, 0x00000000UL, 0x517626bcUL, 0x00000001UL, // x^134144 mod p(x)` << 1, x^134208 mod p(x)` << 1
++ 0x4b6837a0UL, 0x00000001UL, 0x48d1e4faUL, 0x00000001UL, // x^133120 mod p(x)` << 1, x^133184 mod p(x)` << 1
++ 0x6896a7fcUL, 0x00000001UL, 0x94d8266eUL, 0x00000000UL, // x^132096 mod p(x)` << 1, x^132160 mod p(x)` << 1
++ 0x4f187140UL, 0x00000001UL, 0x606c5e34UL, 0x00000000UL, // x^131072 mod p(x)` << 1, x^131136 mod p(x)` << 1
++ 0x9581b9daUL, 0x00000001UL, 0x9766beaaUL, 0x00000001UL, // x^130048 mod p(x)` << 1, x^130112 mod p(x)` << 1
++ 0x091bc984UL, 0x00000001UL, 0xd80c506cUL, 0x00000001UL, // x^129024 mod p(x)` << 1, x^129088 mod p(x)` << 1
++ 0x1067223cUL, 0x00000000UL, 0x1e73837cUL, 0x00000000UL, // x^128000 mod p(x)` << 1, x^128064 mod p(x)` << 1
++ 0xab16ea02UL, 0x00000001UL, 0x64d587deUL, 0x00000000UL, // x^126976 mod p(x)` << 1, x^127040 mod p(x)` << 1
++ 0x3c4598a8UL, 0x00000001UL, 0xf4a507b0UL, 0x00000000UL, // x^125952 mod p(x)` << 1, x^126016 mod p(x)` << 1
++ 0xb3735430UL, 0x00000000UL, 0x40e342fcUL, 0x00000000UL, // x^124928 mod p(x)` << 1, x^124992 mod p(x)` << 1
++ 0xbb3fc0c0UL, 0x00000001UL, 0xd5ad9c3aUL, 0x00000001UL, // x^123904 mod p(x)` << 1, x^123968 mod p(x)` << 1
++ 0x570ae19cUL, 0x00000001UL, 0x94a691a4UL, 0x00000000UL, // x^122880 mod p(x)` << 1, x^122944 mod p(x)` << 1
++ 0xea910712UL, 0x00000001UL, 0x271ecdfaUL, 0x00000001UL, // x^121856 mod p(x)` << 1, x^121920 mod p(x)` << 1
++ 0x67127128UL, 0x00000001UL, 0x9e54475aUL, 0x00000000UL, // x^120832 mod p(x)` << 1, x^120896 mod p(x)` << 1
++ 0x19e790a2UL, 0x00000000UL, 0xc9c099eeUL, 0x00000000UL, // x^119808 mod p(x)` << 1, x^119872 mod p(x)` << 1
++ 0x3788f710UL, 0x00000000UL, 0x9a2f736cUL, 0x00000000UL, // x^118784 mod p(x)` << 1, x^118848 mod p(x)` << 1
++ 0x682a160eUL, 0x00000001UL, 0xbb9f4996UL, 0x00000000UL, // x^117760 mod p(x)` << 1, x^117824 mod p(x)` << 1
++ 0x7f0ebd2eUL, 0x00000000UL, 0xdb688050UL, 0x00000001UL, // x^116736 mod p(x)` << 1, x^116800 mod p(x)` << 1
++ 0x2b032080UL, 0x00000000UL, 0xe9b10af4UL, 0x00000000UL, // x^115712 mod p(x)` << 1, x^115776 mod p(x)` << 1
++ 0xcfd1664aUL, 0x00000000UL, 0x2d4545e4UL, 0x00000001UL, // x^114688 mod p(x)` << 1, x^114752 mod p(x)` << 1
++ 0xaa1181c2UL, 0x00000000UL, 0x0361139cUL, 0x00000000UL, // x^113664 mod p(x)` << 1, x^113728 mod p(x)` << 1
++ 0xddd08002UL, 0x00000000UL, 0xa5a1a3a8UL, 0x00000001UL, // x^112640 mod p(x)` << 1, x^112704 mod p(x)` << 1
++ 0xe8dd0446UL, 0x00000000UL, 0x6844e0b0UL, 0x00000000UL, // x^111616 mod p(x)` << 1, x^111680 mod p(x)` << 1
++ 0xbbd94a00UL, 0x00000001UL, 0xc3762f28UL, 0x00000000UL, // x^110592 mod p(x)` << 1, x^110656 mod p(x)` << 1
++ 0xab6cd180UL, 0x00000000UL, 0xd26287a2UL, 0x00000001UL, // x^109568 mod p(x)` << 1, x^109632 mod p(x)` << 1
++ 0x31803ce2UL, 0x00000000UL, 0xf6f0bba8UL, 0x00000001UL, // x^108544 mod p(x)` << 1, x^108608 mod p(x)` << 1
++ 0x24f40b0cUL, 0x00000000UL, 0x2ffabd62UL, 0x00000000UL, // x^107520 mod p(x)` << 1, x^107584 mod p(x)` << 1
++ 0xba1d9834UL, 0x00000001UL, 0xfb4516b8UL, 0x00000000UL, // x^106496 mod p(x)` << 1, x^106560 mod p(x)` << 1
++ 0x04de61aaUL, 0x00000001UL, 0x8cfa961cUL, 0x00000001UL, // x^105472 mod p(x)` << 1, x^105536 mod p(x)` << 1
++ 0x13e40d46UL, 0x00000001UL, 0x9e588d52UL, 0x00000001UL, // x^104448 mod p(x)` << 1, x^104512 mod p(x)` << 1
++ 0x415598a0UL, 0x00000001UL, 0x180f0bbcUL, 0x00000001UL, // x^103424 mod p(x)` << 1, x^103488 mod p(x)` << 1
++ 0xbf6c8c90UL, 0x00000000UL, 0xe1d9177aUL, 0x00000000UL, // x^102400 mod p(x)` << 1, x^102464 mod p(x)` << 1
++ 0x788b0504UL, 0x00000001UL, 0x05abc27cUL, 0x00000001UL, // x^101376 mod p(x)` << 1, x^101440 mod p(x)` << 1
++ 0x38385d02UL, 0x00000000UL, 0x972e4a58UL, 0x00000000UL, // x^100352 mod p(x)` << 1, x^100416 mod p(x)` << 1
++ 0xb6c83844UL, 0x00000001UL, 0x83499a5eUL, 0x00000001UL, // x^99328 mod p(x)` << 1, x^99392 mod p(x)` << 1
++ 0x51061a8aUL, 0x00000000UL, 0xc96a8ccaUL, 0x00000001UL, // x^98304 mod p(x)` << 1, x^98368 mod p(x)` << 1
++ 0x7351388aUL, 0x00000001UL, 0xa1a5b60cUL, 0x00000001UL, // x^97280 mod p(x)` << 1, x^97344 mod p(x)` << 1
++ 0x32928f92UL, 0x00000001UL, 0xe4b6ac9cUL, 0x00000000UL, // x^96256 mod p(x)` << 1, x^96320 mod p(x)` << 1
++ 0xe6b4f48aUL, 0x00000000UL, 0x807e7f5aUL, 0x00000001UL, // x^95232 mod p(x)` << 1, x^95296 mod p(x)` << 1
++ 0x39d15e90UL, 0x00000000UL, 0x7a7e3bc8UL, 0x00000001UL, // x^94208 mod p(x)` << 1, x^94272 mod p(x)` << 1
++ 0x312d6074UL, 0x00000000UL, 0xd73975daUL, 0x00000000UL, // x^93184 mod p(x)` << 1, x^93248 mod p(x)` << 1
++ 0x7bbb2cc4UL, 0x00000001UL, 0x7375d038UL, 0x00000001UL, // x^92160 mod p(x)` << 1, x^92224 mod p(x)` << 1
++ 0x6ded3e18UL, 0x00000001UL, 0x193680bcUL, 0x00000000UL, // x^91136 mod p(x)` << 1, x^91200 mod p(x)` << 1
++ 0xf1638b16UL, 0x00000000UL, 0x999b06f6UL, 0x00000000UL, // x^90112 mod p(x)` << 1, x^90176 mod p(x)` << 1
++ 0xd38b9eccUL, 0x00000001UL, 0xf685d2b8UL, 0x00000001UL, // x^89088 mod p(x)` << 1, x^89152 mod p(x)` << 1
++ 0x8b8d09dcUL, 0x00000001UL, 0xf4ecbed2UL, 0x00000001UL, // x^88064 mod p(x)` << 1, x^88128 mod p(x)` << 1
++ 0xe7bc27d2UL, 0x00000000UL, 0xba16f1a0UL, 0x00000000UL, // x^87040 mod p(x)` << 1, x^87104 mod p(x)` << 1
++ 0x275e1e96UL, 0x00000000UL, 0x15aceac4UL, 0x00000001UL, // x^86016 mod p(x)` << 1, x^86080 mod p(x)` << 1
++ 0xe2e3031eUL, 0x00000000UL, 0xaeff6292UL, 0x00000001UL, // x^84992 mod p(x)` << 1, x^85056 mod p(x)` << 1
++ 0x041c84d8UL, 0x00000001UL, 0x9640124cUL, 0x00000000UL, // x^83968 mod p(x)` << 1, x^84032 mod p(x)` << 1
++ 0x706ce672UL, 0x00000000UL, 0x14f41f02UL, 0x00000001UL, // x^82944 mod p(x)` << 1, x^83008 mod p(x)` << 1
++ 0x5d5070daUL, 0x00000001UL, 0x9c5f3586UL, 0x00000000UL, // x^81920 mod p(x)` << 1, x^81984 mod p(x)` << 1
++ 0x38f9493aUL, 0x00000000UL, 0x878275faUL, 0x00000001UL, // x^80896 mod p(x)` << 1, x^80960 mod p(x)` << 1
++ 0xa3348a76UL, 0x00000000UL, 0xddc42ce8UL, 0x00000000UL, // x^79872 mod p(x)` << 1, x^79936 mod p(x)` << 1
++ 0xad0aab92UL, 0x00000001UL, 0x81d2c73aUL, 0x00000001UL, // x^78848 mod p(x)` << 1, x^78912 mod p(x)` << 1
++ 0x9e85f712UL, 0x00000001UL, 0x41c9320aUL, 0x00000001UL, // x^77824 mod p(x)` << 1, x^77888 mod p(x)` << 1
++ 0x5a871e76UL, 0x00000000UL, 0x5235719aUL, 0x00000001UL, // x^76800 mod p(x)` << 1, x^76864 mod p(x)` << 1
++ 0x7249c662UL, 0x00000001UL, 0xbe27d804UL, 0x00000000UL, // x^75776 mod p(x)` << 1, x^75840 mod p(x)` << 1
++ 0x3a084712UL, 0x00000000UL, 0x6242d45aUL, 0x00000000UL, // x^74752 mod p(x)` << 1, x^74816 mod p(x)` << 1
++ 0xed438478UL, 0x00000000UL, 0x9a53638eUL, 0x00000000UL, // x^73728 mod p(x)` << 1, x^73792 mod p(x)` << 1
++ 0xabac34ccUL, 0x00000000UL, 0x001ecfb6UL, 0x00000001UL, // x^72704 mod p(x)` << 1, x^72768 mod p(x)` << 1
++ 0x5f35ef3eUL, 0x00000000UL, 0x6d7c2d64UL, 0x00000001UL, // x^71680 mod p(x)` << 1, x^71744 mod p(x)` << 1
++ 0x47d6608cUL, 0x00000000UL, 0xd0ce46c0UL, 0x00000001UL, // x^70656 mod p(x)` << 1, x^70720 mod p(x)` << 1
++ 0x2d01470eUL, 0x00000000UL, 0x24c907b4UL, 0x00000001UL, // x^69632 mod p(x)` << 1, x^69696 mod p(x)` << 1
++ 0x58bbc7b0UL, 0x00000001UL, 0x18a555caUL, 0x00000000UL, // x^68608 mod p(x)` << 1, x^68672 mod p(x)` << 1
++ 0xc0a23e8eUL, 0x00000000UL, 0x6b0980bcUL, 0x00000000UL, // x^67584 mod p(x)` << 1, x^67648 mod p(x)` << 1
++ 0xebd85c88UL, 0x00000001UL, 0x8bbba964UL, 0x00000000UL, // x^66560 mod p(x)` << 1, x^66624 mod p(x)` << 1
++ 0x9ee20bb2UL, 0x00000001UL, 0x070a5a1eUL, 0x00000001UL, // x^65536 mod p(x)` << 1, x^65600 mod p(x)` << 1
++ 0xacabf2d6UL, 0x00000001UL, 0x2204322aUL, 0x00000000UL, // x^64512 mod p(x)` << 1, x^64576 mod p(x)` << 1
++ 0xb7963d56UL, 0x00000001UL, 0xa27524d0UL, 0x00000000UL, // x^63488 mod p(x)` << 1, x^63552 mod p(x)` << 1
++ 0x7bffa1feUL, 0x00000001UL, 0x20b1e4baUL, 0x00000000UL, // x^62464 mod p(x)` << 1, x^62528 mod p(x)` << 1
++ 0x1f15333eUL, 0x00000000UL, 0x32cc27fcUL, 0x00000000UL, // x^61440 mod p(x)` << 1, x^61504 mod p(x)` << 1
++ 0x8593129eUL, 0x00000001UL, 0x44dd22b8UL, 0x00000000UL, // x^60416 mod p(x)` << 1, x^60480 mod p(x)` << 1
++ 0x9cb32602UL, 0x00000001UL, 0xdffc9e0aUL, 0x00000000UL, // x^59392 mod p(x)` << 1, x^59456 mod p(x)` << 1
++ 0x42b05cc8UL, 0x00000001UL, 0xb7a0ed14UL, 0x00000001UL, // x^58368 mod p(x)` << 1, x^58432 mod p(x)` << 1
++ 0xbe49e7a4UL, 0x00000001UL, 0xc7842488UL, 0x00000000UL, // x^57344 mod p(x)` << 1, x^57408 mod p(x)` << 1
++ 0x08f69d6cUL, 0x00000001UL, 0xc02a4feeUL, 0x00000001UL, // x^56320 mod p(x)` << 1, x^56384 mod p(x)` << 1
++ 0x6c0971f0UL, 0x00000000UL, 0x3c273778UL, 0x00000000UL, // x^55296 mod p(x)` << 1, x^55360 mod p(x)` << 1
++ 0x5b16467aUL, 0x00000000UL, 0xd63f8894UL, 0x00000001UL, // x^54272 mod p(x)` << 1, x^54336 mod p(x)` << 1
++ 0x551a628eUL, 0x00000001UL, 0x6be557d6UL, 0x00000000UL, // x^53248 mod p(x)` << 1, x^53312 mod p(x)` << 1
++ 0x9e42ea92UL, 0x00000001UL, 0x6a7806eaUL, 0x00000000UL, // x^52224 mod p(x)` << 1, x^52288 mod p(x)` << 1
++ 0x2fa83ff2UL, 0x00000001UL, 0x6155aa0cUL, 0x00000001UL, // x^51200 mod p(x)` << 1, x^51264 mod p(x)` << 1
++ 0x1ca9cde0UL, 0x00000001UL, 0x908650acUL, 0x00000000UL, // x^50176 mod p(x)` << 1, x^50240 mod p(x)` << 1
++ 0xc8e5cd74UL, 0x00000000UL, 0xaa5a8084UL, 0x00000000UL, // x^49152 mod p(x)` << 1, x^49216 mod p(x)` << 1
++ 0x96c27f0cUL, 0x00000000UL, 0x91bb500aUL, 0x00000001UL, // x^48128 mod p(x)` << 1, x^48192 mod p(x)` << 1
++ 0x2baed926UL, 0x00000000UL, 0x64e9bed0UL, 0x00000000UL, // x^47104 mod p(x)` << 1, x^47168 mod p(x)` << 1
++ 0x7c8de8d2UL, 0x00000001UL, 0x9444f302UL, 0x00000000UL, // x^46080 mod p(x)` << 1, x^46144 mod p(x)` << 1
++ 0xd43d6068UL, 0x00000000UL, 0x9db07d3cUL, 0x00000001UL, // x^45056 mod p(x)` << 1, x^45120 mod p(x)` << 1
++ 0xcb2c4b26UL, 0x00000000UL, 0x359e3e6eUL, 0x00000001UL, // x^44032 mod p(x)` << 1, x^44096 mod p(x)` << 1
++ 0x45b8da26UL, 0x00000001UL, 0xe4f10dd2UL, 0x00000001UL, // x^43008 mod p(x)` << 1, x^43072 mod p(x)` << 1
++ 0x8fff4b08UL, 0x00000001UL, 0x24f5735eUL, 0x00000001UL, // x^41984 mod p(x)` << 1, x^42048 mod p(x)` << 1
++ 0x50b58ed0UL, 0x00000001UL, 0x24760a4cUL, 0x00000001UL, // x^40960 mod p(x)` << 1, x^41024 mod p(x)` << 1
++ 0x549f39bcUL, 0x00000001UL, 0x0f1fc186UL, 0x00000000UL, // x^39936 mod p(x)` << 1, x^40000 mod p(x)` << 1
++ 0xef4d2f42UL, 0x00000000UL, 0x150e4cc4UL, 0x00000000UL, // x^38912 mod p(x)` << 1, x^38976 mod p(x)` << 1
++ 0xb1468572UL, 0x00000001UL, 0x2a6204e8UL, 0x00000000UL, // x^37888 mod p(x)` << 1, x^37952 mod p(x)` << 1
++ 0x3d7403b2UL, 0x00000001UL, 0xbeb1d432UL, 0x00000000UL, // x^36864 mod p(x)` << 1, x^36928 mod p(x)` << 1
++ 0xa4681842UL, 0x00000001UL, 0x35f3f1f0UL, 0x00000001UL, // x^35840 mod p(x)` << 1, x^35904 mod p(x)` << 1
++ 0x67714492UL, 0x00000001UL, 0x74fe2232UL, 0x00000000UL, // x^34816 mod p(x)` << 1, x^34880 mod p(x)` << 1
++ 0xe599099aUL, 0x00000001UL, 0x1ac6e2baUL, 0x00000000UL, // x^33792 mod p(x)` << 1, x^33856 mod p(x)` << 1
++ 0xfe128194UL, 0x00000000UL, 0x13fca91eUL, 0x00000000UL, // x^32768 mod p(x)` << 1, x^32832 mod p(x)` << 1
++ 0x77e8b990UL, 0x00000000UL, 0x83f4931eUL, 0x00000001UL, // x^31744 mod p(x)` << 1, x^31808 mod p(x)` << 1
++ 0xa267f63aUL, 0x00000001UL, 0xb6d9b4e4UL, 0x00000000UL, // x^30720 mod p(x)` << 1, x^30784 mod p(x)` << 1
++ 0x945c245aUL, 0x00000001UL, 0xb5188656UL, 0x00000000UL, // x^29696 mod p(x)` << 1, x^29760 mod p(x)` << 1
++ 0x49002e76UL, 0x00000001UL, 0x27a81a84UL, 0x00000000UL, // x^28672 mod p(x)` << 1, x^28736 mod p(x)` << 1
++ 0xbb8310a4UL, 0x00000001UL, 0x25699258UL, 0x00000001UL, // x^27648 mod p(x)` << 1, x^27712 mod p(x)` << 1
++ 0x9ec60bccUL, 0x00000001UL, 0xb23de796UL, 0x00000001UL, // x^26624 mod p(x)` << 1, x^26688 mod p(x)` << 1
++ 0x2d8590aeUL, 0x00000001UL, 0xfe4365dcUL, 0x00000000UL, // x^25600 mod p(x)` << 1, x^25664 mod p(x)` << 1
++ 0x65b00684UL, 0x00000000UL, 0xc68f497aUL, 0x00000000UL, // x^24576 mod p(x)` << 1, x^24640 mod p(x)` << 1
++ 0x5e5aeadcUL, 0x00000001UL, 0xfbf521eeUL, 0x00000000UL, // x^23552 mod p(x)` << 1, x^23616 mod p(x)` << 1
++ 0xb77ff2b0UL, 0x00000000UL, 0x5eac3378UL, 0x00000001UL, // x^22528 mod p(x)` << 1, x^22592 mod p(x)` << 1
++ 0x88da2ff6UL, 0x00000001UL, 0x34914b90UL, 0x00000001UL, // x^21504 mod p(x)` << 1, x^21568 mod p(x)` << 1
++ 0x63da929aUL, 0x00000000UL, 0x16335cfeUL, 0x00000000UL, // x^20480 mod p(x)` << 1, x^20544 mod p(x)` << 1
++ 0x389caa80UL, 0x00000001UL, 0x0372d10cUL, 0x00000001UL, // x^19456 mod p(x)` << 1, x^19520 mod p(x)` << 1
++ 0x3db599d2UL, 0x00000001UL, 0x5097b908UL, 0x00000001UL, // x^18432 mod p(x)` << 1, x^18496 mod p(x)` << 1
++ 0x22505a86UL, 0x00000001UL, 0x227a7572UL, 0x00000001UL, // x^17408 mod p(x)` << 1, x^17472 mod p(x)` << 1
++ 0x6bd72746UL, 0x00000001UL, 0x9a8f75c0UL, 0x00000000UL, // x^16384 mod p(x)` << 1, x^16448 mod p(x)` << 1
++ 0xc3faf1d4UL, 0x00000001UL, 0x682c77a2UL, 0x00000000UL, // x^15360 mod p(x)` << 1, x^15424 mod p(x)` << 1
++ 0x111c826cUL, 0x00000001UL, 0x231f091cUL, 0x00000000UL, // x^14336 mod p(x)` << 1, x^14400 mod p(x)` << 1
++ 0x153e9fb2UL, 0x00000000UL, 0x7d4439f2UL, 0x00000000UL, // x^13312 mod p(x)` << 1, x^13376 mod p(x)` << 1
++ 0x2b1f7b60UL, 0x00000000UL, 0x7e221efcUL, 0x00000001UL, // x^12288 mod p(x)` << 1, x^12352 mod p(x)` << 1
++ 0xb1dba570UL, 0x00000000UL, 0x67457c38UL, 0x00000001UL, // x^11264 mod p(x)` << 1, x^11328 mod p(x)` << 1
++ 0xf6397b76UL, 0x00000001UL, 0xbdf081c4UL, 0x00000000UL, // x^10240 mod p(x)` << 1, x^10304 mod p(x)` << 1
++ 0x56335214UL, 0x00000001UL, 0x6286d6b0UL, 0x00000001UL, // x^9216 mod p(x)` << 1, x^9280 mod p(x)` << 1
++ 0xd70e3986UL, 0x00000001UL, 0xc84f001cUL, 0x00000000UL, // x^8192 mod p(x)` << 1, x^8256 mod p(x)` << 1
++ 0x3701a774UL, 0x00000000UL, 0x64efe7c0UL, 0x00000000UL, // x^7168 mod p(x)` << 1, x^7232 mod p(x)` << 1
++ 0xac81ef72UL, 0x00000000UL, 0x0ac2d904UL, 0x00000000UL, // x^6144 mod p(x)` << 1, x^6208 mod p(x)` << 1
++ 0x33212464UL, 0x00000001UL, 0xfd226d14UL, 0x00000000UL, // x^5120 mod p(x)` << 1, x^5184 mod p(x)` << 1
++ 0xe4e45610UL, 0x00000000UL, 0x1cfd42e0UL, 0x00000001UL, // x^4096 mod p(x)` << 1, x^4160 mod p(x)` << 1
++ 0x0c1bd370UL, 0x00000000UL, 0x6e5a5678UL, 0x00000001UL, // x^3072 mod p(x)` << 1, x^3136 mod p(x)` << 1
++ 0xa7b9e7a6UL, 0x00000001UL, 0xd888fe22UL, 0x00000001UL, // x^2048 mod p(x)` << 1, x^2112 mod p(x)` << 1
++ 0x7d657a10UL, 0x00000000UL, 0xaf77fcd4UL, 0x00000001UL, // x^1024 mod p(x)` << 1, x^1088 mod p(x)` << 1
++
++ // Reduce final 1024-2048 bits to 64 bits, shifting 32 bits to include the trailing 32 bits of zeros
++ 0xec447f11UL, 0x99168a18UL, 0x13e8221eUL, 0xed837b26UL, // x^2048 mod p(x)`, x^2016 mod p(x)`, x^1984 mod p(x)`, x^1952 mod p(x)`
++ 0x8fd2cd3cUL, 0xe23e954eUL, 0x47b9ce5aUL, 0xc8acdd81UL, // x^1920 mod p(x)`, x^1888 mod p(x)`, x^1856 mod p(x)`, x^1824 mod p(x)`
++ 0x6b1d2b53UL, 0x92f8befeUL, 0xd4277e25UL, 0xd9ad6d87UL, // x^1792 mod p(x)`, x^1760 mod p(x)`, x^1728 mod p(x)`, x^1696 mod p(x)`
++ 0x291ea462UL, 0xf38a3556UL, 0x33fbca3bUL, 0xc10ec5e0UL, // x^1664 mod p(x)`, x^1632 mod p(x)`, x^1600 mod p(x)`, x^1568 mod p(x)`
++ 0x62b6ca4bUL, 0x974ac562UL, 0x82e02e2fUL, 0xc0b55b0eUL, // x^1536 mod p(x)`, x^1504 mod p(x)`, x^1472 mod p(x)`, x^1440 mod p(x)`
++ 0x784d2a56UL, 0x855712b3UL, 0xe172334dUL, 0x71aa1df0UL, // x^1408 mod p(x)`, x^1376 mod p(x)`, x^1344 mod p(x)`, x^1312 mod p(x)`
++ 0x0eaee722UL, 0xa5abe9f8UL, 0x3969324dUL, 0xfee3053eUL, // x^1280 mod p(x)`, x^1248 mod p(x)`, x^1216 mod p(x)`, x^1184 mod p(x)`
++ 0xdb54814cUL, 0x1fa0943dUL, 0x3eb2bd08UL, 0xf44779b9UL, // x^1152 mod p(x)`, x^1120 mod p(x)`, x^1088 mod p(x)`, x^1056 mod p(x)`
++ 0xd7bbfe6aUL, 0xa53ff440UL, 0x00cc3374UL, 0xf5449b3fUL, // x^1024 mod p(x)`, x^992 mod p(x)`, x^960 mod p(x)`, x^928 mod p(x)`
++ 0x6325605cUL, 0xebe7e356UL, 0xd777606eUL, 0x6f8346e1UL, // x^896 mod p(x)`, x^864 mod p(x)`, x^832 mod p(x)`, x^800 mod p(x)`
++ 0xe5b592b8UL, 0xc65a272cUL, 0xc0b95347UL, 0xe3ab4f2aUL, // x^768 mod p(x)`, x^736 mod p(x)`, x^704 mod p(x)`, x^672 mod p(x)`
++ 0x4721589fUL, 0x5705a9caUL, 0x329ecc11UL, 0xaa2215eaUL, // x^640 mod p(x)`, x^608 mod p(x)`, x^576 mod p(x)`, x^544 mod p(x)`
++ 0x88d14467UL, 0xe3720acbUL, 0xd95efd26UL, 0x1ed8f66eUL, // x^512 mod p(x)`, x^480 mod p(x)`, x^448 mod p(x)`, x^416 mod p(x)`
++ 0x15141c31UL, 0xba1aca03UL, 0xa700e96aUL, 0x78ed02d5UL, // x^384 mod p(x)`, x^352 mod p(x)`, x^320 mod p(x)`, x^288 mod p(x)`
++ 0xed627daeUL, 0xad2a31b3UL, 0x32b39da3UL, 0xba8ccbe8UL, // x^256 mod p(x)`, x^224 mod p(x)`, x^192 mod p(x)`, x^160 mod p(x)`
++ 0xa06a2517UL, 0x6655004fUL, 0xb1e6b092UL, 0xedb88320UL // x^128 mod p(x)`, x^96 mod p(x)`, x^64 mod p(x)`, x^32 mod p(x)`
++ };
++
++ juint* ptr = (juint*) malloc(sizeof(juint) * CRC32_CONSTANTS_SIZE);
++ guarantee(((intptr_t)ptr & 0xF) == 0, "16-byte alignment needed");
++ guarantee(ptr != NULL, "allocation error of a crc table");
++ memcpy((void*)ptr, constants, sizeof(juint) * CRC32_CONSTANTS_SIZE);
++ return ptr;
++}
++
++juint* StubRoutines::ppc64::generate_crc_barret_constants() {
++ juint barret_constants[CRC32_BARRET_CONSTANTS] = {
++ 0xf7011641UL, 0x00000001UL, 0x00000000UL, 0x00000000UL,
++ 0xdb710641UL, 0x00000001UL, 0x00000000UL, 0x00000000UL
++ };
++ juint* ptr = (juint*) malloc(sizeof(juint) * CRC32_CONSTANTS_SIZE);
++ guarantee(((intptr_t)ptr & 0xF) == 0, "16-byte alignment needed");
++ guarantee(ptr != NULL, "allocation error of a crc table");
++ memcpy((void*) ptr, barret_constants, sizeof(juint) * CRC32_BARRET_CONSTANTS);
++ return ptr;
++}
++
+ // CRC32 Intrinsics.
+ /**
+ * crc_table[] from jdk/src/share/native/java/util/zip/zlib-1.2.8/crc32.h
+@@ -477,3 +782,7 @@
+ #endif
+ }
+ };
++
++juint* StubRoutines::ppc64::_constants = StubRoutines::ppc64::generate_crc_constants();
++
++juint* StubRoutines::ppc64::_barret_constants = StubRoutines::ppc64::generate_crc_barret_constants();
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
+@@ -45,6 +45,8 @@
+ #else
+ #define CRC32_TABLES 1
+ #endif
++#define CRC32_CONSTANTS_SIZE 1084
++#define CRC32_BARRET_CONSTANTS 10
+
+ class ppc64 {
+ friend class StubGenerator;
+@@ -53,11 +55,17 @@
+
+ // CRC32 Intrinsics.
+ static juint _crc_table[CRC32_TABLES][CRC32_COLUMN_SIZE];
++ static juint* _constants;
++ static juint* _barret_constants;
+
+ public:
+
+ // CRC32 Intrinsics.
+ static void generate_load_crc_table_addr(MacroAssembler* masm, Register table);
++ static void generate_load_crc_constants_addr(MacroAssembler* masm, Register table);
++ static void generate_load_crc_barret_constants_addr(MacroAssembler* masm, Register table);
++ static juint* generate_crc_constants();
++ static juint* generate_crc_barret_constants();
+
+ };
+
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
+@@ -102,7 +102,7 @@
+ // Create and print feature-string.
+ char buf[(num_features+1) * 16]; // Max 16 chars per feature.
+ jio_snprintf(buf, sizeof(buf),
+- "ppc64%s%s%s%s%s%s%s%s%s",
++ "ppc64%s%s%s%s%s%s%s%s%s%s",
+ (has_fsqrt() ? " fsqrt" : ""),
+ (has_isel() ? " isel" : ""),
+ (has_lxarxeh() ? " lxarxeh" : ""),
+@@ -112,7 +112,8 @@
+ (has_popcntw() ? " popcntw" : ""),
+ (has_fcfids() ? " fcfids" : ""),
+ (has_vand() ? " vand" : ""),
+- (has_vcipher() ? " aes" : "")
++ (has_vcipher() ? " aes" : ""),
++ (has_vpmsumb() ? " vpmsumb" : "")
+ // Make sure number of %s matches num_features!
+ );
+ _features_str = strdup(buf);
+@@ -490,6 +491,7 @@
+ a->fcfids(F3, F4); // code[8] -> fcfids
+ a->vand(VR0, VR0, VR0); // code[9] -> vand
+ a->vcipher(VR0, VR1, VR2); // code[10] -> vcipher
++ a->vpmsumb(VR0, VR1, VR2); // code[11] -> vpmsumb
+ a->blr();
+
+ // Emit function to set one cache line to zero. Emit function descriptor and get pointer to it.
+@@ -534,6 +536,7 @@
+ if (code[feature_cntr++]) features |= fcfids_m;
+ if (code[feature_cntr++]) features |= vand_m;
+ if (code[feature_cntr++]) features |= vcipher_m;
++ if (code[feature_cntr++]) features |= vpmsumb_m;
+
+ // Print the detection code.
+ if (PrintAssembly) {
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp
+@@ -43,6 +43,7 @@
+ vand,
+ dcba,
+ vcipher,
++ vpmsumb,
+ num_features // last entry to count features
+ };
+ enum Feature_Flag_Set {
+@@ -58,6 +59,7 @@
+ vand_m = (1 << vand ),
+ dcba_m = (1 << dcba ),
+ vcipher_m = (1 << vcipher),
++ vpmsumb_m = (1 << vpmsumb),
+ all_features_m = -1
+ };
+ static int _features;
+@@ -86,6 +88,7 @@
+ static bool has_vand() { return (_features & vand_m) != 0; }
+ static bool has_dcba() { return (_features & dcba_m) != 0; }
+ static bool has_vcipher() { return (_features & vcipher_m) != 0; }
++ static bool has_vpmsumb() { return (_features & vpmsumb_m) != 0; }
+
+ static const char* cpu_features() { return _features_str; }
+
diff --git a/jdk8165852-pr3468-mount_point_not_found_for_a_file_which_is_present_in_overlayfs.patch b/jdk8165852-pr3468-mount_point_not_found_for_a_file_which_is_present_in_overlayfs.patch
new file mode 100644
index 0000000..6be87a7
--- /dev/null
+++ b/jdk8165852-pr3468-mount_point_not_found_for_a_file_which_is_present_in_overlayfs.patch
@@ -0,0 +1,87 @@
+
+# HG changeset patch
+# User bpb
+# Date 1515783982 28800
+# Node ID b8843bca95b5e0eed5bbb4dc195c89c727c7aede
+# Parent 61d7ce442d95f5f30c84037a50cf6361bf7c37e1
+8165852: (fs) Mount point not found for a file which is present in overlayfs
+Summary: Check /proc/mounts when the device ID boundary is reached
+Reviewed-by: alanb
+
+diff -r 61d7ce442d95 -r b8843bca95b5 src/solaris/classes/sun/nio/fs/LinuxFileStore.java
+--- openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java Tue Jul 24 05:10:45 2018 -0400
++++ openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java Fri Jan 12 11:06:22 2018 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2008, 2018, 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
+@@ -66,6 +66,8 @@
+ }
+
+ // step 2: find mount point
++ List<UnixMountEntry> procMountsEntries =
++ fs.getMountEntries("/proc/mounts");
+ UnixPath parent = path.getParent();
+ while (parent != null) {
+ UnixFileAttributes attrs = null;
+@@ -74,16 +76,23 @@
+ } catch (UnixException x) {
+ x.rethrowAsIOException(parent);
+ }
+- if (attrs.dev() != dev())
+- break;
++ if (attrs.dev() != dev()) {
++ // step 3: lookup mounted file systems (use /proc/mounts to
++ // ensure we find the file system even when not in /etc/mtab)
++ byte[] dir = path.asByteArray();
++ for (UnixMountEntry entry : procMountsEntries) {
++ if (Arrays.equals(dir, entry.dir()))
++ return entry;
++ }
++ }
+ path = parent;
+ parent = parent.getParent();
+ }
+
+- // step 3: lookup mounted file systems (use /proc/mounts to ensure we
+- // find the file system even when not in /etc/mtab)
++ // step 3: lookup mounted file systems (use /proc/mounts to
++ // ensure we find the file system even when not in /etc/mtab)
+ byte[] dir = path.asByteArray();
+- for (UnixMountEntry entry: fs.getMountEntries("/proc/mounts")) {
++ for (UnixMountEntry entry : procMountsEntries) {
+ if (Arrays.equals(dir, entry.dir()))
+ return entry;
+ }
+diff -r 61d7ce442d95 -r b8843bca95b5 src/solaris/classes/sun/nio/fs/LinuxFileSystem.java
+--- openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java Tue Jul 24 05:10:45 2018 -0400
++++ openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java Fri Jan 12 11:06:22 2018 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2008, 2018, 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
+@@ -75,7 +75,7 @@
+ /**
+ * Returns object to iterate over the mount entries in the given fstab file.
+ */
+- Iterable<UnixMountEntry> getMountEntries(String fstab) {
++ List<UnixMountEntry> getMountEntries(String fstab) {
+ ArrayList<UnixMountEntry> entries = new ArrayList<>();
+ try {
+ long fp = setmntent(Util.toBytes(fstab), Util.toBytes("r"));
+@@ -101,7 +101,7 @@
+ * Returns object to iterate over the mount entries in /etc/mtab
+ */
+ @Override
+- Iterable<UnixMountEntry> getMountEntries() {
++ List<UnixMountEntry> getMountEntries() {
+ return getMountEntries("/etc/mtab");
+ }
+
+
diff --git a/jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch b/jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch
new file mode 100644
index 0000000..d831aa9
--- /dev/null
+++ b/jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch
@@ -0,0 +1,121 @@
+# HG changeset patch
+# User kaddepalli
+# Date 1517818481 -19800
+# Mon Feb 05 13:44:41 2018 +0530
+# Node ID b77308735540644d4710244e3c88865067f2905a
+# Parent 39bfc94b1f4265b645c2970a58389acc779dafe9
+8171000, PR3542, RH1402819: Robot.createScreenCapture() crashes in wayland mode
+Reviewed-by: serb, mhalder
+
+diff --git openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
+--- openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c
++++ openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
+@@ -394,77 +394,48 @@
+ XRectangle bbox; /* bounding box of grabbed area */
+ list_ptr regions;/* list of regions to read from */
+ {
+- image_region_type *reg;
+- int32_t dst_x, dst_y; /* where in pixmap to write (UL) */
+- int32_t diff;
+-
+- XImage *reg_image,*ximage ;
+- int32_t srcRect_x,srcRect_y,srcRect_width,srcRect_height ;
+- int32_t rem ;
+- int32_t bytes_per_line;
+- int32_t bitmap_unit;
+-
+- bitmap_unit = sizeof (long);
+- if (format == ZPixmap)
+- bytes_per_line = width*depth/8;
+- else
+- bytes_per_line = width/8;
+-
+-
+- /* Find out how many more bytes are required for padding so that
+- ** bytes per scan line will be multiples of bitmap_unit bits */
+- if (format == ZPixmap) {
+- rem = (bytes_per_line*8)%bitmap_unit;
+- if (rem)
+- bytes_per_line += (rem/8 + 1);
+- }
++ XImage *ximage ;
+
+ ximage = XCreateImage(disp,fakeVis,(uint32_t) depth,format,0,NULL,
+ (uint32_t)width,(uint32_t)height,8,0);
+
+- bytes_per_line = ximage->bytes_per_line;
+-
+- if (format == ZPixmap)
+- ximage->data = malloc(height*bytes_per_line);
+- else
+- ximage->data = malloc(height*bytes_per_line*depth);
+-
++ ximage->data = calloc(ximage->bytes_per_line*height*((format==ZPixmap)? 1 : depth), sizeof(char));
+ ximage->bits_per_pixel = depth; /** Valid only if format is ZPixmap ***/
+
+- for (reg = (image_region_type *) first_in_list( regions); reg;
++ for (image_region_type* reg = (image_region_type *) first_in_list( regions); reg;
+ reg = (image_region_type *) next_in_list( regions))
+ {
+- int32_t rect;
+- struct my_XRegion *vis_reg;
+- vis_reg = (struct my_XRegion *)(reg->visible_region);
+- for (rect = 0;
+- rect < vis_reg->numRects;
+- rect++)
++ struct my_XRegion *vis_reg = (struct my_XRegion *)(reg->visible_region);
++ for (int32_t rect = 0; rect < vis_reg->numRects; rect++)
+ {
+- /** ------------------------------------------------------------------------
+- Intersect bbox with visible part of region giving src rect & output
+- location. Width is the min right side minus the max left side.
+- Similar for height. Offset src rect so x,y are relative to
+- origin of win, not the root-relative visible rect of win.
+- ------------------------------------------------------------------------ **/
+- srcRect_width = MIN( vis_reg->rects[rect].x2, bbox.width + bbox.x)
+- - MAX( vis_reg->rects[rect].x1, bbox.x);
++ /** ------------------------------------------------------------------------
++ Intersect bbox with visible part of region giving src rect & output
++ location. Width is the min right side minus the max left side.
++ Similar for height. Offset src rect so x,y are relative to
++ origin of win, not the root-relative visible rect of win.
++ ------------------------------------------------------------------------ **/
++ int32_t srcRect_width = MIN( vis_reg->rects[rect].x2, bbox.width + bbox.x)
++ - MAX( vis_reg->rects[rect].x1, bbox.x);
++
++ int32_t srcRect_height = MIN( vis_reg->rects[rect].y2, bbox.height + bbox.y)
++ - MAX( vis_reg->rects[rect].y1, bbox.y);
+
+- srcRect_height = MIN( vis_reg->rects[rect].y2, bbox.height + bbox.y)
+- - MAX( vis_reg->rects[rect].y1, bbox.y);
++ int32_t diff = bbox.x - vis_reg->rects[rect].x1;
++ int32_t srcRect_x = MAX( 0, diff) + (vis_reg->rects[rect].x1 - reg->x_rootrel - reg->border);
++ int32_t dst_x = MAX( 0, -diff) ;
+
+- diff = bbox.x - vis_reg->rects[rect].x1;
+- srcRect_x = MAX( 0, diff) + (vis_reg->rects[rect].x1 - reg->x_rootrel - reg->border);
+- dst_x = MAX( 0, -diff) ;
+- diff = bbox.y - vis_reg->rects[rect].y1;
+- srcRect_y = MAX( 0, diff) + (vis_reg->rects[rect].y1 - reg->y_rootrel - reg->border);
+- dst_y = MAX( 0, -diff) ;
+- reg_image = XGetImage(disp,reg->win,srcRect_x,srcRect_y,
+- (uint32_t) srcRect_width, (uint32_t) srcRect_height,AllPlanes,format) ;
+- TransferImage(disp,reg_image,srcRect_width,
+- srcRect_height,reg,ximage,dst_x,dst_y) ;
+- XDestroyImage(reg_image);
+- }
++ diff = bbox.y - vis_reg->rects[rect].y1;
++ int32_t srcRect_y = MAX( 0, diff) + (vis_reg->rects[rect].y1 - reg->y_rootrel - reg->border);
++ int32_t dst_y = MAX( 0, -diff) ;
++ XImage* reg_image = XGetImage(disp,reg->win,srcRect_x,srcRect_y,
++ (uint32_t) srcRect_width, (uint32_t) srcRect_height,AllPlanes,format) ;
++
++ if (reg_image) {
++ TransferImage(disp,reg_image,srcRect_width,
++ srcRect_height,reg,ximage,dst_x,dst_y) ;
++ XDestroyImage(reg_image);
++ }
++ }
+ }
+ return ximage ;
+ }
diff --git a/jdk8172850-rh1640127-01-register_allocator_crash.patch b/jdk8172850-rh1640127-01-register_allocator_crash.patch
new file mode 100644
index 0000000..294e313
--- /dev/null
+++ b/jdk8172850-rh1640127-01-register_allocator_crash.patch
@@ -0,0 +1,213 @@
+
+# HG changeset patch
+# User thartmann
+# Date 1539594027 -7200
+# Node ID e044997c2edaeae97866394a7f8e2ddebbd41392
+# Parent 99212080341058548d449a22d1381e79353ec5b5
+8172850: Anti-dependency on membar causes crash in register allocator due to invalid instruction scheduling
+Summary: Regression test and additional asserts. The problem is fixed by 8087341.
+Reviewed-by: kvn
+
+diff -r 992120803410 -r e044997c2eda src/share/vm/opto/cfgnode.cpp
+--- openjdk/hotspot/src/share/vm/opto/cfgnode.cpp Mon Oct 22 05:26:38 2018 -0400
++++ openjdk/hotspot/src/share/vm/opto/cfgnode.cpp Mon Oct 15 11:00:27 2018 +0200
+@@ -2016,6 +2016,7 @@
+ uint ideal_reg = _type->ideal_reg();
+ assert( ideal_reg != Node::NotAMachineReg, "invalid type at Phi" );
+ if( ideal_reg == 0 ) return RegMask::Empty;
++ assert(ideal_reg != Op_RegFlags, "flags register is not spillable");
+ return *(Compile::current()->matcher()->idealreg2spillmask[ideal_reg]);
+ }
+
+diff -r 992120803410 -r e044997c2eda src/share/vm/opto/coalesce.cpp
+--- openjdk/hotspot/src/share/vm/opto/coalesce.cpp Mon Oct 22 05:26:38 2018 -0400
++++ openjdk/hotspot/src/share/vm/opto/coalesce.cpp Mon Oct 15 11:00:27 2018 +0200
+@@ -292,7 +292,14 @@
+ // Copy any flags as well
+ _phc.clone_projs(pred, pred->end_idx(), m, copy, _phc._lrg_map);
+ } else {
+- const RegMask *rm = C->matcher()->idealreg2spillmask[m->ideal_reg()];
++ int ireg = m->ideal_reg();
++ if (ireg == 0 || ireg == Op_RegFlags) {
++ assert(false, err_msg("attempted to spill a non-spillable item: %d: %s, ireg = %d",
++ m->_idx, m->Name(), ireg));
++ C->record_method_not_compilable("attempted to spill a non-spillable item");
++ return;
++ }
++ const RegMask *rm = C->matcher()->idealreg2spillmask[ireg];
+ copy = new (C) MachSpillCopyNode(m, *rm, *rm);
+ // Find a good place to insert. Kinda tricky, use a subroutine
+ insert_copy_with_overlap(pred,copy,phi_name,src_name);
+@@ -326,7 +333,14 @@
+ b->insert_node(copy, l++);
+ l += _phc.clone_projs(b, l, m, copy, _phc._lrg_map);
+ } else {
+- const RegMask *rm = C->matcher()->idealreg2spillmask[m->ideal_reg()];
++ int ireg = m->ideal_reg();
++ if (ireg == 0 || ireg == Op_RegFlags) {
++ assert(false, err_msg("attempted to spill a non-spillable item: %d: %s, ireg = %d",
++ m->_idx, m->Name(), ireg));
++ C->record_method_not_compilable("attempted to spill a non-spillable item");
++ return;
++ }
++ const RegMask *rm = C->matcher()->idealreg2spillmask[ireg];
+ copy = new (C) MachSpillCopyNode(m, *rm, *rm);
+ // Insert the copy in the basic block, just before us
+ b->insert_node(copy, l++);
+@@ -373,7 +387,14 @@
+ if( k < b->_num_succs )
+ continue; // Live out; do not pre-split
+ // Split the lrg at this use
+- const RegMask *rm = C->matcher()->idealreg2spillmask[inp->ideal_reg()];
++ int ireg = inp->ideal_reg();
++ if (ireg == 0 || ireg == Op_RegFlags) {
++ assert(false, err_msg("attempted to spill a non-spillable item: %d: %s, ireg = %d",
++ inp->_idx, inp->Name(), ireg));
++ C->record_method_not_compilable("attempted to spill a non-spillable item");
++ return;
++ }
++ const RegMask *rm = C->matcher()->idealreg2spillmask[ireg];
+ Node *copy = new (C) MachSpillCopyNode( inp, *rm, *rm );
+ // Insert the copy in the use-def chain
+ n->set_req(inpidx, copy );
+diff -r 992120803410 -r e044997c2eda src/share/vm/opto/machnode.cpp
+--- openjdk/hotspot/src/share/vm/opto/machnode.cpp Mon Oct 22 05:26:38 2018 -0400
++++ openjdk/hotspot/src/share/vm/opto/machnode.cpp Mon Oct 15 11:00:27 2018 +0200
+@@ -619,6 +619,7 @@
+ }
+
+ // Values outside the domain represent debug info
++ assert(in(idx)->ideal_reg() != Op_RegFlags, "flags register is not spillable");
+ return *Compile::current()->matcher()->idealreg2spillmask[in(idx)->ideal_reg()];
+ }
+
+diff -r 992120803410 -r e044997c2eda src/share/vm/opto/matcher.cpp
+--- openjdk/hotspot/src/share/vm/opto/matcher.cpp Mon Oct 22 05:26:38 2018 -0400
++++ openjdk/hotspot/src/share/vm/opto/matcher.cpp Mon Oct 15 11:00:27 2018 +0200
+@@ -95,6 +95,7 @@
+ idealreg2spillmask [Op_VecD] = NULL;
+ idealreg2spillmask [Op_VecX] = NULL;
+ idealreg2spillmask [Op_VecY] = NULL;
++ idealreg2spillmask [Op_RegFlags] = NULL;
+
+ idealreg2debugmask [Op_RegI] = NULL;
+ idealreg2debugmask [Op_RegN] = NULL;
+@@ -106,6 +107,7 @@
+ idealreg2debugmask [Op_VecD] = NULL;
+ idealreg2debugmask [Op_VecX] = NULL;
+ idealreg2debugmask [Op_VecY] = NULL;
++ idealreg2debugmask [Op_RegFlags] = NULL;
+
+ idealreg2mhdebugmask[Op_RegI] = NULL;
+ idealreg2mhdebugmask[Op_RegN] = NULL;
+@@ -117,6 +119,7 @@
+ idealreg2mhdebugmask[Op_VecD] = NULL;
+ idealreg2mhdebugmask[Op_VecX] = NULL;
+ idealreg2mhdebugmask[Op_VecY] = NULL;
++ idealreg2mhdebugmask[Op_RegFlags] = NULL;
+
+ debug_only(_mem_node = NULL;) // Ideal memory node consumed by mach node
+ }
+diff -r 992120803410 -r e044997c2eda test/compiler/gcbarriers/TestMembarDependencies.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/hotspot/test/compiler/gcbarriers/TestMembarDependencies.java Mon Oct 15 11:00:27 2018 +0200
+@@ -0,0 +1,98 @@
++/*
++ * Copyright (c) 2017, 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.
++ *
++ * 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.
++ */
++
++/*
++ * @test TestMembarDependencies
++ * @bug 8172850
++ * @summary Tests correct scheduling of memory loads around MembarVolatile emitted by GC barriers.
++ * @library /testlibrary
++ * @run driver compiler.membars.TestMembarDependencies
++ */
++
++package compiler.membars;
++
++import com.oracle.java.testlibrary.*;
++
++public class TestMembarDependencies {
++ private static TestMembarDependencies f1;
++ private static TestMembarDependencies f2;
++
++ public static void main(String args[]) throws Throwable {
++ if (args.length == 0) {
++ // For debugging, add "-XX:+TraceOptoPipelining"
++ OutputAnalyzer oa = ProcessTools.executeTestJvm("-XX:+IgnoreUnrecognizedVMOptions",
++ "-XX:-TieredCompilation", "-XX:-BackgroundCompilation", "-XX:+PrintOpto",
++ "-XX:CompileCommand=compileonly,compiler.membars.TestMembarDependencies::test*",
++ "-XX:CompileCommand=dontinline,compiler.membars.TestMembarDependencies::test_m1",
++ TestMembarDependencies.class.getName(), "run");
++ // C2 should not crash or bail out from compilation
++ oa.shouldHaveExitValue(0);
++ oa.shouldNotMatch("Bailout: Recompile without subsuming loads");
++ System.out.println(oa.getOutput());
++ } else {
++ f2 = new TestMembarDependencies();
++ // Trigger compilation of test1 and test2
++ for (int i = 0; i < 10_000; ++i) {
++ f2.test1(f2);
++ f2.test2(f2);
++ }
++ }
++ }
++
++ public void test_m1() { }
++ public void test_m2() { }
++
++ public void test1(TestMembarDependencies obj) {
++ // Try/catch/finally is used to create a CFG block without a test + jmpCon
++ // allowing GCM to schedule the testN_mem_reg0 instruction into that block.
++ try {
++ // Method call defines memory state that is then
++ // used by subsequent instructions/blocks (see below).
++ test_m1();
++ } catch (Exception e) {
++
++ } finally {
++ // Oop write to field emits a GC post-barrier with a MembarVolatile
++ // which has a wide memory effect (kills all memory). This creates an
++ // anti-dependency on all surrounding memory loads.
++ f1 = obj;
++ }
++ // The empty method m2 is inlined but the null check of f2 remains. It is encoded
++ // as CmpN(LoadN(MEM), NULL) where MEM is the memory after the call to test_m1().
++ // This is matched to testN_mem_reg0 on x86 which is scheduled before the barrier
++ // in the try/catch block due to the anti-dependency on the MembarVolatile.
++ // C2 crashes in the register allocator when trying to spill the flag register
++ // to keep the result of the testN instruction live from the try/catch block
++ // until it is here.
++ f2.test_m2();
++ }
++
++ public void test2(TestMembarDependencies obj) {
++ // Same as test1 but without try/catch/finally.
++ // This causes C2 to bail out in block local scheduling because testN_mem_reg0 is
++ // scheduled into a block that already contains another test + jmpCon instruction.
++ test_m1();
++ f1 = obj;
++ f2.test_m2();
++ }
++}
+
diff --git a/jdk8184309-pr3596-build_warnings_from_gcc_7_1_on_fedora_26.patch b/jdk8184309-pr3596-build_warnings_from_gcc_7_1_on_fedora_26.patch
new file mode 100644
index 0000000..00b6125
--- /dev/null
+++ b/jdk8184309-pr3596-build_warnings_from_gcc_7_1_on_fedora_26.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User ysuenaga
+# Date 1527498573 -3600
+# Mon May 28 10:09:33 2018 +0100
+# Node ID ef176cb429c49d1c330d9575938f66b04e3fb730
+# Parent 6915dc9ae18cce5625d3a3fc74b37da70a5b4215
+8184309, PR3596: Build warnings from GCC 7.1 on Fedora 26
+Reviewed-by: kbarrett, vlivanov
+
+diff --git openjdk.orig/hotspot/src/share/vm/code/dependencies.cpp openjdk/hotspot/src/share/vm/code/dependencies.cpp
+--- openjdk.orig/hotspot/src/share/vm/code/dependencies.cpp
++++ openjdk/hotspot/src/share/vm/code/dependencies.cpp
+@@ -525,7 +525,7 @@
+ xtty->object("x", arg.metadata_value());
+ }
+ } else {
+- char xn[10]; sprintf(xn, "x%d", j);
++ char xn[12]; sprintf(xn, "x%d", j);
+ if (arg.is_oop()) {
+ xtty->object(xn, arg.oop_value());
+ } else {
diff --git a/jdk8189170-aarch64_primordial_thread.patch b/jdk8189170-aarch64_primordial_thread.patch
new file mode 100644
index 0000000..876cfdf
--- /dev/null
+++ b/jdk8189170-aarch64_primordial_thread.patch
@@ -0,0 +1,30 @@
+# HG changeset patch
+# User dbuck
+# Date 1547622839 0
+# Wed Jan 16 07:13:59 2019 +0000
+# Node ID 34c6b4b813caf9b3a6fd1859596a87a24a49c423
+# Parent bca8195a3bc70df281a73d9a40032c673971676c
+8189170: [AArch64] Add option to disable stack overflow checking in primordial thread for use with JNI_CreateJavaJVM
+Reviewed-by: dcubed
+
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
++++ openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 2018, 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
+@@ -550,8 +550,8 @@
+ // pthread_attr_getstack()
+
+ static void current_stack_region(address * bottom, size_t * size) {
+- if (os::Linux::is_initial_thread()) {
+- // initial thread needs special handling because pthread_getattr_np()
++ if (os::is_primordial_thread()) {
++ // primordial thread needs special handling because pthread_getattr_np()
+ // may return bogus value.
+ *bottom = os::Linux::initial_thread_stack_bottom();
+ *size = os::Linux::initial_thread_stack_size();
diff --git a/jdk8197429-pr3546-rh1536622-increased_stack_guard_causes_segfaults_on_x86_32.patch b/jdk8197429-pr3546-rh1536622-increased_stack_guard_causes_segfaults_on_x86_32.patch
new file mode 100644
index 0000000..6d7f743
--- /dev/null
+++ b/jdk8197429-pr3546-rh1536622-increased_stack_guard_causes_segfaults_on_x86_32.patch
@@ -0,0 +1,286 @@
+# HG changeset patch
+# User aph
+# Date 1530894306 -3600
+# Fri Jul 06 17:25:06 2018 +0100
+# Node ID 1485461a0fd1ff977a6acb8f2ed1069aaaf3b07e
+# Parent d7bcbcfde5057ad066ad2fb55a87d19a5827ddee
+8197429: Increased stack guard causes segfaults on x86-32
+Reviewed-by: dholmes
+
+diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -724,6 +724,10 @@
+ }
+ }
+
++void os::Linux::expand_stack_to(address bottom) {
++ _expand_stack_to(bottom);
++}
++
+ bool os::Linux::manually_expand_stack(JavaThread * t, address addr) {
+ assert(t!=NULL, "just checking");
+ assert(t->osthread()->expanding_stack(), "expand should be set");
+diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.hpp openjdk/hotspot/src/os/linux/vm/os_linux.hpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.hpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.hpp
+@@ -249,6 +249,8 @@
+ static int safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime);
+
+ private:
++ static void expand_stack_to(address bottom);
++
+ typedef int (*sched_getcpu_func_t)(void);
+ typedef int (*numa_node_to_cpus_func_t)(int node, unsigned long *buffer, int bufferlen);
+ typedef int (*numa_max_node_func_t)(void);
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+@@ -892,6 +892,27 @@
+ void os::workaround_expand_exec_shield_cs_limit() {
+ #if defined(IA32)
+ size_t page_size = os::vm_page_size();
++
++ /*
++ * JDK-8197429
++ *
++ * Expand the stack mapping to the end of the initial stack before
++ * attempting to install the codebuf. This is needed because newer
++ * Linux kernels impose a distance of a megabyte between stack
++ * memory and other memory regions. If we try to install the
++ * codebuf before expanding the stack the installation will appear
++ * to succeed but we'll get a segfault later if we expand the stack
++ * in Java code.
++ *
++ */
++ if (os::is_primordial_thread()) {
++ address limit = Linux::initial_thread_stack_bottom();
++ if (! DisablePrimordialThreadGuardPages) {
++ limit += (StackYellowPages + StackRedPages) * page_size;
++ }
++ os::Linux::expand_stack_to(limit);
++ }
++
+ /*
+ * Take the highest VA the OS will give us and exec
+ *
+@@ -910,6 +931,16 @@
+ char* hint = (char*) (Linux::initial_thread_stack_bottom() -
+ ((StackYellowPages + StackRedPages + 1) * page_size));
+ char* codebuf = os::attempt_reserve_memory_at(page_size, hint);
++
++ if (codebuf == NULL) {
++ // JDK-8197429: There may be a stack gap of one megabyte between
++ // the limit of the stack and the nearest memory region: this is a
++ // Linux kernel workaround for CVE-2017-1000364. If we failed to
++ // map our codebuf, try again at an address one megabyte lower.
++ hint -= 1 * M;
++ codebuf = os::attempt_reserve_memory_at(page_size, hint);
++ }
++
+ if ( (codebuf == NULL) || (!os::commit_memory(codebuf, page_size, true)) ) {
+ return; // No matter, we tried, best effort.
+ }
+diff --git openjdk.orig/hotspot/test/runtime/StackGap/T.java openjdk/hotspot/test/runtime/StackGap/T.java
+new file mode 100644
+--- /dev/null
++++ openjdk/hotspot/test/runtime/StackGap/T.java
+@@ -0,0 +1,33 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ *
++ * 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.
++ */
++
++public class T {
++
++ public static void test(int n) {
++ if (n == 0) return;
++ System.out.println (n);
++ test (n - 1);
++
++ }
++
++}
+diff --git openjdk.orig/hotspot/test/runtime/StackGap/exestack-gap.c openjdk/hotspot/test/runtime/StackGap/exestack-gap.c
+new file mode 100644
+--- /dev/null
++++ openjdk/hotspot/test/runtime/StackGap/exestack-gap.c
+@@ -0,0 +1,82 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ *
++ * 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.
++ */
++
++#include <jni.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++JNIEnv* create_vm(JavaVM **jvm, char *extra_option)
++{
++ JNIEnv* env;
++ JavaVMInitArgs args;
++ JavaVMOption options[4];
++ args.version = JNI_VERSION_1_8;
++ args.nOptions = 3 + (extra_option != NULL);
++ options[0].optionString = "-Xss2048k";
++ char classpath[4096];
++ snprintf(classpath, sizeof classpath,
++ "-Djava.class.path=%s", getenv("CLASSPATH"));
++ options[1].optionString = classpath;
++ options[2].optionString = "-XX:+UnlockExperimentalVMOptions";
++ if (extra_option) {
++ options[3].optionString = extra_option;
++ }
++ args.options = &options[0];
++ args.ignoreUnrecognized = 0;
++ int rv;
++ rv = JNI_CreateJavaVM(jvm, (void**)&env, &args);
++ if (rv < 0) return NULL;
++ return env;
++}
++
++void run(char *extra_arg) {
++ JavaVM *jvm;
++ jclass T_class;
++ jmethodID test_method;
++ JNIEnv *env = create_vm(&jvm, extra_arg);
++ if (env == NULL)
++ exit(1);
++ T_class = (*env)->FindClass(env, "T");
++ if ((*env)->ExceptionCheck(env) == JNI_TRUE) {
++ (*env)->ExceptionDescribe(env);
++ exit(1);
++ }
++ test_method = (*env)->GetStaticMethodID(env, T_class, "test", "(I)V");
++ if ((*env)->ExceptionCheck(env) == JNI_TRUE) {
++ (*env)->ExceptionDescribe(env);
++ exit(1);
++ }
++ (*env)->CallStaticVoidMethod(env, T_class, test_method, 1000);
++}
++
++
++int main(int argc, char **argv)
++{
++ if (argc > 1) {
++ run(argv[1]);
++ } else {
++ run(NULL);
++ }
++
++ return 0;
++}
+diff --git openjdk.orig/hotspot/test/runtime/StackGap/testme.sh openjdk/hotspot/test/runtime/StackGap/testme.sh
+new file mode 100644
+--- /dev/null
++++ openjdk/hotspot/test/runtime/StackGap/testme.sh
+@@ -0,0 +1,73 @@
++# Copyright (c) 2014, 2018, 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.
++#
++# 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.
++#!/bin/sh
++
++#
++# @test testme.sh
++# @bug 8197429
++# @summary Linux kernel stack guard should not cause segfaults on x86-32
++# @compile T.java
++# @run shell testme.sh
++#
++
++if [ "${TESTSRC}" = "" ]
++then
++ TESTSRC=${PWD}
++ echo "TESTSRC not set. Using "${TESTSRC}" as default"
++fi
++echo "TESTSRC=${TESTSRC}"
++## Adding common setup Variables for running shell tests.
++. ${TESTSRC}/../../test_env.sh
++
++if [ "${VM_OS}" != "linux" ]
++then
++ echo "Test only valid for Linux"
++ exit 0
++fi
++
++gcc_cmd=`which gcc`
++if [ "x$gcc_cmd" = "x" ]; then
++ echo "WARNING: gcc not found. Cannot execute test." 2>&1
++ exit 0;
++fi
++
++CFLAGS="-m${VM_BITS}"
++
++LD_LIBRARY_PATH=.:${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE}:/usr/lib:$LD_LIBRARY_PATH
++export LD_LIBRARY_PATH
++
++cp ${TESTSRC}${FS}exestack-gap.c .
++
++# Copy the result of our @compile action:
++cp ${TESTCLASSES}${FS}T.class .
++
++echo "Compilation flag: ${COMP_FLAG}"
++# Note pthread may not be found thus invoke creation will fail to be created.
++# Check to ensure you have a /usr/lib/libpthread.so if you don't please look
++# for /usr/lib/`uname -m`-linux-gnu version ensure to add that path to below compilation.
++
++$gcc_cmd -DLINUX ${CFLAGS} -o stack-gap \
++ -I${COMPILEJAVA}/include -I${COMPILEJAVA}/include/linux \
++ -L${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE} \
++ -ljvm -lpthread exestack-gap.c
++
++./stack-gap || exit $?
++./stack-gap -XX:+DisablePrimordialThreadGuardPages || exit $?
diff --git a/jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch b/jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch
new file mode 100644
index 0000000..ba712ad
--- /dev/null
+++ b/jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch
@@ -0,0 +1,35 @@
+# HG changeset patch
+# User prr
+# Date 1518454604 28800
+# Mon Feb 12 08:56:44 2018 -0800
+# Node ID 556adf3a76aa81bf3918d7d46554dae7cc1d5c5c
+# Parent b77308735540644d4710244e3c88865067f2905a
+8197546: Fix for 8171000 breaks Solaris + Linux builds
+Reviewed-by: serb, jdv
+
+diff --git openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
+--- openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c
++++ openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
+@@ -395,6 +395,8 @@
+ list_ptr regions;/* list of regions to read from */
+ {
+ XImage *ximage ;
++ image_region_type* reg;
++ int32_t rect;
+
+ ximage = XCreateImage(disp,fakeVis,(uint32_t) depth,format,0,NULL,
+ (uint32_t)width,(uint32_t)height,8,0);
+@@ -402,11 +404,11 @@
+ ximage->data = calloc(ximage->bytes_per_line*height*((format==ZPixmap)? 1 : depth), sizeof(char));
+ ximage->bits_per_pixel = depth; /** Valid only if format is ZPixmap ***/
+
+- for (image_region_type* reg = (image_region_type *) first_in_list( regions); reg;
++ for (reg = (image_region_type *) first_in_list( regions); reg;
+ reg = (image_region_type *) next_in_list( regions))
+ {
+ struct my_XRegion *vis_reg = (struct my_XRegion *)(reg->visible_region);
+- for (int32_t rect = 0; rect < vis_reg->numRects; rect++)
++ for (rect = 0; rect < vis_reg->numRects; rect++)
+ {
+ /** ------------------------------------------------------------------------
+ Intersect bbox with visible part of region giving src rect & output
diff --git a/jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch b/jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
new file mode 100644
index 0000000..5f6d9ce
--- /dev/null
+++ b/jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
@@ -0,0 +1,32 @@
+# HG changeset patch
+# User andrew
+# Date 1518667645 0
+# Thu Feb 15 04:07:25 2018 +0000
+# Node ID 1d35411eb7bdf16191e220ffe3b1dc4d5d0c6041
+# Parent 999983606f5c61b093c6f6316a7b26c4cd4ca79e
+8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
+Summary: Fix issue discovered by -Wreturn-type on systems without LP64.
+Reviewed-by: aph
+
+diff --git openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
+--- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
++++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
+@@ -457,6 +457,7 @@
+ long long unsigned int oldval,
+ long long unsigned int newval) {
+ ShouldNotCallThis();
++ return 0;
+ }
+ };
+ #endif // !_LP64
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+@@ -498,6 +498,7 @@
+ long long unsigned int oldval,
+ long long unsigned int newval) {
+ ShouldNotCallThis();
++ return 0;
+ }
+ };
+ #endif // !_LP64
diff --git a/jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch b/jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch
new file mode 100644
index 0000000..533ea2d
--- /dev/null
+++ b/jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch
@@ -0,0 +1,58 @@
+# HG changeset patch
+# User andrew
+# Date 1526122977 -3600
+# Sat May 12 12:02:57 2018 +0100
+# Node ID 00ccc73498628a51a45301322e64ce2ad06e49be
+# Parent aecf9f48f7b5c6148b62713a6b746301435b57cc
+PR3533: HotSpot generates code with unaligned stack, crashes on SSE operations
+Summary: Enable -mstackrealign on x86 Linux as well as x86 Mac OS X
+
+diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/flags.m4
+--- openjdk.orig///common/autoconf/flags.m4
++++ openjdk///common/autoconf/flags.m4
+@@ -389,6 +389,21 @@
+ AC_SUBST($2CXXSTD_CXXFLAG)
+ fi
+
++ #
++ # NOTE: check for -mstackrealign needs to be below potential addition of -m32
++ #
++ if test "x$OPENJDK_TARGET_CPU" = xx86 && test "x$OPENJDK_TARGET_OS" = xmacosx -o \
++ "x$OPENJDK_TARGET_OS" = xlinux; then
++ # On 32-bit MacOSX the OS requires C-entry points to be 16 byte aligned.
++ # While waiting for a better solution, the current workaround is to use -mstackrealign
++ # This is also required on Linux systems which use libraries compiled with SSE instructions
++ REALIGN_CFLAG="-mstackrealign"
++ FLAGS_COMPILER_CHECK_ARGUMENTS([$REALIGN_CFLAG -Werror], [],
++ AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.])
++ )
++ AC_SUBST([REALIGN_CFLAG])
++ fi
++
+ if test "x$CFLAGS" != "x${ADDED_CFLAGS}"; then
+ AC_MSG_WARN([Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags])
+ fi
+diff --git openjdk.orig///common/autoconf/hotspot-spec.gmk.in openjdk///common/autoconf/hotspot-spec.gmk.in
+--- openjdk.orig///common/autoconf/hotspot-spec.gmk.in
++++ openjdk///common/autoconf/hotspot-spec.gmk.in
+@@ -112,7 +112,8 @@
+ RC:=@HOTSPOT_RC@
+
+ EXTRA_CFLAGS=@LEGACY_EXTRA_CFLAGS@ $(NO_DELETE_NULL_POINTER_CHECKS_CFLAG) \
+- $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG)
++ $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG) \
++ $(REALIGN_CFLAG)
+ EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@
+ EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@
+
+diff --git openjdk.orig///common/autoconf/spec.gmk.in openjdk///common/autoconf/spec.gmk.in
+--- openjdk.orig///common/autoconf/spec.gmk.in
++++ openjdk///common/autoconf/spec.gmk.in
+@@ -334,6 +334,7 @@
+
+ NO_DELETE_NULL_POINTER_CHECKS_CFLAG=@NO_DELETE_NULL_POINTER_CHECKS_CFLAG@
+ NO_LIFETIME_DSE_CFLAG=@NO_LIFETIME_DSE_CFLAG@
++REALIGN_CFLAG=@REALIGN_CFLAG@
+ CXXSTD_CXXFLAG=@CXXSTD_CXXFLAG@
+
+ CXX:=@FIXPATH@ @CCACHE@ @CXX@
diff --git a/jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch b/jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch
new file mode 100644
index 0000000..7ac077b
--- /dev/null
+++ b/jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User andrew
+# Date 1526489197 -3600
+# Wed May 16 17:46:37 2018 +0100
+# Node ID 64e87a408afd2b56d59dad73dee28d4b99463810
+# Parent 00ccc73498628a51a45301322e64ce2ad06e49be
+PR3591: Fix for bug 3533 doesn't add -mstackrealign to JDK code
+
+diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/flags.m4
+--- openjdk.orig///common/autoconf/flags.m4
++++ openjdk///common/autoconf/flags.m4
+@@ -401,6 +401,8 @@
+ FLAGS_COMPILER_CHECK_ARGUMENTS([$REALIGN_CFLAG -Werror], [],
+ AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.])
+ )
++ CFLAGS_JDK="${CFLAGS_JDK} ${REALIGN_CFLAG}"
++ CXXFLAGS_JDK="${CXXFLAGS_JDK} ${REALIGN_CFLAG}"
+ AC_SUBST([REALIGN_CFLAG])
+ fi
+
diff --git a/jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch b/jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch
new file mode 100644
index 0000000..6e0d762
--- /dev/null
+++ b/jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch
@@ -0,0 +1,321 @@
+diff --git a/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp b/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
+@@ -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);
+diff --git a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
+@@ -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(
+diff --git a/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+@@ -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;
+ }
+@@ -4707,7 +4707,7 @@
+ // The > 0 check is to deal with the prev and next live bytes which
+ // could be 0.
+ if (*hum_bytes > 0) {
+- bytes = MIN2(HeapRegion::GrainBytes, *hum_bytes);
++ bytes = MIN2(HeapRegion::GrainBytes, (size_t)*hum_bytes);
+ *hum_bytes -= bytes;
+ }
+ return bytes;
+diff --git a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+@@ -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")
+diff --git a/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp b/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp
+@@ -117,7 +117,7 @@
+ return reserved_size() - committed_size();
+ }
+
+-size_t G1PageBasedVirtualSpace::addr_to_page_index(char* addr) const {
++uintptr_t G1PageBasedVirtualSpace::addr_to_page_index(char* addr) const {
+ return (addr - _low_boundary) / _page_size;
+ }
+
+diff --git a/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp b/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
+@@ -38,7 +38,7 @@
+ _cancel(false),
+ _empty(true),
+ _dropped(0) {
+- _nqueues = MAX2(ParallelGCThreads, (size_t)1);
++ _nqueues = MAX2(ParallelGCThreads, (uintx)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);
+diff --git a/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp b/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
+@@ -120,7 +120,7 @@
+ };
+
+ G1StringDedupEntryCache::G1StringDedupEntryCache(size_t max_size) :
+- _nlists(MAX2(ParallelGCThreads, (size_t)1)),
++ _nlists(MAX2(ParallelGCThreads, (uintx)1)),
+ _max_list_length(0),
+ _cached(PaddedArray<G1StringDedupEntryList, mtGC>::create_unfreeable((uint)_nlists)),
+ _overflowed(PaddedArray<G1StringDedupEntryList, mtGC>::create_unfreeable((uint)_nlists)) {
+diff --git a/src/share/vm/gc_implementation/g1/heapRegion.cpp b/src/share/vm/gc_implementation/g1/heapRegion.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
+@@ -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());
++ HeapRegionBounds::min_size());
+ }
+
+ int region_size_log = log2_long((jlong) region_size);
+diff --git a/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp b/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
+@@ -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.
+diff --git a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
+@@ -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);
+diff --git a/src/share/vm/memory/collectorPolicy.cpp b/src/share/vm/memory/collectorPolicy.cpp
+--- openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
++++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
+@@ -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,24 +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");
+ _initial_gen0_size = desired_new_size;
+@@ -573,7 +572,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
+diff --git a/src/share/vm/memory/metaspace.cpp b/src/share/vm/memory/metaspace.cpp
+--- openjdk/hotspot/src/share/vm/memory/metaspace.cpp
++++ openjdk/hotspot/src/share/vm/memory/metaspace.cpp
+@@ -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"
+@@ -3285,7 +3285,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.
+diff --git a/src/share/vm/memory/threadLocalAllocBuffer.cpp b/src/share/vm/memory/threadLocalAllocBuffer.cpp
+--- openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
++++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
+@@ -238,13 +238,13 @@
+ size_t init_sz = 0;
+
+ if (TLABSize > 0) {
+- init_sz = TLABSize / HeapWordSize;
++ init_sz = (size_t)(TLABSize / HeapWordSize);
+ } else if (global_stats() != NULL) {
+ // Initial size is a function of the average number of allocating threads.
+ unsigned nof_threads = global_stats()->allocating_threads_avg();
+
+- init_sz = (Universe::heap()->tlab_capacity(myThread()) / HeapWordSize) /
+- (nof_threads * target_refills());
++ init_sz = (size_t)((Universe::heap()->tlab_capacity(myThread()) / HeapWordSize) /
++ (nof_threads * target_refills()));
+ init_sz = align_object_size(init_sz);
+ }
+ init_sz = MIN2(MAX2(init_sz, min_size()), max_size());
+diff --git a/src/share/vm/oops/objArrayKlass.inline.hpp b/src/share/vm/oops/objArrayKlass.inline.hpp
+--- openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp
++++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp
+@@ -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;
+diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp
+--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+@@ -1283,7 +1283,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);
+ }
+@@ -1308,8 +1308,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);
+@@ -1319,7 +1319,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((size_t)(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);
diff --git a/jdk8207057-pr3613-no_debug_info_for_assembler_files_hotspot.patch b/jdk8207057-pr3613-no_debug_info_for_assembler_files_hotspot.patch
new file mode 100644
index 0000000..c61d972
--- /dev/null
+++ b/jdk8207057-pr3613-no_debug_info_for_assembler_files_hotspot.patch
@@ -0,0 +1,13 @@
+--- openjdk/hotspot/make/linux/makefiles/gcc.make 2018-09-17 15:40:56.933127667 +0200
++++ openjdk/hotspot/make/linux/makefiles/gcc.make 2018-09-17 15:40:56.831127850 +0200
+@@ -184,6 +184,10 @@
+ LFLAGS += $(ARCHFLAG)
+ ASFLAGS += $(ARCHFLAG)
+
++ifeq ($(DEBUG_BINARIES), true)
++ ASFLAGS += $(ASFLAGS_DEBUG_SYMBOLS)
++endif
++
+ # Use C++ Interpreter
+ ifdef CC_INTERP
+ CFLAGS += -DCC_INTERP
diff --git a/jdk8207057-pr3613-no_debug_info_for_assembler_files_root.patch b/jdk8207057-pr3613-no_debug_info_for_assembler_files_root.patch
new file mode 100644
index 0000000..e4a007c
--- /dev/null
+++ b/jdk8207057-pr3613-no_debug_info_for_assembler_files_root.patch
@@ -0,0 +1,52 @@
+diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/flags.m4
+--- openjdk.orig///common/autoconf/flags.m4
++++ openjdk///common/autoconf/flags.m4
+@@ -282,9 +282,11 @@
+ if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
+ CFLAGS_DEBUG_SYMBOLS="-g1"
+ CXXFLAGS_DEBUG_SYMBOLS="-g1"
++ ASFLAGS_DEBUG_SYMBOLS="-g1"
+ else
+ CFLAGS_DEBUG_SYMBOLS="-g"
+ CXXFLAGS_DEBUG_SYMBOLS="-g"
++ ASFLAGS_DEBUG_SYMBOLS="-g"
+ fi
+ elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
+ CFLAGS_DEBUG_SYMBOLS="-g -xs"
+@@ -295,6 +297,7 @@
+ fi
+ AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
+ AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
++ AC_SUBST(ASFLAGS_DEBUG_SYMBOLS)
+
+ # Optimization levels
+ if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
+diff --git openjdk.orig///common/autoconf/spec.gmk.in openjdk///common/autoconf/spec.gmk.in
+--- openjdk.orig///common/autoconf/spec.gmk.in
++++ openjdk///common/autoconf/spec.gmk.in
+@@ -414,6 +414,7 @@
+ # Options for generating debug symbols
+ ENABLE_DEBUG_SYMBOLS:=@ENABLE_DEBUG_SYMBOLS@
+ CFLAGS_DEBUG_SYMBOLS:=@CFLAGS_DEBUG_SYMBOLS@
++ASFLAGS_DEBUG_SYMBOLS:=@ASFLAGS_DEBUG_SYMBOLS@
+ CXXFLAGS_DEBUG_SYMBOLS:=@CXXFLAGS_DEBUG_SYMBOLS@
+ ZIP_DEBUGINFO_FILES:=@ZIP_DEBUGINFO_FILES@
+ STRIP_POLICY:=@STRIP_POLICY@
+diff --git openjdk.orig///make/common/NativeCompilation.gmk openjdk///make/common/NativeCompilation.gmk
+--- openjdk.orig///make/common/NativeCompilation.gmk
++++ openjdk///make/common/NativeCompilation.gmk
+@@ -351,12 +351,14 @@
+ # Always add debug symbols
+ $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
+ $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
++ $1_EXTRA_ASFLAGS+=$(ASFLAGS_DEBUG_SYMBOLS)
+ else
+ # Programs don't get the debug symbols added in the old build. It's not clear if
+ # this is intentional.
+ ifeq ($$($1_PROGRAM),)
+ $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
+ $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
++ $1_EXTRA_ASFLAGS+=$(ASFLAGS_DEBUG_SYMBOLS)
+ endif
+ endif
+ endif
diff --git a/jdk8209639-rh1640127-02-coalesce_attempted_spill_non_spillable.patch b/jdk8209639-rh1640127-02-coalesce_attempted_spill_non_spillable.patch
new file mode 100644
index 0000000..63c9cba
--- /dev/null
+++ b/jdk8209639-rh1640127-02-coalesce_attempted_spill_non_spillable.patch
@@ -0,0 +1,114 @@
+
+# HG changeset patch
+# User roland
+# Date 1540370574 -7200
+# Node ID d853bac073f8a4851e313ba8fa9768b38396a204
+# Parent e044997c2edaeae97866394a7f8e2ddebbd41392
+8209639: assert failure in coalesce.cpp: attempted to spill a non-spillable item
+Reviewed-by: neliasso, kvn
+
+diff -r e044997c2eda -r d853bac073f8 src/share/vm/opto/coalesce.cpp
+--- openjdk/hotspot/src/share/vm/opto/coalesce.cpp Mon Oct 15 11:00:27 2018 +0200
++++ openjdk/hotspot/src/share/vm/opto/coalesce.cpp Wed Oct 24 10:42:54 2018 +0200
+@@ -25,6 +25,7 @@
+ #include "precompiled.hpp"
+ #include "memory/allocation.inline.hpp"
+ #include "opto/block.hpp"
++#include "opto/c2compiler.hpp"
+ #include "opto/cfgnode.hpp"
+ #include "opto/chaitin.hpp"
+ #include "opto/coalesce.hpp"
+@@ -294,9 +295,13 @@
+ } else {
+ int ireg = m->ideal_reg();
+ if (ireg == 0 || ireg == Op_RegFlags) {
+- assert(false, err_msg("attempted to spill a non-spillable item: %d: %s, ireg = %d",
+- m->_idx, m->Name(), ireg));
+- C->record_method_not_compilable("attempted to spill a non-spillable item");
++ if (C->subsume_loads()) {
++ C->record_failure(C2Compiler::retry_no_subsuming_loads());
++ } else {
++ assert(false, err_msg("attempted to spill a non-spillable item: %d: %s, ireg = %d",
++ m->_idx, m->Name(), ireg));
++ C->record_method_not_compilable("attempted to spill a non-spillable item");
++ }
+ return;
+ }
+ const RegMask *rm = C->matcher()->idealreg2spillmask[ireg];
+diff -r e044997c2eda -r d853bac073f8 test/compiler/c2/SubsumingLoadsCauseFlagSpill.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/hotspot/test/compiler/c2/SubsumingLoadsCauseFlagSpill.java Wed Oct 24 10:42:54 2018 +0200
+@@ -0,0 +1,72 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ *
++ * 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.
++ */
++
++/**
++ * @test
++ * @bug 8209639
++ * @summary assert failure in coalesce.cpp: attempted to spill a non-spillable item
++ *
++ * @run main/othervm -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,SubsumingLoadsCauseFlagSpill::not_inlined -Xmx1024m SubsumingLoadsCauseFlagSpill
++ *
++ */
++
++public class SubsumingLoadsCauseFlagSpill {
++ private static Object field;
++ private static boolean do_throw;
++ private static volatile boolean barrier;
++
++ public static void main(String[] args) {
++ for (int i = 0; i < 20_000; i++) {
++ do_throw = true;
++ field = null;
++ test(0);
++ do_throw = false;
++ field = new Object();
++ test(0);
++ }
++ }
++
++ private static float test(float f) {
++ Object v = null;
++ try {
++ not_inlined();
++ v = field;
++ } catch (MyException me) {
++ v = field;
++ barrier = true;
++ }
++ if (v == null) {
++ return f * f;
++ }
++ return f;
++ }
++
++ private static void not_inlined() throws MyException{
++ if (do_throw) {
++ throw new MyException();
++ }
++ }
++
++ private static class MyException extends Throwable {
++ }
++}
+
diff --git a/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch b/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch
new file mode 100644
index 0000000..98bbad0
--- /dev/null
+++ b/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch
@@ -0,0 +1,57 @@
+diff --git openjdk.orig/jdk/make/lib/CoreLibraries.gmk openjdk/jdk/make/lib/CoreLibraries.gmk
+--- openjdk.orig/jdk/make/lib/CoreLibraries.gmk
++++ openjdk/jdk/make/lib/CoreLibraries.gmk
+@@ -37,21 +37,32 @@ ifeq ($(OPENJDK_TARGET_OS), solaris)
+ endif
+
+ ifeq ($(OPENJDK_TARGET_OS), linux)
+- ifeq ($(OPENJDK_TARGET_CPU), ppc64)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- else ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- else ifeq ($(OPENJDK_TARGET_CPU), aarch64)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- endif
+-endif
+-
+-ifneq ($(OPENJDK_TARGET_OS), macosx)
++ BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
++ LIBFDLIBM_CFLAGS_LINUX := -ffp-contract=off
+ # Unfortunately, '-ffp-contract' is only available since gcc 4.6. For ppc64le
+ # that's no problem since ppc64le support only appeared in gcc 4.8.3. But on
+ # ppc64 (big endian) we traditionally compiled with gcc 4.3 which only knows
+ # '-mno-fused-madd'. However, that's still not enough to get the float
+ # computations right - we additionally have to supply '-fno-strict-aliasing'.
++ #
++ #
++ ifeq ($(TOOLCHAIN_TYPE), gcc)
++ CC_VER_MAJOR := $(shell $(CC) -dumpversion | cut -d'.' -f1)
++ CC_VER_MINOR := $(shell $(CC) -dumpversion | cut -d'.' -f2)
++ endif
++ # Only GCC 4.6 and better have machine independent -ffp-contract=off.
++ # For other versions we need to explicitly set arch specific machine
++ # flags or keep optimization off.
++ ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 6 \) \))" "0"
++ ifeq ($(OPENJDK_TARGET_CPU), ppc64)
++ LIBFDLIBM_CFLAGS_LINUX := -mno-fused-madd -fno-strict-aliasing
++ else
++ BUILD_LIBFDLIBM_OPTIMIZATION := NONE
++ endif
++ endif
++endif
++
++ifneq ($(OPENJDK_TARGET_OS), macosx)
+ $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM, \
+ STATIC_LIBRARY := fdlibm, \
+ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
+@@ -62,9 +73,7 @@ ifneq ($(OPENJDK_TARGET_OS), macosx)
+ -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \
+ CFLAGS_windows_debug := -DLOGGING, \
+ CFLAGS_aix := -qfloat=nomaf, \
+- CFLAGS_linux_ppc64 := -mno-fused-madd -fno-strict-aliasing, \
+- CFLAGS_linux_ppc64le := -ffp-contract=off, \
+- CFLAGS_linux_aarch64 := -ffp-contract=off, \
++ CFLAGS_linux := $(LIBFDLIBM_CFLAGS_LINUX), \
+ ARFLAGS := $(ARFLAGS), \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
diff --git a/jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch b/jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch
new file mode 100644
index 0000000..0b05ba6
--- /dev/null
+++ b/jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch
@@ -0,0 +1,83 @@
+diff --git openjdk.orig/hotspot/make/linux/makefiles/amd64.make openjdk/hotspot/make/linux/makefiles/amd64.make
+--- openjdk.orig/hotspot/make/linux/makefiles/amd64.make
++++ openjdk/hotspot/make/linux/makefiles/amd64.make
+@@ -22,10 +22,13 @@
+ #
+ #
+
+-# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+-# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++ifeq ($(OPT_CFLAGS_NO_FMA),)
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++else
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++endif
+ # Must also specify if CPU is little endian
+ CFLAGS += -DVM_LITTLE_ENDIAN
+
+diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
++++ openjdk/hotspot/make/linux/makefiles/gcc.make
+@@ -225,6 +225,16 @@
+ OPT_CFLAGS/SIZE=-Os
+ OPT_CFLAGS/SPEED=-O3
+
++ifeq ($(USE_CLANG),)
++ # Only GCC 4.6 and better have machine independent -ffp-contract=off.
++ # For other versions we need to explicitly set arch specific machine
++ # flags or keep optimization off for them.
++ ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 6 \) \))" "1"
++ OPT_CFLAGS_NO_FMA = -ffp-contract=off
++ endif
++endif
++
++
+ # Hotspot uses very unstrict aliasing turn this optimization off
+ # This option is added to CFLAGS rather than OPT_CFLAGS
+ # so that OPT_CFLAGS overrides get this option too.
+diff --git openjdk.orig/hotspot/make/linux/makefiles/i486.make openjdk/hotspot/make/linux/makefiles/i486.make
+--- openjdk.orig/hotspot/make/linux/makefiles/i486.make
++++ openjdk/hotspot/make/linux/makefiles/i486.make
+@@ -24,10 +24,13 @@
+
+ # TLS helper, assembled from .s file
+
+-# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+-# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++ifeq ($(OPT_CFLAGS_NO_FMA),)
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++else
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++endif
+ # Must also specify if CPU is little endian
+ CFLAGS += -DVM_LITTLE_ENDIAN
+
+diff --git openjdk.orig/hotspot/make/linux/makefiles/ppc64.make openjdk/hotspot/make/linux/makefiles/ppc64.make
+--- openjdk.orig/hotspot/make/linux/makefiles/ppc64.make
++++ openjdk/hotspot/make/linux/makefiles/ppc64.make
+@@ -49,3 +49,17 @@
+ # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
+ CFLAGS += -mcpu=power7 -mtune=power8 -minsert-sched-nops=regroup_exact -mno-multiple -mno-string
+ endif
++
++ifeq ($(OPT_CFLAGS_NO_FMA),)
++ ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),big)
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) -mno-fused-madd -fno-strict-aliasing
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) -mno-fused-madd -fno-strict-aliasing
++ else
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++ endif
++else
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++endif
++
diff --git a/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch b/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch
new file mode 100644
index 0000000..cf1b40b
--- /dev/null
+++ b/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch
@@ -0,0 +1,22 @@
+diff --git openjdk.orig/hotspot/make/linux/makefiles/aarch64.make openjdk/hotspot/make/linux/makefiles/aarch64.make
+index 3d17326..7cdb498 100644
+--- openjdk.orig/hotspot/make/linux/makefiles/aarch64.make
++++ openjdk/hotspot/make/linux/makefiles/aarch64.make
+@@ -22,10 +22,13 @@
+ #
+ #
+
+-# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+-# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++ifeq ($(OPT_CFLAGS_NO_FMA),)
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++else
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++endif
+ # Must also specify if CPU is little endian
+ CFLAGS += -DVM_LITTLE_ENDIAN
+
diff --git a/jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch b/jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch
new file mode 100644
index 0000000..6c1ebad
--- /dev/null
+++ b/jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch
@@ -0,0 +1,20 @@
+--- openjdk/hotspot/make/linux/makefiles/zeroshark.make
++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
+@@ -30,10 +30,13 @@ ifeq ($(USE_CLANG), true)
+ WARNING_FLAGS += -Wno-undef
+ endif
+
+-# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+-# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++ifeq ($(OPT_CFLAGS_NO_FMA),)
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++else
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++endif
+
+ # Specify that the CPU is little endian, if necessary
+ ifeq ($(ZERO_ENDIANNESS), little)
diff --git a/jdk8210647-rh1632174-libsaproc_is_being_compiled_without_optimization.patch b/jdk8210647-rh1632174-libsaproc_is_being_compiled_without_optimization.patch
new file mode 100644
index 0000000..0ab09e4
--- /dev/null
+++ b/jdk8210647-rh1632174-libsaproc_is_being_compiled_without_optimization.patch
@@ -0,0 +1,23 @@
+diff --git openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
++++ openjdk/hotspot/make/linux/makefiles/saproc.make
+@@ -59,6 +59,11 @@
+ SA_DEBUG_CFLAGS = -g
+ endif
+
++# Optimize saproc lib at level -O3 unless it's a slowdebug build
++ifneq ($(DEBUG_LEVEL), slowdebug)
++ SA_OPT_FLAGS = $(OPT_CFLAGS)
++endif
++
+ # if $(AGENT_DIR) does not exist, we don't build SA
+ # also, we don't build SA on Itanium or zero.
+
+@@ -95,6 +100,7 @@
+ $(SASRCFILES) \
+ $(SA_LFLAGS) \
+ $(SA_DEBUG_CFLAGS) \
++ $(SA_OPT_FLAGS) \
+ $(EXTRA_CFLAGS) \
+ -o $@ \
+ -lthread_db
diff --git a/jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch b/jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch
new file mode 100644
index 0000000..be2650b
--- /dev/null
+++ b/jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1537541916 -7200
+# Fri Sep 21 16:58:36 2018 +0200
+# Node ID 4010c90156d1bfeaf988dbfeb01520f2e3a66ea8
+# Parent 54afe70c50b6a6685763d00883e5173c0ba3a19d
+8210761: libjsig is being compiled without optimization
+Reviewed-by: erikj, ihse
+
+diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
+--- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
++++ openjdk/hotspot/make/linux/makefiles/jsig.make
+@@ -51,10 +51,15 @@
+ JSIG_DEBUG_CFLAGS = -g
+ endif
+
++# Optimize jsig lib at level -O3 unless it's a slowdebug build
++ifneq ($(DEBUG_LEVEL), slowdebug)
++ JSIG_OPT_FLAGS = $(OPT_CFLAGS)
++endif
++
+ $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
+ @echo Making signal interposition lib...
+ $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
+- $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
++ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(JSIG_OPT_FLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifneq ($(STRIP_POLICY),no_strip)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
diff --git a/jstack-pr1845.patch b/jstack-pr1845.patch
deleted file mode 100644
index 5d036ba..0000000
--- a/jstack-pr1845.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-diff -r c728621e76f2 tapset/jstack.stp.in
---- tapset/jstack-1.8.0.stp.in Mon Jun 02 18:41:24 2014 +0100
-+++ tapset/jstack-1.8.0.stp.in Sat Jun 14 00:21:14 2014 +0900
-@@ -45,11 +45,7 @@
- semantic error: failed to retrieve location attribute for local
- */
-
--global Universe_methodKlassObj;
--global Universe_collectedHeap;
--global HeapWordSize;
- global CodeCache_heap;
--global NarrowOopStruct;
-
- global sp_register;
- global fp_register;
-@@ -57,9 +53,8 @@
- global ptr_size;
- global ptr_mask;
-
--global constantPoolOopDesc_size;
-+global constantPool_size;
- global HeapBlock_Header_size;
--global oopDesc_size;
-
- global vm_inited;
-
-@@ -67,26 +62,6 @@
- in a bare function and vm_init_end seems a good place to use. */
- probe hotspot.vm_init_end
- {
-- // The parent/type oop for a methodOop.
-- Universe_methodKlassObj[pid()] = %( systemtap_v >= "1.8"
-- %? @var("_methodKlassObj(a)universe.cpp")
-- %: $_methodKlassObj %);
--
-- /**
-- * The Universe class holds some of the interesting statics for
-- * introspection into HotSpot. The CollectedHeap
-- * (Universe::_collectedHeap) is an abstraction of a java heap for Hotspot
-- * it contains a _reserved MemRegion which represents a contigous
-- * region of the address space consisting of HeapWords (which just
-- * have one field member char *i).
-- *
-- * Note that we access it through its "short name" _collectedHeap.
-- */
-- Universe_collectedHeap[pid()] = %( systemtap_v >= "1.8"
-- %? @var("_collectedHeap(a)universe.cpp")
-- %: $_collectedHeap %);
-- HeapWordSize[pid()] = $HeapWordSize;
--
- /**
- * The CodeCache class contains the static CodeHeap _heap that
- * is malloced at the start of the vm run and holds all generated
-@@ -107,17 +82,6 @@
- %? @var("_heap(a)codeCache.cpp")
- %: $_heap %);
-
-- /**
-- * Does target process use CompressedOops ?
-- */
-- NarrowOopStruct[pid()] = 0;
-- %( systemtap_v >= "1.8"
-- %? if (@var("UseCompressedOops(a)globals.cpp"))
-- NarrowOopStruct[pid()] = &@var("_narrow_oop(a)universe.cpp");
-- %: if($UseCompressedOops)
-- NarrowOopStruct[pid()] = $_narrow_oop;
-- %)
--
- // Should really check arch of user space (for 32bit jvm on 64bit kernel).
- %( arch == "i386" %?
- sp_register = "esp";
-@@ -136,22 +100,17 @@
-
- // Pretend we have an array at address zero and take address of second
- // element and we have the size.
-- constantPoolOopDesc_size = &@cast(0, "constantPoolOopDesc")[1];
-+ constantPool_size = &@cast(0, "ConstantPool")[1];
-
- // Really should get from dwarf: @size("HeapBlock::Header"), @size("oopDesc")
- HeapBlock_Header_size = 2 * ptr_size;
-- oopDesc_size = 2 * ptr_size;
-
- vm_inited[pid()] = 1;
- }
-
- probe hotspot.vm_shutdown
- {
-- delete(Universe_methodKlassObj[pid()]);
-- delete(Universe_collectedHeap[pid()]);
-- delete(HeapWordSize[pid()]);
- delete(CodeCache_heap[pid()]);
-- delete(NarrowOopStruct[pid()]);
- delete(vm_inited[pid()]);
- }
-
-@@ -262,15 +221,7 @@
- return frame;
- }
-
-- // Extract heap and code bounds.
-- heap_start = @cast(Universe_collectedHeap[pid()],
-- "CollectedHeap",
-- "@ABS_SERVER_LIBJVM_SO@")->_reserved->_start;
-- heap_size = HeapWordSize[pid()] * @cast(Universe_collectedHeap[pid()],
-- "CollectedHeap",
-- "@ABS_SERVER_LIBJVM_SO@")->_reserved->_word_size;
-- heap_end = heap_start + heap_size;
--
-+ // Extract code bounds.
- CodeCache_low = @cast(CodeCache_heap[pid()], "CodeHeap",
- "@ABS_SERVER_LIBJVM_SO@")->_memory->_low;
- CodeCache_high = @cast(CodeCache_heap[pid()], "CodeHeap",
-@@ -351,105 +302,69 @@
- // For the interpreter (and other code blobs) it is on the
- // stack relative to the frame pointer.
- if (blob_name == "nmethod")
-- methodOopPtr = @cast(blob, "nmethod",
-+ methodPtr = @cast(blob, "nmethod",
- "@ABS_SERVER_LIBJVM_SO@")->_method
- else
-- methodOopPtr = user_long(fp + (-3 * ptr_size)) & ptr_mask
--
-- // Start optimistic. A methodOop is only valid if it was
-- // heap allocated. And if the "type class" oop equals the
-- // Universe::methodKlassObj.
-- if (heap_start > methodOopPtr || methodOopPtr >= heap_end)
-- isMethodOop = 0
-- else
-- {
-- if (NarrowOopStruct[pid()])
-- {
-- methodOopKlass = @cast(methodOopPtr, "methodOopDesc",
-- "@ABS_SERVER_LIBJVM_SO@")->_metadata->_compressed_klass;
-- methodOopKlass = (@cast(NarrowOopStruct[pid()],
-- "NarrowOopStruct",
-- "@ABS_SERVER_LIBJVM_SO@")->_base
-- + (methodOopKlass
-- << @cast(NarrowOopStruct[pid()],
-- "NarrowOopStruct",
-- "@ABS_SERVER_LIBJVM_SO@")->_shift));
-- }
-- else
-- methodOopKlass = @cast(methodOopPtr, "methodOopDesc",
-- "@ABS_SERVER_LIBJVM_SO@")->_metadata->_klass;
-+ methodPtr = user_long(fp + (-3 * ptr_size)) & ptr_mask
-
-- isMethodOop = (methodOopKlass == Universe_methodKlassObj[pid()]);
-- }
-+ // The java class is the holder of the constants (strings)
-+ // that describe the method and signature. This constant pool
-+ // contains symbolic information that describe the properties
-+ // of the class. The indexes for methods and signaturates in
-+ // the constant pool are Symbols that contain utf8
-+ // strings (plus lenghts). (We could also sanity check that
-+ // the tag value is correct [CONSTANT_String = 8]).
-+ // Note that the class name uses '/' instead of '.' as
-+ // package name separator and that the method signature is
-+ // encoded as a method descriptor string. Both of which we
-+ // don't demangle here.
-+ constMethod = @cast(methodPtr, "Method",
-+ "@ABS_SERVER_LIBJVM_SO@")->_constMethod;
-+ constantPool = @cast(constMethod, "ConstMethod",
-+ "@ABS_SERVER_LIBJVM_SO@")->_constants;
-+ constantPool_base = constantPool + constantPool_size;
-+
-+ klass = @cast(constantPool, "ConstantPool",
-+ "@ABS_SERVER_LIBJVM_SO@")->_pool_holder;
-+ klassSymbol = @cast(klass, "Klass",
-+ "@ABS_SERVER_LIBJVM_SO@")->_name;
-+ klassName = &@cast(klassSymbol, "Symbol",
-+ "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-+ klassLength = @cast(klassSymbol, "Symbol",
-+ "@ABS_SERVER_LIBJVM_SO@")->_length;
-+
-+ methodIndex = @cast(constMethod, "ConstMethod",
-+ "@ABS_SERVER_LIBJVM_SO@")->_name_index;
-+ methodSymbol = user_long(constantPool_base + (methodIndex * ptr_size));
-+ methodName = &@cast(methodSymbol, "Symbol",
-+ "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-+ methodLength = @cast(methodSymbol, "Symbol",
-+ "@ABS_SERVER_LIBJVM_SO@")->_length;
-
-- if (isMethodOop)
-+ if (log_sig)
- {
-- // The java class is the holder of the constants (strings)
-- // that describe the method and signature. This constant pool
-- // contains symbolic information that describe the properties
-- // of the class. The indexes for methods and signaturates in
-- // the constant pool are Symbols that contain utf8
-- // strings (plus lenghts). (We could also sanity check that
-- // the tag value is correct [CONSTANT_String = 8]).
-- // Note that the class name uses '/' instead of '.' as
-- // package name separator and that the method signature is
-- // encoded as a method descriptor string. Both of which we
-- // don't demangle here.
-- constantPoolOopDesc = @cast(methodOopPtr, "methodOopDesc",
-- "@ABS_SERVER_LIBJVM_SO@")->_constants;
-- constantPoolOop_base = constantPoolOopDesc + constantPoolOopDesc_size;
--
-- klassPtr = @cast(constantPoolOopDesc, "constantPoolOopDesc",
-- "@ABS_SERVER_LIBJVM_SO@")->_pool_holder;
-- klassSymbol = @cast(klassPtr + oopDesc_size, "Klass",
-- "@ABS_SERVER_LIBJVM_SO@")->_name;
-- klassName = &@cast(klassSymbol, "Symbol",
-- "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-- klassLength = @cast(klassSymbol, "Symbol",
-- "@ABS_SERVER_LIBJVM_SO@")->_length;
--
-- methodIndex = @cast(methodOopPtr, "methodOopDesc",
-- "@ABS_SERVER_LIBJVM_SO@")->_constMethod->_name_index;
-- methodOopDesc = user_long(constantPoolOop_base + (methodIndex * ptr_size)) - 1;
-- methodName = &@cast(methodOopDesc, "Symbol",
-- "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-- methodLength = @cast(methodOopDesc, "Symbol",
-- "@ABS_SERVER_LIBJVM_SO@")->_length;
--
-- if (log_sig)
-- {
-- sigIndex = @cast(methodOopPtr, "methodOopDesc",
-- "@ABS_SERVER_LIBJVM_SO@")->_constMethod->_signature_index;
-- sigOopDesc = user_long(constantPoolOop_base
-- + (sigIndex * ptr_size)) - 1;
-- sigName = &@cast(sigOopDesc, "Symbol",
-- "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-- sigLength = @cast(sigOopDesc, "Symbol",
-- "@ABS_SERVER_LIBJVM_SO@")->_length;
-- sig = user_string_n(sigName, sigLength);
-- }
-- else
-- sig = "";
--
-- code_name = (log_native
-- ? sprintf("<%s@0x%x>",
-- str_replace(blob_name, " ", "_"), pc)
-- : "");
--
-- frame = sprintf("%s.%s%s%s",
-- user_string_n(klassName, klassLength),
-- user_string_n(methodName, methodLength),
-- sig, code_name);
-+ sigIndex = @cast(constMethod, "ConstMethod",
-+ "@ABS_SERVER_LIBJVM_SO@")->_signature_index;
-+ sigSymbol = user_long(constantPool_base
-+ + (sigIndex * ptr_size));
-+ sigName = &@cast(sigSymbol, "Symbol",
-+ "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-+ sigLength = @cast(sigSymbol, "Symbol",
-+ "@ABS_SERVER_LIBJVM_SO@")->_length;
-+ sig = user_string_n(sigName, sigLength);
- }
- else
-- {
-- // This is probably just an internal function, not a java
-- // method, just print the blob_name and continue.
-- // fp is probably still trusted.
-- if (log_native)
-- frame = sprintf("<%s@0x%x>",
-- str_replace(blob_name, " ", "_"), pc);
-- }
-+ sig = "";
-+
-+ code_name = (log_native
-+ ? sprintf("<%s@0x%x>",
-+ str_replace(blob_name, " ", "_"), pc)
-+ : "");
-+
-+ frame = sprintf("%s.%s%s%s",
-+ user_string_n(klassName, klassLength),
-+ user_string_n(methodName, methodLength),
-+ sig, code_name);
-
- // We cannot trust the frame pointer of compiled methods.
- // The server (c2) jit compiler uses the fp register.
diff --git a/multiple-pkcs11-library-init.patch b/multiple-pkcs11-library-init.patch
deleted file mode 100644
index f1e8bc2..0000000
--- a/multiple-pkcs11-library-init.patch
+++ /dev/null
@@ -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 {
diff --git a/no_strict_overflow.patch b/no_strict_overflow.patch
deleted file mode 100644
index 53fa41c..0000000
--- a/no_strict_overflow.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -r 1fe56343ecc8 make/lib/Awt2dLibraries.gmk
---- openjdk/jdk/make/lib/Awt2dLibraries.gmk Tue Jan 12 21:01:12 2016 +0000
-+++ openjdk/jdk/make/lib/Awt2dLibraries.gmk Thu Jan 14 00:47:01 2016 +0000
-@@ -904,6 +904,12 @@
- BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
- endif
-
-+# Turn off strict overflow with GCC for IndicRearrangementProcessor.cpp
-+ifeq ($(OPENJDK_TARGET_OS), linux)
-+ BUILD_LIBFONTMANAGER_IndicRearrangementProcessor.cpp_CXXFLAGS := -fno-strict-overflow
-+ BUILD_LIBFONTMANAGER_IndicRearrangementProcessor2.cpp_CXXFLAGS := -fno-strict-overflow
-+endif
-+
- $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \
- LIBRARY := fontmanager, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
diff --git a/policytool.desktop.in b/policytool.desktop.in
index e05969d..e38c0ec 100644
--- a/policytool.desktop.in
+++ b/policytool.desktop.in
@@ -1,6 +1,6 @@
[Desktop Entry]
-Name=OpenJDK @JAVA_MAJOR_VERSION@ Policy Tool #ARCH#
-Comment=Manage OpenJDK @JAVA_MAJOR_VERSION@ policy files #ARCH#
+Name=OpenJDK @JAVA_MAJOR_VERSION@ Policy Tool @ARCH@
+Comment=Manage OpenJDK @JAVA_MAJOR_VERSION@ policy files @ARCH@
Exec=@JRE_HOME@/policytool
Icon=java-@JAVA_MAJOR_VERSION@-@JAVA_VENDOR@
Terminal=false
diff --git a/pr1834-rh1022017-reduce_ellipticcurvesextension_to_provide_only_three_nss_supported_nist_curves_23_24_25.patch b/pr1834-rh1022017-reduce_ellipticcurvesextension_to_provide_only_three_nss_supported_nist_curves_23_24_25.patch
new file mode 100644
index 0000000..8165340
--- /dev/null
+++ b/pr1834-rh1022017-reduce_ellipticcurvesextension_to_provide_only_three_nss_supported_nist_curves_23_24_25.patch
@@ -0,0 +1,28 @@
+diff --git a/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java b/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
+--- openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
++++ openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
+@@ -168,20 +168,10 @@
+ "contains no supported elliptic curves");
+ }
+ } else { // default curves
+- int[] ids;
+- if (requireFips) {
+- ids = new int[] {
+- // only NIST curves in FIPS mode
+- 23, 24, 25, 9, 10, 11, 12, 13, 14,
+- };
+- } else {
+- ids = new int[] {
+- // NIST curves first
+- 23, 24, 25, 9, 10, 11, 12, 13, 14,
+- // non-NIST curves
+- 22,
+- };
+- }
++ int[] ids = new int[] {
++ // NSS currently only supports these three NIST curves
++ 23, 24, 25
++ };
+
+ idList = new ArrayList<>(ids.length);
+ for (int curveId : ids) {
diff --git a/pr1834-rh1022017.patch b/pr1834-rh1022017.patch
deleted file mode 100644
index 8165340..0000000
--- a/pr1834-rh1022017.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java b/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
---- openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
-+++ openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
-@@ -168,20 +168,10 @@
- "contains no supported elliptic curves");
- }
- } else { // default curves
-- int[] ids;
-- if (requireFips) {
-- ids = new int[] {
-- // only NIST curves in FIPS mode
-- 23, 24, 25, 9, 10, 11, 12, 13, 14,
-- };
-- } else {
-- ids = new int[] {
-- // NIST curves first
-- 23, 24, 25, 9, 10, 11, 12, 13, 14,
-- // non-NIST curves
-- 22,
-- };
-- }
-+ int[] ids = new int[] {
-+ // NSS currently only supports these three NIST curves
-+ 23, 24, 25
-+ };
-
- idList = new ArrayList<>(ids.length);
- for (int curveId : ids) {
diff --git a/pr1983-jdk.patch b/pr1983-jdk.patch
deleted file mode 100644
index 673b8a9..0000000
--- a/pr1983-jdk.patch
+++ /dev/null
@@ -1,694 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1453863246 0
-# Wed Jan 27 02:54:06 2016 +0000
-# Node ID 48c15869ecd568263249af4b9a4e98d4e57f9a8f
-# Parent afd392dfaed501ac674a7cc3e37353ce300969c7
-PR1983: Support using the system installation of NSS with the SunEC provider
-Summary: Apply code changes from PR1699 & PR1742 & forward-port Makefile changes to the new build.
-Updated 2017/07/04 to accomodate 8175110
-
-diff -r 984a4af2ed4e make/lib/SecurityLibraries.gmk
---- openjdk/jdk/make/lib/SecurityLibraries.gmk
-+++ openjdk/jdk/make/lib/SecurityLibraries.gmk
-@@ -218,8 +218,17 @@
-
- ifeq ($(ENABLE_INTREE_EC), yes)
-
-- BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec \
-+ BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec
-+
-+ ifeq ($(USE_EXTERNAL_NSS), true)
-+ BUILD_LIBSUNEC_IMPL_DIR :=
-+ BUILD_LIBSUNEC_FLAGS += $(NSS_CFLAGS) -DSYSTEM_NSS -DNSS_ENABLE_ECC
-+ else
-+ BUILD_LIBSUNEC_IMPL_DIR := \
-+ $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
-+ BUILD_LIBSUNEC_FLAGS += \
- -I$(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
-+ endif
-
- #
- # On sol-sparc...all libraries are compiled with -xregs=no%appl
-@@ -235,8 +244,8 @@
- $(eval $(call SetupNativeCompilation,BUILD_LIBSUNEC, \
- LIBRARY := sunec, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-- SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec \
-- $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl, \
-+ SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec/ECC_JNI.cpp \
-+ $(BUILD_LIBSUNEC_IMPL_DIR), \
- LANG := C++, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \
-@@ -248,8 +257,8 @@
- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
- LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(LIBCXX), \
-- LDFLAGS_SUFFIX_linux := -lc, \
-- LDFLAGS_SUFFIX_solaris := -lc, \
-+ LDFLAGS_SUFFIX_linux := -lc $(NSS_LIBS), \
-+ LDFLAGS_SUFFIX_solaris := -lc $(NSS_LIBS), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=sunec.dll" \
-diff -r 984a4af2ed4e src/share/native/sun/security/ec/ECC_JNI.cpp
---- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
-+++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
-@@ -24,7 +24,7 @@
- */
-
- #include <jni.h>
--#include "impl/ecc_impl.h"
-+#include "ecc_impl.h"
-
- #define ILLEGAL_STATE_EXCEPTION "java/lang/IllegalStateException"
- #define INVALID_ALGORITHM_PARAMETER_EXCEPTION \
-@@ -89,7 +89,7 @@
- */
- JNIEXPORT jobjectArray
- JNICALL Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair
-- (JNIEnv *env, jclass clazz, jint keySize, jbyteArray encodedParams, jbyteArray seed)
-+ (JNIEnv *env, jclass UNUSED(clazz), jint UNUSED(keySize), jbyteArray encodedParams, jbyteArray seed)
- {
- ECPrivateKey *privKey = NULL; // contains both public and private values
- ECParams *ecparams = NULL;
-@@ -190,7 +190,7 @@
- */
- JNIEXPORT jbyteArray
- JNICALL Java_sun_security_ec_ECDSASignature_signDigest
-- (JNIEnv *env, jclass clazz, jbyteArray digest, jbyteArray privateKey, jbyteArray encodedParams, jbyteArray seed, jint timing)
-+ (JNIEnv *env, jclass UNUSED(clazz), jbyteArray digest, jbyteArray privateKey, jbyteArray encodedParams, jbyteArray seed, jint timing)
- {
- jbyte* pDigestBuffer = NULL;
- jint jDigestLength = env->GetArrayLength(digest);
-@@ -299,7 +299,7 @@
- */
- JNIEXPORT jboolean
- JNICALL Java_sun_security_ec_ECDSASignature_verifySignedDigest
-- (JNIEnv *env, jclass clazz, jbyteArray signedDigest, jbyteArray digest, jbyteArray publicKey, jbyteArray encodedParams)
-+ (JNIEnv *env, jclass UNUSED(clazz), jbyteArray signedDigest, jbyteArray digest, jbyteArray publicKey, jbyteArray encodedParams)
- {
- jboolean isValid = false;
-
-@@ -384,7 +384,7 @@
- */
- JNIEXPORT jbyteArray
- JNICALL Java_sun_security_ec_ECDHKeyAgreement_deriveKey
-- (JNIEnv *env, jclass clazz, jbyteArray privateKey, jbyteArray publicKey, jbyteArray encodedParams)
-+ (JNIEnv *env, jclass UNUSED(clazz), jbyteArray privateKey, jbyteArray publicKey, jbyteArray encodedParams)
- {
- jbyteArray jSecret = NULL;
- ECParams *ecparams = NULL;
-diff -r 984a4af2ed4e src/share/native/sun/security/ec/ecc_impl.h
---- /dev/null
-+++ openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
-@@ -0,0 +1,298 @@
-+/*
-+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library 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
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * along with this library; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin Street, 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.
-+ */
-+
-+/* *********************************************************************
-+ *
-+ * The Original Code is the Netscape security libraries.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1994-2000
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Dr Vipul Gupta <vipul.gupta(a)sun.com> and
-+ * Douglas Stebila <douglas(a)stebila.ca>, Sun Microsystems Laboratories
-+ *
-+ * Last Modified Date from the Original Code: May 2017
-+ *********************************************************************** */
-+
-+#ifndef _ECC_IMPL_H
-+#define _ECC_IMPL_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include <sys/types.h>
-+
-+#ifdef SYSTEM_NSS
-+#include <secitem.h>
-+#include <secerr.h>
-+#include <keythi.h>
-+#ifdef LEGACY_NSS
-+#include <softoken.h>
-+#else
-+#include <blapi.h>
-+#endif
-+#else
-+#include "ecl-exp.h"
-+#endif
-+
-+/*
-+ * Multi-platform definitions
-+ */
-+#ifdef __linux__
-+#define B_FALSE FALSE
-+#define B_TRUE TRUE
-+typedef unsigned char uint8_t;
-+typedef unsigned long ulong_t;
-+typedef enum { B_FALSE, B_TRUE } boolean_t;
-+#endif /* __linux__ */
-+
-+#ifdef _ALLBSD_SOURCE
-+#include <stdint.h>
-+#define B_FALSE FALSE
-+#define B_TRUE TRUE
-+typedef unsigned long ulong_t;
-+typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
-+#endif /* _ALLBSD_SOURCE */
-+
-+#ifdef AIX
-+#define B_FALSE FALSE
-+#define B_TRUE TRUE
-+typedef unsigned char uint8_t;
-+typedef unsigned long ulong_t;
-+#endif /* AIX */
-+
-+#ifdef _WIN32
-+typedef unsigned char uint8_t;
-+typedef unsigned long ulong_t;
-+typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
-+#define strdup _strdup /* Replace POSIX name with ISO C++ name */
-+#endif /* _WIN32 */
-+
-+#ifndef _KERNEL
-+#include <stdlib.h>
-+#endif /* _KERNEL */
-+
-+#define EC_MAX_DIGEST_LEN 1024 /* max digest that can be signed */
-+#define EC_MAX_POINT_LEN 145 /* max len of DER encoded Q */
-+#define EC_MAX_VALUE_LEN 72 /* max len of ANSI X9.62 private value d */
-+#define EC_MAX_SIG_LEN 144 /* max signature len for supported curves */
-+#define EC_MIN_KEY_LEN 112 /* min key length in bits */
-+#define EC_MAX_KEY_LEN 571 /* max key length in bits */
-+#define EC_MAX_OID_LEN 10 /* max length of OID buffer */
-+
-+/*
-+ * Various structures and definitions from NSS are here.
-+ */
-+
-+#ifndef SYSTEM_NSS
-+#ifdef _KERNEL
-+#define PORT_ArenaAlloc(a, n, f) kmem_alloc((n), (f))
-+#define PORT_ArenaZAlloc(a, n, f) kmem_zalloc((n), (f))
-+#define PORT_ArenaGrow(a, b, c, d) NULL
-+#define PORT_ZAlloc(n, f) kmem_zalloc((n), (f))
-+#define PORT_Alloc(n, f) kmem_alloc((n), (f))
-+#else
-+#define PORT_ArenaAlloc(a, n, f) malloc((n))
-+#define PORT_ArenaZAlloc(a, n, f) calloc(1, (n))
-+#define PORT_ArenaGrow(a, b, c, d) NULL
-+#define PORT_ZAlloc(n, f) calloc(1, (n))
-+#define PORT_Alloc(n, f) malloc((n))
-+#endif
-+
-+#define PORT_NewArena(b) (char *)12345
-+#define PORT_ArenaMark(a) NULL
-+#define PORT_ArenaUnmark(a, b)
-+#define PORT_ArenaRelease(a, m)
-+#define PORT_FreeArena(a, b)
-+#define PORT_Strlen(s) strlen((s))
-+#define PORT_SetError(e)
-+
-+#define PRBool boolean_t
-+#define PR_TRUE B_TRUE
-+#define PR_FALSE B_FALSE
-+
-+#ifdef _KERNEL
-+#define PORT_Assert ASSERT
-+#define PORT_Memcpy(t, f, l) bcopy((f), (t), (l))
-+#else
-+#define PORT_Assert assert
-+#define PORT_Memcpy(t, f, l) memcpy((t), (f), (l))
-+#endif
-+
-+#endif
-+
-+#define CHECK_OK(func) if (func == NULL) goto cleanup
-+#define CHECK_SEC_OK(func) if (SECSuccess != (rv = func)) goto cleanup
-+
-+#ifndef SYSTEM_NSS
-+typedef enum {
-+ siBuffer = 0,
-+ siClearDataBuffer = 1,
-+ siCipherDataBuffer = 2,
-+ siDERCertBuffer = 3,
-+ siEncodedCertBuffer = 4,
-+ siDERNameBuffer = 5,
-+ siEncodedNameBuffer = 6,
-+ siAsciiNameString = 7,
-+ siAsciiString = 8,
-+ siDEROID = 9,
-+ siUnsignedInteger = 10,
-+ siUTCTime = 11,
-+ siGeneralizedTime = 12
-+} SECItemType;
-+
-+typedef struct SECItemStr SECItem;
-+
-+struct SECItemStr {
-+ SECItemType type;
-+ unsigned char *data;
-+ unsigned int len;
-+};
-+
-+typedef SECItem SECKEYECParams;
-+
-+typedef enum { ec_params_explicit,
-+ ec_params_named
-+} ECParamsType;
-+
-+typedef enum { ec_field_GFp = 1,
-+ ec_field_GF2m
-+} ECFieldType;
-+
-+struct ECFieldIDStr {
-+ int size; /* field size in bits */
-+ ECFieldType type;
-+ union {
-+ SECItem prime; /* prime p for (GFp) */
-+ SECItem poly; /* irreducible binary polynomial for (GF2m) */
-+ } u;
-+ int k1; /* first coefficient of pentanomial or
-+ * the only coefficient of trinomial
-+ */
-+ int k2; /* two remaining coefficients of pentanomial */
-+ int k3;
-+};
-+typedef struct ECFieldIDStr ECFieldID;
-+
-+struct ECCurveStr {
-+ SECItem a; /* contains octet stream encoding of
-+ * field element (X9.62 section 4.3.3)
-+ */
-+ SECItem b;
-+ SECItem seed;
-+};
-+typedef struct ECCurveStr ECCurve;
-+
-+typedef void PRArenaPool;
-+
-+struct ECParamsStr {
-+ PRArenaPool * arena;
-+ ECParamsType type;
-+ ECFieldID fieldID;
-+ ECCurve curve;
-+ SECItem base;
-+ SECItem order;
-+ int cofactor;
-+ SECItem DEREncoding;
-+ ECCurveName name;
-+ SECItem curveOID;
-+};
-+typedef struct ECParamsStr ECParams;
-+
-+struct ECPublicKeyStr {
-+ ECParams ecParams;
-+ SECItem publicValue; /* elliptic curve point encoded as
-+ * octet stream.
-+ */
-+};
-+typedef struct ECPublicKeyStr ECPublicKey;
-+
-+struct ECPrivateKeyStr {
-+ ECParams ecParams;
-+ SECItem publicValue; /* encoded ec point */
-+ SECItem privateValue; /* private big integer */
-+ SECItem version; /* As per SEC 1, Appendix C, Section C.4 */
-+};
-+typedef struct ECPrivateKeyStr ECPrivateKey;
-+
-+typedef enum _SECStatus {
-+ SECBufferTooSmall = -3,
-+ SECWouldBlock = -2,
-+ SECFailure = -1,
-+ SECSuccess = 0
-+} SECStatus;
-+#endif
-+
-+#ifdef _KERNEL
-+#define RNG_GenerateGlobalRandomBytes(p,l) ecc_knzero_random_generator((p), (l))
-+#else
-+/*
-+ This function is no longer required because the random bytes are now
-+ supplied by the caller. Force a failure.
-+*/
-+#define RNG_GenerateGlobalRandomBytes(p,l) SECFailure
-+#endif
-+#define CHECK_MPI_OK(func) if (MP_OKAY > (err = func)) goto cleanup
-+#define MP_TO_SEC_ERROR(err)
-+
-+#define SECITEM_TO_MPINT(it, mp) \
-+ CHECK_MPI_OK(mp_read_unsigned_octets((mp), (it).data, (it).len))
-+
-+extern int ecc_knzero_random_generator(uint8_t *, size_t);
-+extern ulong_t soft_nzero_random_generator(uint8_t *, ulong_t);
-+
-+#ifdef SYSTEM_NSS
-+#define EC_DecodeParams(a,b,c) EC_DecodeParams(a,b)
-+#define EC_NewKey(a,b,c,d,e) EC_NewKeyFromSeed(a,b,c,d)
-+#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigestWithSeed(a,b,c,d,e)
-+#define ECDSA_VerifyDigest(a,b,c,d) ECDSA_VerifyDigest(a,b,c)
-+#define ECDH_Derive(a,b,c,d,e,f) ECDH_Derive(a,b,c,d,e)
-+#else
-+extern SECStatus EC_DecodeParams(const SECItem *, ECParams **, int);
-+
-+extern SECItem * SECITEM_AllocItem(PRArenaPool *, SECItem *, unsigned int, int);
-+extern SECStatus SECITEM_CopyItem(PRArenaPool *, SECItem *, const SECItem *,
-+ int);
-+extern void SECITEM_FreeItem(SECItem *, boolean_t);
-+
-+/* This function has been modified to accept an array of random bytes */
-+extern SECStatus EC_NewKey(ECParams *ecParams, ECPrivateKey **privKey,
-+ const unsigned char* random, int randomlen, int);
-+/* This function has been modified to accept an array of random bytes */
-+extern SECStatus ECDSA_SignDigest(ECPrivateKey *, SECItem *, const SECItem *,
-+ const unsigned char* random, int randomlen, int, int timing);
-+extern SECStatus ECDSA_VerifyDigest(ECPublicKey *, const SECItem *,
-+ const SECItem *, int);
-+extern SECStatus ECDH_Derive(SECItem *, ECParams *, SECItem *, boolean_t,
-+ SECItem *, int);
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _ECC_IMPL_H */
-diff -r 984a4af2ed4e src/share/native/sun/security/ec/impl/ecc_impl.h
---- openjdk/jdk/src/share/native/sun/security/ec/impl/ecc_impl.h
-+++ /dev/null
-@@ -1,271 +0,0 @@
--/*
-- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
-- * Use is subject to license terms.
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2.1 of the License, or (at your option) any later version.
-- *
-- * This library 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
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this library; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin Street, 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.
-- */
--
--/* *********************************************************************
-- *
-- * The Original Code is the Netscape security libraries.
-- *
-- * The Initial Developer of the Original Code is
-- * Netscape Communications Corporation.
-- * Portions created by the Initial Developer are Copyright (C) 1994-2000
-- * the Initial Developer. All Rights Reserved.
-- *
-- * Contributor(s):
-- * Dr Vipul Gupta <vipul.gupta(a)sun.com> and
-- * Douglas Stebila <douglas(a)stebila.ca>, Sun Microsystems Laboratories
-- *
-- * Last Modified Date from the Original Code: May 2017
-- *********************************************************************** */
--
--#ifndef _ECC_IMPL_H
--#define _ECC_IMPL_H
--
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--#include <sys/types.h>
--#include "ecl-exp.h"
--
--/*
-- * Multi-platform definitions
-- */
--#ifdef __linux__
--#define B_FALSE FALSE
--#define B_TRUE TRUE
--typedef unsigned char uint8_t;
--typedef unsigned long ulong_t;
--typedef enum { B_FALSE, B_TRUE } boolean_t;
--#endif /* __linux__ */
--
--#ifdef _ALLBSD_SOURCE
--#include <stdint.h>
--#define B_FALSE FALSE
--#define B_TRUE TRUE
--typedef unsigned long ulong_t;
--typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
--#endif /* _ALLBSD_SOURCE */
--
--#ifdef AIX
--#define B_FALSE FALSE
--#define B_TRUE TRUE
--typedef unsigned char uint8_t;
--typedef unsigned long ulong_t;
--#endif /* AIX */
--
--#ifdef _WIN32
--typedef unsigned char uint8_t;
--typedef unsigned long ulong_t;
--typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
--#define strdup _strdup /* Replace POSIX name with ISO C++ name */
--#endif /* _WIN32 */
--
--#ifndef _KERNEL
--#include <stdlib.h>
--#endif /* _KERNEL */
--
--#define EC_MAX_DIGEST_LEN 1024 /* max digest that can be signed */
--#define EC_MAX_POINT_LEN 145 /* max len of DER encoded Q */
--#define EC_MAX_VALUE_LEN 72 /* max len of ANSI X9.62 private value d */
--#define EC_MAX_SIG_LEN 144 /* max signature len for supported curves */
--#define EC_MIN_KEY_LEN 112 /* min key length in bits */
--#define EC_MAX_KEY_LEN 571 /* max key length in bits */
--#define EC_MAX_OID_LEN 10 /* max length of OID buffer */
--
--/*
-- * Various structures and definitions from NSS are here.
-- */
--
--#ifdef _KERNEL
--#define PORT_ArenaAlloc(a, n, f) kmem_alloc((n), (f))
--#define PORT_ArenaZAlloc(a, n, f) kmem_zalloc((n), (f))
--#define PORT_ArenaGrow(a, b, c, d) NULL
--#define PORT_ZAlloc(n, f) kmem_zalloc((n), (f))
--#define PORT_Alloc(n, f) kmem_alloc((n), (f))
--#else
--#define PORT_ArenaAlloc(a, n, f) malloc((n))
--#define PORT_ArenaZAlloc(a, n, f) calloc(1, (n))
--#define PORT_ArenaGrow(a, b, c, d) NULL
--#define PORT_ZAlloc(n, f) calloc(1, (n))
--#define PORT_Alloc(n, f) malloc((n))
--#endif
--
--#define PORT_NewArena(b) (char *)12345
--#define PORT_ArenaMark(a) NULL
--#define PORT_ArenaUnmark(a, b)
--#define PORT_ArenaRelease(a, m)
--#define PORT_FreeArena(a, b)
--#define PORT_Strlen(s) strlen((s))
--#define PORT_SetError(e)
--
--#define PRBool boolean_t
--#define PR_TRUE B_TRUE
--#define PR_FALSE B_FALSE
--
--#ifdef _KERNEL
--#define PORT_Assert ASSERT
--#define PORT_Memcpy(t, f, l) bcopy((f), (t), (l))
--#else
--#define PORT_Assert assert
--#define PORT_Memcpy(t, f, l) memcpy((t), (f), (l))
--#endif
--
--#define CHECK_OK(func) if (func == NULL) goto cleanup
--#define CHECK_SEC_OK(func) if (SECSuccess != (rv = func)) goto cleanup
--
--typedef enum {
-- siBuffer = 0,
-- siClearDataBuffer = 1,
-- siCipherDataBuffer = 2,
-- siDERCertBuffer = 3,
-- siEncodedCertBuffer = 4,
-- siDERNameBuffer = 5,
-- siEncodedNameBuffer = 6,
-- siAsciiNameString = 7,
-- siAsciiString = 8,
-- siDEROID = 9,
-- siUnsignedInteger = 10,
-- siUTCTime = 11,
-- siGeneralizedTime = 12
--} SECItemType;
--
--typedef struct SECItemStr SECItem;
--
--struct SECItemStr {
-- SECItemType type;
-- unsigned char *data;
-- unsigned int len;
--};
--
--typedef SECItem SECKEYECParams;
--
--typedef enum { ec_params_explicit,
-- ec_params_named
--} ECParamsType;
--
--typedef enum { ec_field_GFp = 1,
-- ec_field_GF2m
--} ECFieldType;
--
--struct ECFieldIDStr {
-- int size; /* field size in bits */
-- ECFieldType type;
-- union {
-- SECItem prime; /* prime p for (GFp) */
-- SECItem poly; /* irreducible binary polynomial for (GF2m) */
-- } u;
-- int k1; /* first coefficient of pentanomial or
-- * the only coefficient of trinomial
-- */
-- int k2; /* two remaining coefficients of pentanomial */
-- int k3;
--};
--typedef struct ECFieldIDStr ECFieldID;
--
--struct ECCurveStr {
-- SECItem a; /* contains octet stream encoding of
-- * field element (X9.62 section 4.3.3)
-- */
-- SECItem b;
-- SECItem seed;
--};
--typedef struct ECCurveStr ECCurve;
--
--typedef void PRArenaPool;
--
--struct ECParamsStr {
-- PRArenaPool * arena;
-- ECParamsType type;
-- ECFieldID fieldID;
-- ECCurve curve;
-- SECItem base;
-- SECItem order;
-- int cofactor;
-- SECItem DEREncoding;
-- ECCurveName name;
-- SECItem curveOID;
--};
--typedef struct ECParamsStr ECParams;
--
--struct ECPublicKeyStr {
-- ECParams ecParams;
-- SECItem publicValue; /* elliptic curve point encoded as
-- * octet stream.
-- */
--};
--typedef struct ECPublicKeyStr ECPublicKey;
--
--struct ECPrivateKeyStr {
-- ECParams ecParams;
-- SECItem publicValue; /* encoded ec point */
-- SECItem privateValue; /* private big integer */
-- SECItem version; /* As per SEC 1, Appendix C, Section C.4 */
--};
--typedef struct ECPrivateKeyStr ECPrivateKey;
--
--typedef enum _SECStatus {
-- SECBufferTooSmall = -3,
-- SECWouldBlock = -2,
-- SECFailure = -1,
-- SECSuccess = 0
--} SECStatus;
--
--#ifdef _KERNEL
--#define RNG_GenerateGlobalRandomBytes(p,l) ecc_knzero_random_generator((p), (l))
--#else
--/*
-- This function is no longer required because the random bytes are now
-- supplied by the caller. Force a failure.
--*/
--#define RNG_GenerateGlobalRandomBytes(p,l) SECFailure
--#endif
--#define CHECK_MPI_OK(func) if (MP_OKAY > (err = func)) goto cleanup
--#define MP_TO_SEC_ERROR(err)
--
--#define SECITEM_TO_MPINT(it, mp) \
-- CHECK_MPI_OK(mp_read_unsigned_octets((mp), (it).data, (it).len))
--
--extern int ecc_knzero_random_generator(uint8_t *, size_t);
--extern ulong_t soft_nzero_random_generator(uint8_t *, ulong_t);
--
--extern SECStatus EC_DecodeParams(const SECItem *, ECParams **, int);
--extern SECItem * SECITEM_AllocItem(PRArenaPool *, SECItem *, unsigned int, int);
--extern SECStatus SECITEM_CopyItem(PRArenaPool *, SECItem *, const SECItem *,
-- int);
--extern void SECITEM_FreeItem(SECItem *, boolean_t);
--/* This function has been modified to accept an array of random bytes */
--extern SECStatus EC_NewKey(ECParams *ecParams, ECPrivateKey **privKey,
-- const unsigned char* random, int randomlen, int);
--/* This function has been modified to accept an array of random bytes */
--extern SECStatus ECDSA_SignDigest(ECPrivateKey *, SECItem *, const SECItem *,
-- const unsigned char* random, int randomlen, int, int timing);
--extern SECStatus ECDSA_VerifyDigest(ECPublicKey *, const SECItem *,
-- const SECItem *, int);
--extern SECStatus ECDH_Derive(SECItem *, ECParams *, SECItem *, boolean_t,
-- SECItem *, int);
--
--#ifdef __cplusplus
--}
--#endif
--
--#endif /* _ECC_IMPL_H */
-diff -r 984a4af2ed4e src/solaris/javavm/export/jni_md.h
---- openjdk/jdk/src/solaris/javavm/export/jni_md.h
-+++ openjdk/jdk/src/solaris/javavm/export/jni_md.h
-@@ -36,6 +36,11 @@
- #define JNIEXPORT
- #define JNIIMPORT
- #endif
-+#if (defined(__GNUC__)) || __has_attribute(unused)
-+ #define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
-+#else
-+ #define UNUSED(x) UNUSED_ ## x
-+#endif
-
- #define JNICALL
-
diff --git a/pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_jdk8.patch b/pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_jdk8.patch
new file mode 100644
index 0000000..31c285b
--- /dev/null
+++ b/pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_jdk8.patch
@@ -0,0 +1,699 @@
+# HG changeset patch
+# User andrew
+# Date 1453863246 0
+# Wed Jan 27 02:54:06 2016 +0000
+# Node ID 48c15869ecd568263249af4b9a4e98d4e57f9a8f
+# Parent afd392dfaed501ac674a7cc3e37353ce300969c7
+PR1983: Support using the system installation of NSS with the SunEC provider
+Summary: Apply code changes from PR1699 & PR1742 & forward-port Makefile changes to the new build.
+Updated 2017/07/04 to accomodate 8175110
+
+diff -r 984a4af2ed4e make/lib/SecurityLibraries.gmk
+--- openjdk/jdk/make/lib/SecurityLibraries.gmk
++++ openjdk/jdk/make/lib/SecurityLibraries.gmk
+@@ -218,8 +218,17 @@
+
+ ifeq ($(ENABLE_INTREE_EC), yes)
+
+- BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec \
++ BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec
++
++ ifeq ($(USE_EXTERNAL_NSS), true)
++ BUILD_LIBSUNEC_IMPL_DIR :=
++ BUILD_LIBSUNEC_FLAGS += $(NSS_CFLAGS) -DSYSTEM_NSS -DNSS_ENABLE_ECC
++ else
++ BUILD_LIBSUNEC_IMPL_DIR := \
++ $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
++ BUILD_LIBSUNEC_FLAGS += \
+ -I$(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
++ endif
+
+ #
+ # On sol-sparc...all libraries are compiled with -xregs=no%appl
+@@ -235,8 +244,8 @@
+ $(eval $(call SetupNativeCompilation,BUILD_LIBSUNEC, \
+ LIBRARY := sunec, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+- SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec \
+- $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl, \
++ SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec/ECC_JNI.cpp \
++ $(BUILD_LIBSUNEC_IMPL_DIR), \
+ LANG := C++, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \
+@@ -245,11 +254,12 @@
+ CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \
+ $(BUILD_LIBSUNEC_FLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsunec/mapfile-vers, \
+- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
++ LDFLAGS := $(subst -Xlinker --as-needed,, \
++ $(subst -Wl$(COMMA)--as-needed,, $(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK), \
+ LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(LIBCXX), \
+- LDFLAGS_SUFFIX_linux := -lc, \
+- LDFLAGS_SUFFIX_solaris := -lc, \
++ LDFLAGS_SUFFIX_linux := -lc $(NSS_LIBS), \
++ LDFLAGS_SUFFIX_solaris := -lc $(NSS_LIBS), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=sunec.dll" \
+diff -r 984a4af2ed4e src/share/native/sun/security/ec/ECC_JNI.cpp
+--- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
++++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
+@@ -24,7 +24,7 @@
+ */
+
+ #include <jni.h>
+-#include "impl/ecc_impl.h"
++#include "ecc_impl.h"
+
+ #define ILLEGAL_STATE_EXCEPTION "java/lang/IllegalStateException"
+ #define INVALID_ALGORITHM_PARAMETER_EXCEPTION \
+@@ -89,7 +89,7 @@
+ */
+ JNIEXPORT jobjectArray
+ JNICALL Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair
+- (JNIEnv *env, jclass clazz, jint keySize, jbyteArray encodedParams, jbyteArray seed)
++ (JNIEnv *env, jclass UNUSED(clazz), jint UNUSED(keySize), jbyteArray encodedParams, jbyteArray seed)
+ {
+ ECPrivateKey *privKey = NULL; // contains both public and private values
+ ECParams *ecparams = NULL;
+@@ -190,7 +190,7 @@
+ */
+ JNIEXPORT jbyteArray
+ JNICALL Java_sun_security_ec_ECDSASignature_signDigest
+- (JNIEnv *env, jclass clazz, jbyteArray digest, jbyteArray privateKey, jbyteArray encodedParams, jbyteArray seed, jint timing)
++ (JNIEnv *env, jclass UNUSED(clazz), jbyteArray digest, jbyteArray privateKey, jbyteArray encodedParams, jbyteArray seed, jint timing)
+ {
+ jbyte* pDigestBuffer = NULL;
+ jint jDigestLength = env->GetArrayLength(digest);
+@@ -299,7 +299,7 @@
+ */
+ JNIEXPORT jboolean
+ JNICALL Java_sun_security_ec_ECDSASignature_verifySignedDigest
+- (JNIEnv *env, jclass clazz, jbyteArray signedDigest, jbyteArray digest, jbyteArray publicKey, jbyteArray encodedParams)
++ (JNIEnv *env, jclass UNUSED(clazz), jbyteArray signedDigest, jbyteArray digest, jbyteArray publicKey, jbyteArray encodedParams)
+ {
+ jboolean isValid = false;
+
+@@ -384,7 +384,7 @@
+ */
+ JNIEXPORT jbyteArray
+ JNICALL Java_sun_security_ec_ECDHKeyAgreement_deriveKey
+- (JNIEnv *env, jclass clazz, jbyteArray privateKey, jbyteArray publicKey, jbyteArray encodedParams)
++ (JNIEnv *env, jclass UNUSED(clazz), jbyteArray privateKey, jbyteArray publicKey, jbyteArray encodedParams)
+ {
+ jbyteArray jSecret = NULL;
+ ECParams *ecparams = NULL;
+diff -r 984a4af2ed4e src/share/native/sun/security/ec/ecc_impl.h
+--- /dev/null
++++ openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
+@@ -0,0 +1,298 @@
++/*
++ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
++ * Use is subject to license terms.
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library 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
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this library; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin Street, 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.
++ */
++
++/* *********************************************************************
++ *
++ * The Original Code is the Netscape security libraries.
++ *
++ * The Initial Developer of the Original Code is
++ * Netscape Communications Corporation.
++ * Portions created by the Initial Developer are Copyright (C) 1994-2000
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ * Dr Vipul Gupta <vipul.gupta(a)sun.com> and
++ * Douglas Stebila <douglas(a)stebila.ca>, Sun Microsystems Laboratories
++ *
++ * Last Modified Date from the Original Code: May 2017
++ *********************************************************************** */
++
++#ifndef _ECC_IMPL_H
++#define _ECC_IMPL_H
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#include <sys/types.h>
++
++#ifdef SYSTEM_NSS
++#include <secitem.h>
++#include <secerr.h>
++#include <keythi.h>
++#ifdef LEGACY_NSS
++#include <softoken.h>
++#else
++#include <blapi.h>
++#endif
++#else
++#include "ecl-exp.h"
++#endif
++
++/*
++ * Multi-platform definitions
++ */
++#ifdef __linux__
++#define B_FALSE FALSE
++#define B_TRUE TRUE
++typedef unsigned char uint8_t;
++typedef unsigned long ulong_t;
++typedef enum { B_FALSE, B_TRUE } boolean_t;
++#endif /* __linux__ */
++
++#ifdef _ALLBSD_SOURCE
++#include <stdint.h>
++#define B_FALSE FALSE
++#define B_TRUE TRUE
++typedef unsigned long ulong_t;
++typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
++#endif /* _ALLBSD_SOURCE */
++
++#ifdef AIX
++#define B_FALSE FALSE
++#define B_TRUE TRUE
++typedef unsigned char uint8_t;
++typedef unsigned long ulong_t;
++#endif /* AIX */
++
++#ifdef _WIN32
++typedef unsigned char uint8_t;
++typedef unsigned long ulong_t;
++typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
++#define strdup _strdup /* Replace POSIX name with ISO C++ name */
++#endif /* _WIN32 */
++
++#ifndef _KERNEL
++#include <stdlib.h>
++#endif /* _KERNEL */
++
++#define EC_MAX_DIGEST_LEN 1024 /* max digest that can be signed */
++#define EC_MAX_POINT_LEN 145 /* max len of DER encoded Q */
++#define EC_MAX_VALUE_LEN 72 /* max len of ANSI X9.62 private value d */
++#define EC_MAX_SIG_LEN 144 /* max signature len for supported curves */
++#define EC_MIN_KEY_LEN 112 /* min key length in bits */
++#define EC_MAX_KEY_LEN 571 /* max key length in bits */
++#define EC_MAX_OID_LEN 10 /* max length of OID buffer */
++
++/*
++ * Various structures and definitions from NSS are here.
++ */
++
++#ifndef SYSTEM_NSS
++#ifdef _KERNEL
++#define PORT_ArenaAlloc(a, n, f) kmem_alloc((n), (f))
++#define PORT_ArenaZAlloc(a, n, f) kmem_zalloc((n), (f))
++#define PORT_ArenaGrow(a, b, c, d) NULL
++#define PORT_ZAlloc(n, f) kmem_zalloc((n), (f))
++#define PORT_Alloc(n, f) kmem_alloc((n), (f))
++#else
++#define PORT_ArenaAlloc(a, n, f) malloc((n))
++#define PORT_ArenaZAlloc(a, n, f) calloc(1, (n))
++#define PORT_ArenaGrow(a, b, c, d) NULL
++#define PORT_ZAlloc(n, f) calloc(1, (n))
++#define PORT_Alloc(n, f) malloc((n))
++#endif
++
++#define PORT_NewArena(b) (char *)12345
++#define PORT_ArenaMark(a) NULL
++#define PORT_ArenaUnmark(a, b)
++#define PORT_ArenaRelease(a, m)
++#define PORT_FreeArena(a, b)
++#define PORT_Strlen(s) strlen((s))
++#define PORT_SetError(e)
++
++#define PRBool boolean_t
++#define PR_TRUE B_TRUE
++#define PR_FALSE B_FALSE
++
++#ifdef _KERNEL
++#define PORT_Assert ASSERT
++#define PORT_Memcpy(t, f, l) bcopy((f), (t), (l))
++#else
++#define PORT_Assert assert
++#define PORT_Memcpy(t, f, l) memcpy((t), (f), (l))
++#endif
++
++#endif
++
++#define CHECK_OK(func) if (func == NULL) goto cleanup
++#define CHECK_SEC_OK(func) if (SECSuccess != (rv = func)) goto cleanup
++
++#ifndef SYSTEM_NSS
++typedef enum {
++ siBuffer = 0,
++ siClearDataBuffer = 1,
++ siCipherDataBuffer = 2,
++ siDERCertBuffer = 3,
++ siEncodedCertBuffer = 4,
++ siDERNameBuffer = 5,
++ siEncodedNameBuffer = 6,
++ siAsciiNameString = 7,
++ siAsciiString = 8,
++ siDEROID = 9,
++ siUnsignedInteger = 10,
++ siUTCTime = 11,
++ siGeneralizedTime = 12
++} SECItemType;
++
++typedef struct SECItemStr SECItem;
++
++struct SECItemStr {
++ SECItemType type;
++ unsigned char *data;
++ unsigned int len;
++};
++
++typedef SECItem SECKEYECParams;
++
++typedef enum { ec_params_explicit,
++ ec_params_named
++} ECParamsType;
++
++typedef enum { ec_field_GFp = 1,
++ ec_field_GF2m
++} ECFieldType;
++
++struct ECFieldIDStr {
++ int size; /* field size in bits */
++ ECFieldType type;
++ union {
++ SECItem prime; /* prime p for (GFp) */
++ SECItem poly; /* irreducible binary polynomial for (GF2m) */
++ } u;
++ int k1; /* first coefficient of pentanomial or
++ * the only coefficient of trinomial
++ */
++ int k2; /* two remaining coefficients of pentanomial */
++ int k3;
++};
++typedef struct ECFieldIDStr ECFieldID;
++
++struct ECCurveStr {
++ SECItem a; /* contains octet stream encoding of
++ * field element (X9.62 section 4.3.3)
++ */
++ SECItem b;
++ SECItem seed;
++};
++typedef struct ECCurveStr ECCurve;
++
++typedef void PRArenaPool;
++
++struct ECParamsStr {
++ PRArenaPool * arena;
++ ECParamsType type;
++ ECFieldID fieldID;
++ ECCurve curve;
++ SECItem base;
++ SECItem order;
++ int cofactor;
++ SECItem DEREncoding;
++ ECCurveName name;
++ SECItem curveOID;
++};
++typedef struct ECParamsStr ECParams;
++
++struct ECPublicKeyStr {
++ ECParams ecParams;
++ SECItem publicValue; /* elliptic curve point encoded as
++ * octet stream.
++ */
++};
++typedef struct ECPublicKeyStr ECPublicKey;
++
++struct ECPrivateKeyStr {
++ ECParams ecParams;
++ SECItem publicValue; /* encoded ec point */
++ SECItem privateValue; /* private big integer */
++ SECItem version; /* As per SEC 1, Appendix C, Section C.4 */
++};
++typedef struct ECPrivateKeyStr ECPrivateKey;
++
++typedef enum _SECStatus {
++ SECBufferTooSmall = -3,
++ SECWouldBlock = -2,
++ SECFailure = -1,
++ SECSuccess = 0
++} SECStatus;
++#endif
++
++#ifdef _KERNEL
++#define RNG_GenerateGlobalRandomBytes(p,l) ecc_knzero_random_generator((p), (l))
++#else
++/*
++ This function is no longer required because the random bytes are now
++ supplied by the caller. Force a failure.
++*/
++#define RNG_GenerateGlobalRandomBytes(p,l) SECFailure
++#endif
++#define CHECK_MPI_OK(func) if (MP_OKAY > (err = func)) goto cleanup
++#define MP_TO_SEC_ERROR(err)
++
++#define SECITEM_TO_MPINT(it, mp) \
++ CHECK_MPI_OK(mp_read_unsigned_octets((mp), (it).data, (it).len))
++
++extern int ecc_knzero_random_generator(uint8_t *, size_t);
++extern ulong_t soft_nzero_random_generator(uint8_t *, ulong_t);
++
++#ifdef SYSTEM_NSS
++#define EC_DecodeParams(a,b,c) EC_DecodeParams(a,b)
++#define EC_NewKey(a,b,c,d,e) EC_NewKeyFromSeed(a,b,c,d)
++#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigestWithSeed(a,b,c,d,e)
++#define ECDSA_VerifyDigest(a,b,c,d) ECDSA_VerifyDigest(a,b,c)
++#define ECDH_Derive(a,b,c,d,e,f) ECDH_Derive(a,b,c,d,e)
++#else
++extern SECStatus EC_DecodeParams(const SECItem *, ECParams **, int);
++
++extern SECItem * SECITEM_AllocItem(PRArenaPool *, SECItem *, unsigned int, int);
++extern SECStatus SECITEM_CopyItem(PRArenaPool *, SECItem *, const SECItem *,
++ int);
++extern void SECITEM_FreeItem(SECItem *, boolean_t);
++
++/* This function has been modified to accept an array of random bytes */
++extern SECStatus EC_NewKey(ECParams *ecParams, ECPrivateKey **privKey,
++ const unsigned char* random, int randomlen, int);
++/* This function has been modified to accept an array of random bytes */
++extern SECStatus ECDSA_SignDigest(ECPrivateKey *, SECItem *, const SECItem *,
++ const unsigned char* random, int randomlen, int, int timing);
++extern SECStatus ECDSA_VerifyDigest(ECPublicKey *, const SECItem *,
++ const SECItem *, int);
++extern SECStatus ECDH_Derive(SECItem *, ECParams *, SECItem *, boolean_t,
++ SECItem *, int);
++#endif
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif /* _ECC_IMPL_H */
+diff -r 984a4af2ed4e src/share/native/sun/security/ec/impl/ecc_impl.h
+--- openjdk/jdk/src/share/native/sun/security/ec/impl/ecc_impl.h
++++ /dev/null
+@@ -1,271 +0,0 @@
+-/*
+- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+- * Use is subject to license terms.
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2.1 of the License, or (at your option) any later version.
+- *
+- * This library 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
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * along with this library; if not, write to the Free Software Foundation,
+- * Inc., 51 Franklin Street, 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.
+- */
+-
+-/* *********************************************************************
+- *
+- * The Original Code is the Netscape security libraries.
+- *
+- * The Initial Developer of the Original Code is
+- * Netscape Communications Corporation.
+- * Portions created by the Initial Developer are Copyright (C) 1994-2000
+- * the Initial Developer. All Rights Reserved.
+- *
+- * Contributor(s):
+- * Dr Vipul Gupta <vipul.gupta(a)sun.com> and
+- * Douglas Stebila <douglas(a)stebila.ca>, Sun Microsystems Laboratories
+- *
+- * Last Modified Date from the Original Code: May 2017
+- *********************************************************************** */
+-
+-#ifndef _ECC_IMPL_H
+-#define _ECC_IMPL_H
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-#include <sys/types.h>
+-#include "ecl-exp.h"
+-
+-/*
+- * Multi-platform definitions
+- */
+-#ifdef __linux__
+-#define B_FALSE FALSE
+-#define B_TRUE TRUE
+-typedef unsigned char uint8_t;
+-typedef unsigned long ulong_t;
+-typedef enum { B_FALSE, B_TRUE } boolean_t;
+-#endif /* __linux__ */
+-
+-#ifdef _ALLBSD_SOURCE
+-#include <stdint.h>
+-#define B_FALSE FALSE
+-#define B_TRUE TRUE
+-typedef unsigned long ulong_t;
+-typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
+-#endif /* _ALLBSD_SOURCE */
+-
+-#ifdef AIX
+-#define B_FALSE FALSE
+-#define B_TRUE TRUE
+-typedef unsigned char uint8_t;
+-typedef unsigned long ulong_t;
+-#endif /* AIX */
+-
+-#ifdef _WIN32
+-typedef unsigned char uint8_t;
+-typedef unsigned long ulong_t;
+-typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
+-#define strdup _strdup /* Replace POSIX name with ISO C++ name */
+-#endif /* _WIN32 */
+-
+-#ifndef _KERNEL
+-#include <stdlib.h>
+-#endif /* _KERNEL */
+-
+-#define EC_MAX_DIGEST_LEN 1024 /* max digest that can be signed */
+-#define EC_MAX_POINT_LEN 145 /* max len of DER encoded Q */
+-#define EC_MAX_VALUE_LEN 72 /* max len of ANSI X9.62 private value d */
+-#define EC_MAX_SIG_LEN 144 /* max signature len for supported curves */
+-#define EC_MIN_KEY_LEN 112 /* min key length in bits */
+-#define EC_MAX_KEY_LEN 571 /* max key length in bits */
+-#define EC_MAX_OID_LEN 10 /* max length of OID buffer */
+-
+-/*
+- * Various structures and definitions from NSS are here.
+- */
+-
+-#ifdef _KERNEL
+-#define PORT_ArenaAlloc(a, n, f) kmem_alloc((n), (f))
+-#define PORT_ArenaZAlloc(a, n, f) kmem_zalloc((n), (f))
+-#define PORT_ArenaGrow(a, b, c, d) NULL
+-#define PORT_ZAlloc(n, f) kmem_zalloc((n), (f))
+-#define PORT_Alloc(n, f) kmem_alloc((n), (f))
+-#else
+-#define PORT_ArenaAlloc(a, n, f) malloc((n))
+-#define PORT_ArenaZAlloc(a, n, f) calloc(1, (n))
+-#define PORT_ArenaGrow(a, b, c, d) NULL
+-#define PORT_ZAlloc(n, f) calloc(1, (n))
+-#define PORT_Alloc(n, f) malloc((n))
+-#endif
+-
+-#define PORT_NewArena(b) (char *)12345
+-#define PORT_ArenaMark(a) NULL
+-#define PORT_ArenaUnmark(a, b)
+-#define PORT_ArenaRelease(a, m)
+-#define PORT_FreeArena(a, b)
+-#define PORT_Strlen(s) strlen((s))
+-#define PORT_SetError(e)
+-
+-#define PRBool boolean_t
+-#define PR_TRUE B_TRUE
+-#define PR_FALSE B_FALSE
+-
+-#ifdef _KERNEL
+-#define PORT_Assert ASSERT
+-#define PORT_Memcpy(t, f, l) bcopy((f), (t), (l))
+-#else
+-#define PORT_Assert assert
+-#define PORT_Memcpy(t, f, l) memcpy((t), (f), (l))
+-#endif
+-
+-#define CHECK_OK(func) if (func == NULL) goto cleanup
+-#define CHECK_SEC_OK(func) if (SECSuccess != (rv = func)) goto cleanup
+-
+-typedef enum {
+- siBuffer = 0,
+- siClearDataBuffer = 1,
+- siCipherDataBuffer = 2,
+- siDERCertBuffer = 3,
+- siEncodedCertBuffer = 4,
+- siDERNameBuffer = 5,
+- siEncodedNameBuffer = 6,
+- siAsciiNameString = 7,
+- siAsciiString = 8,
+- siDEROID = 9,
+- siUnsignedInteger = 10,
+- siUTCTime = 11,
+- siGeneralizedTime = 12
+-} SECItemType;
+-
+-typedef struct SECItemStr SECItem;
+-
+-struct SECItemStr {
+- SECItemType type;
+- unsigned char *data;
+- unsigned int len;
+-};
+-
+-typedef SECItem SECKEYECParams;
+-
+-typedef enum { ec_params_explicit,
+- ec_params_named
+-} ECParamsType;
+-
+-typedef enum { ec_field_GFp = 1,
+- ec_field_GF2m
+-} ECFieldType;
+-
+-struct ECFieldIDStr {
+- int size; /* field size in bits */
+- ECFieldType type;
+- union {
+- SECItem prime; /* prime p for (GFp) */
+- SECItem poly; /* irreducible binary polynomial for (GF2m) */
+- } u;
+- int k1; /* first coefficient of pentanomial or
+- * the only coefficient of trinomial
+- */
+- int k2; /* two remaining coefficients of pentanomial */
+- int k3;
+-};
+-typedef struct ECFieldIDStr ECFieldID;
+-
+-struct ECCurveStr {
+- SECItem a; /* contains octet stream encoding of
+- * field element (X9.62 section 4.3.3)
+- */
+- SECItem b;
+- SECItem seed;
+-};
+-typedef struct ECCurveStr ECCurve;
+-
+-typedef void PRArenaPool;
+-
+-struct ECParamsStr {
+- PRArenaPool * arena;
+- ECParamsType type;
+- ECFieldID fieldID;
+- ECCurve curve;
+- SECItem base;
+- SECItem order;
+- int cofactor;
+- SECItem DEREncoding;
+- ECCurveName name;
+- SECItem curveOID;
+-};
+-typedef struct ECParamsStr ECParams;
+-
+-struct ECPublicKeyStr {
+- ECParams ecParams;
+- SECItem publicValue; /* elliptic curve point encoded as
+- * octet stream.
+- */
+-};
+-typedef struct ECPublicKeyStr ECPublicKey;
+-
+-struct ECPrivateKeyStr {
+- ECParams ecParams;
+- SECItem publicValue; /* encoded ec point */
+- SECItem privateValue; /* private big integer */
+- SECItem version; /* As per SEC 1, Appendix C, Section C.4 */
+-};
+-typedef struct ECPrivateKeyStr ECPrivateKey;
+-
+-typedef enum _SECStatus {
+- SECBufferTooSmall = -3,
+- SECWouldBlock = -2,
+- SECFailure = -1,
+- SECSuccess = 0
+-} SECStatus;
+-
+-#ifdef _KERNEL
+-#define RNG_GenerateGlobalRandomBytes(p,l) ecc_knzero_random_generator((p), (l))
+-#else
+-/*
+- This function is no longer required because the random bytes are now
+- supplied by the caller. Force a failure.
+-*/
+-#define RNG_GenerateGlobalRandomBytes(p,l) SECFailure
+-#endif
+-#define CHECK_MPI_OK(func) if (MP_OKAY > (err = func)) goto cleanup
+-#define MP_TO_SEC_ERROR(err)
+-
+-#define SECITEM_TO_MPINT(it, mp) \
+- CHECK_MPI_OK(mp_read_unsigned_octets((mp), (it).data, (it).len))
+-
+-extern int ecc_knzero_random_generator(uint8_t *, size_t);
+-extern ulong_t soft_nzero_random_generator(uint8_t *, ulong_t);
+-
+-extern SECStatus EC_DecodeParams(const SECItem *, ECParams **, int);
+-extern SECItem * SECITEM_AllocItem(PRArenaPool *, SECItem *, unsigned int, int);
+-extern SECStatus SECITEM_CopyItem(PRArenaPool *, SECItem *, const SECItem *,
+- int);
+-extern void SECITEM_FreeItem(SECItem *, boolean_t);
+-/* This function has been modified to accept an array of random bytes */
+-extern SECStatus EC_NewKey(ECParams *ecParams, ECPrivateKey **privKey,
+- const unsigned char* random, int randomlen, int);
+-/* This function has been modified to accept an array of random bytes */
+-extern SECStatus ECDSA_SignDigest(ECPrivateKey *, SECItem *, const SECItem *,
+- const unsigned char* random, int randomlen, int, int timing);
+-extern SECStatus ECDSA_VerifyDigest(ECPublicKey *, const SECItem *,
+- const SECItem *, int);
+-extern SECStatus ECDH_Derive(SECItem *, ECParams *, SECItem *, boolean_t,
+- SECItem *, int);
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif /* _ECC_IMPL_H */
+diff -r 984a4af2ed4e src/solaris/javavm/export/jni_md.h
+--- openjdk/jdk/src/solaris/javavm/export/jni_md.h
++++ openjdk/jdk/src/solaris/javavm/export/jni_md.h
+@@ -36,6 +36,11 @@
+ #define JNIEXPORT
+ #define JNIIMPORT
+ #endif
++#if (defined(__GNUC__)) || __has_attribute(unused)
++ #define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
++#else
++ #define UNUSED(x) UNUSED_ ## x
++#endif
+
+ #define JNICALL
+
diff --git a/pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_root8.patch b/pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_root8.patch
new file mode 100644
index 0000000..100472b
--- /dev/null
+++ b/pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_root8.patch
@@ -0,0 +1,89 @@
+# HG changeset patch
+# User andrew
+# Date 1453863007 0
+# Wed Jan 27 02:50:07 2016 +0000
+# Node ID f0635543beb309c4da1bb88c906a76ee4b75e16d
+# Parent 4a5a0d4e1ae0feec2f47d17be380d6fcd5eff126
+PR1983: Support using the system installation of NSS with the SunEC provider
+Summary: Add new configure option --enable-system-nss
+
+diff -r 92af9369869f common/autoconf/jdk-options.m4
+--- openjdk/common/autoconf/jdk-options.m4 Thu Jan 21 22:17:02 2016 +0000
++++ openjdk/common/autoconf/jdk-options.m4 Wed Jan 27 05:32:12 2016 +0000
+@@ -414,9 +414,10 @@
+ #
+ AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
+ [
+- AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
++ AC_REQUIRE([LIB_SETUP_MISC_LIBS])
++ AC_MSG_CHECKING([if the elliptic curve crypto implementation is present])
+
+- if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
++ if test "x${system_nss}" = "xyes" -o -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
+ ENABLE_INTREE_EC=yes
+ AC_MSG_RESULT([yes])
+ else
+diff -r 92af9369869f common/autoconf/libraries.m4
+--- openjdk/common/autoconf/libraries.m4 Thu Jan 21 22:17:02 2016 +0000
++++ openjdk/common/autoconf/libraries.m4 Wed Jan 27 05:32:12 2016 +0000
+@@ -731,6 +731,47 @@
+ LIBDL="$LIBS"
+ AC_SUBST(LIBDL)
+ LIBS="$save_LIBS"
++
++ ###############################################################################
++ #
++ # Check for the NSS libraries
++ #
++
++ AC_MSG_CHECKING([whether to build the Sun EC provider against the system NSS libraries])
++
++ # default is bundled
++ DEFAULT_SYSTEM_NSS=no
++
++ AC_ARG_ENABLE([system-nss], [AS_HELP_STRING([--enable-system-nss],
++ [build the SunEC provider using the system NSS libraries @<:@disabled@:>@])],
++ [
++ case "${enableval}" in
++ yes)
++ system_nss=yes
++ ;;
++ *)
++ system_nss=no
++ ;;
++ esac
++ ],
++ [
++ system_nss=${DEFAULT_SYSTEM_NSS}
++ ])
++ AC_MSG_RESULT([$system_nss])
++
++ if test "x${system_nss}" = "xyes"; then
++ PKG_CHECK_MODULES(NSS, nss-softokn >= 3.16.1, [NSS_SOFTOKN_FOUND=yes], [NSS_SOFTOKN_FOUND=no])
++ if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
++ NSS_LIBS="$NSS_LIBS -lfreebl";
++ USE_EXTERNAL_NSS=true
++ else
++ AC_MSG_ERROR([--enable-system-nss specified, but NSS not found.])
++ fi
++ else
++ USE_EXTERNAL_NSS=false
++ fi
++ AC_SUBST(USE_EXTERNAL_NSS)
++
+ ])
+
+ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP],
+diff -r 92af9369869f common/autoconf/spec.gmk.in
+--- openjdk/common/autoconf/spec.gmk.in Thu Jan 21 22:17:02 2016 +0000
++++ openjdk/common/autoconf/spec.gmk.in Wed Jan 27 05:32:12 2016 +0000
+@@ -647,6 +647,9 @@
+ # Read-only single-machine data
+ INSTALL_SYSCONFDIR=@sysconfdir@
+
++USE_EXTERNAL_NSS:=@USE_EXTERNAL_NSS@
++NSS_LIBS:=@NSS_LIBS@
++NSS_CFLAGS:=@NSS_CFLAGS@
+
+ ####################################################
+ #
diff --git a/pr1983-root.patch b/pr1983-root.patch
deleted file mode 100644
index 100472b..0000000
--- a/pr1983-root.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1453863007 0
-# Wed Jan 27 02:50:07 2016 +0000
-# Node ID f0635543beb309c4da1bb88c906a76ee4b75e16d
-# Parent 4a5a0d4e1ae0feec2f47d17be380d6fcd5eff126
-PR1983: Support using the system installation of NSS with the SunEC provider
-Summary: Add new configure option --enable-system-nss
-
-diff -r 92af9369869f common/autoconf/jdk-options.m4
---- openjdk/common/autoconf/jdk-options.m4 Thu Jan 21 22:17:02 2016 +0000
-+++ openjdk/common/autoconf/jdk-options.m4 Wed Jan 27 05:32:12 2016 +0000
-@@ -414,9 +414,10 @@
- #
- AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
- [
-- AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
-+ AC_REQUIRE([LIB_SETUP_MISC_LIBS])
-+ AC_MSG_CHECKING([if the elliptic curve crypto implementation is present])
-
-- if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
-+ if test "x${system_nss}" = "xyes" -o -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
- ENABLE_INTREE_EC=yes
- AC_MSG_RESULT([yes])
- else
-diff -r 92af9369869f common/autoconf/libraries.m4
---- openjdk/common/autoconf/libraries.m4 Thu Jan 21 22:17:02 2016 +0000
-+++ openjdk/common/autoconf/libraries.m4 Wed Jan 27 05:32:12 2016 +0000
-@@ -731,6 +731,47 @@
- LIBDL="$LIBS"
- AC_SUBST(LIBDL)
- LIBS="$save_LIBS"
-+
-+ ###############################################################################
-+ #
-+ # Check for the NSS libraries
-+ #
-+
-+ AC_MSG_CHECKING([whether to build the Sun EC provider against the system NSS libraries])
-+
-+ # default is bundled
-+ DEFAULT_SYSTEM_NSS=no
-+
-+ AC_ARG_ENABLE([system-nss], [AS_HELP_STRING([--enable-system-nss],
-+ [build the SunEC provider using the system NSS libraries @<:@disabled@:>@])],
-+ [
-+ case "${enableval}" in
-+ yes)
-+ system_nss=yes
-+ ;;
-+ *)
-+ system_nss=no
-+ ;;
-+ esac
-+ ],
-+ [
-+ system_nss=${DEFAULT_SYSTEM_NSS}
-+ ])
-+ AC_MSG_RESULT([$system_nss])
-+
-+ if test "x${system_nss}" = "xyes"; then
-+ PKG_CHECK_MODULES(NSS, nss-softokn >= 3.16.1, [NSS_SOFTOKN_FOUND=yes], [NSS_SOFTOKN_FOUND=no])
-+ if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
-+ NSS_LIBS="$NSS_LIBS -lfreebl";
-+ USE_EXTERNAL_NSS=true
-+ else
-+ AC_MSG_ERROR([--enable-system-nss specified, but NSS not found.])
-+ fi
-+ else
-+ USE_EXTERNAL_NSS=false
-+ fi
-+ AC_SUBST(USE_EXTERNAL_NSS)
-+
- ])
-
- AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP],
-diff -r 92af9369869f common/autoconf/spec.gmk.in
---- openjdk/common/autoconf/spec.gmk.in Thu Jan 21 22:17:02 2016 +0000
-+++ openjdk/common/autoconf/spec.gmk.in Wed Jan 27 05:32:12 2016 +0000
-@@ -647,6 +647,9 @@
- # Read-only single-machine data
- INSTALL_SYSCONFDIR=@sysconfdir@
-
-+USE_EXTERNAL_NSS:=@USE_EXTERNAL_NSS@
-+NSS_LIBS:=@NSS_LIBS@
-+NSS_CFLAGS:=@NSS_CFLAGS@
-
- ####################################################
- #
diff --git a/pr2127-sunec_provider_crashes_when_built_using_system_nss_thus_use_of_nss_memory_management_functions.patch b/pr2127-sunec_provider_crashes_when_built_using_system_nss_thus_use_of_nss_memory_management_functions.patch
new file mode 100644
index 0000000..b08822a
--- /dev/null
+++ b/pr2127-sunec_provider_crashes_when_built_using_system_nss_thus_use_of_nss_memory_management_functions.patch
@@ -0,0 +1,178 @@
+# HG changeset patch
+# User andrew
+# Date 1453866306 0
+# Wed Jan 27 03:45:06 2016 +0000
+# Node ID 0ff7720931e8dbf7de25720bdc93b18527ab89e8
+# Parent 48c15869ecd568263249af4b9a4e98d4e57f9a8f
+PR2127: SunEC provider crashes when built using system NSS
+Summary: Use NSS memory management functions
+
+diff -r 48c15869ecd5 -r 0ff7720931e8 src/share/native/sun/security/ec/ECC_JNI.cpp
+--- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 02:54:06 2016 +0000
++++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 03:45:06 2016 +0000
+@@ -32,6 +32,13 @@
+ #define INVALID_PARAMETER_EXCEPTION \
+ "java/security/InvalidParameterException"
+ #define KEY_EXCEPTION "java/security/KeyException"
++#define INTERNAL_ERROR "java/lang/InternalError"
++
++#ifdef SYSTEM_NSS
++#define SYSTEM_UNUSED(x) UNUSED(x)
++#else
++#define SYSTEM_UNUSED(x) x
++#endif
+
+ extern "C" {
+
+@@ -49,8 +56,13 @@
+ /*
+ * Deep free of the ECParams struct
+ */
+-void FreeECParams(ECParams *ecparams, jboolean freeStruct)
++void FreeECParams(ECParams *ecparams, jboolean SYSTEM_UNUSED(freeStruct))
+ {
++#ifdef SYSTEM_NSS
++ // Needs to be freed using the matching method to the one
++ // that allocated it. PR_TRUE means the memory is zeroed.
++ PORT_FreeArena(ecparams->arena, PR_TRUE);
++#else
+ // Use B_FALSE to free the SECItem->data element, but not the SECItem itself
+ // Use B_TRUE to free both
+
+@@ -64,6 +76,7 @@
+ SECITEM_FreeItem(&ecparams->curveOID, B_FALSE);
+ if (freeStruct)
+ free(ecparams);
++#endif
+ }
+
+ jbyteArray getEncodedBytes(JNIEnv *env, SECItem *hSECItem)
+@@ -108,6 +121,13 @@
+ goto cleanup;
+ }
+
++#ifdef SYSTEM_NSS
++ if (SECOID_Init() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ goto cleanup;
++ }
++#endif
++
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -163,16 +183,26 @@
+ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
++#ifdef SYSTEM_NSS
++ if (SECOID_Shutdown() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
++#endif
+ }
+ if (ecparams) {
+ FreeECParams(ecparams, true);
+ }
+ if (privKey) {
+ FreeECParams(&privKey->ecParams, false);
++#ifndef SYSTEM_NSS
++ // The entire ECPrivateKey is allocated in the arena
++ // when using system NSS, so only the in-tree version
++ // needs to clear these manually.
+ SECITEM_FreeItem(&privKey->version, B_FALSE);
+ SECITEM_FreeItem(&privKey->privateValue, B_FALSE);
+ SECITEM_FreeItem(&privKey->publicValue, B_FALSE);
+ free(privKey);
++#endif
+ }
+
+ if (pSeedBuffer) {
+@@ -223,6 +253,13 @@
+ goto cleanup;
+ }
+
++#ifdef SYSTEM_NSS
++ if (SECOID_Init() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ goto cleanup;
++ }
++#endif
++
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -270,6 +307,11 @@
+ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
++#ifdef SYSTEM_NSS
++ if (SECOID_Shutdown() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
++#endif
+ }
+ if (privKey.privateValue.data) {
+ env->ReleaseByteArrayElements(privateKey,
+@@ -336,6 +378,13 @@
+ goto cleanup;
+ }
+
++#ifdef SYSTEM_NSS
++ if (SECOID_Init() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ goto cleanup;
++ }
++#endif
++
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -356,9 +405,15 @@
+
+ cleanup:
+ {
+- if (params_item.data)
++ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
++#ifdef SYSTEM_NSS
++ if (SECOID_Shutdown() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
++#endif
++ }
+
+ if (pubKey.publicValue.data)
+ env->ReleaseByteArrayElements(publicKey,
+@@ -419,6 +474,13 @@
+ goto cleanup;
+ }
+
++#ifdef SYSTEM_NSS
++ if (SECOID_Init() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ goto cleanup;
++ }
++#endif
++
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -460,9 +522,15 @@
+ env->ReleaseByteArrayElements(publicKey,
+ (jbyte *) publicValue_item.data, JNI_ABORT);
+
+- if (params_item.data)
++ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
++#ifdef SYSTEM_NSS
++ if (SECOID_Shutdown() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
++#endif
++ }
+
+ if (ecparams)
+ FreeECParams(ecparams, true);
diff --git a/pr2127.patch b/pr2127.patch
deleted file mode 100644
index b08822a..0000000
--- a/pr2127.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1453866306 0
-# Wed Jan 27 03:45:06 2016 +0000
-# Node ID 0ff7720931e8dbf7de25720bdc93b18527ab89e8
-# Parent 48c15869ecd568263249af4b9a4e98d4e57f9a8f
-PR2127: SunEC provider crashes when built using system NSS
-Summary: Use NSS memory management functions
-
-diff -r 48c15869ecd5 -r 0ff7720931e8 src/share/native/sun/security/ec/ECC_JNI.cpp
---- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 02:54:06 2016 +0000
-+++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 03:45:06 2016 +0000
-@@ -32,6 +32,13 @@
- #define INVALID_PARAMETER_EXCEPTION \
- "java/security/InvalidParameterException"
- #define KEY_EXCEPTION "java/security/KeyException"
-+#define INTERNAL_ERROR "java/lang/InternalError"
-+
-+#ifdef SYSTEM_NSS
-+#define SYSTEM_UNUSED(x) UNUSED(x)
-+#else
-+#define SYSTEM_UNUSED(x) x
-+#endif
-
- extern "C" {
-
-@@ -49,8 +56,13 @@
- /*
- * Deep free of the ECParams struct
- */
--void FreeECParams(ECParams *ecparams, jboolean freeStruct)
-+void FreeECParams(ECParams *ecparams, jboolean SYSTEM_UNUSED(freeStruct))
- {
-+#ifdef SYSTEM_NSS
-+ // Needs to be freed using the matching method to the one
-+ // that allocated it. PR_TRUE means the memory is zeroed.
-+ PORT_FreeArena(ecparams->arena, PR_TRUE);
-+#else
- // Use B_FALSE to free the SECItem->data element, but not the SECItem itself
- // Use B_TRUE to free both
-
-@@ -64,6 +76,7 @@
- SECITEM_FreeItem(&ecparams->curveOID, B_FALSE);
- if (freeStruct)
- free(ecparams);
-+#endif
- }
-
- jbyteArray getEncodedBytes(JNIEnv *env, SECItem *hSECItem)
-@@ -108,6 +121,13 @@
- goto cleanup;
- }
-
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Init() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ goto cleanup;
-+ }
-+#endif
-+
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -163,16 +183,26 @@
- if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Shutdown() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
-+#endif
- }
- if (ecparams) {
- FreeECParams(ecparams, true);
- }
- if (privKey) {
- FreeECParams(&privKey->ecParams, false);
-+#ifndef SYSTEM_NSS
-+ // The entire ECPrivateKey is allocated in the arena
-+ // when using system NSS, so only the in-tree version
-+ // needs to clear these manually.
- SECITEM_FreeItem(&privKey->version, B_FALSE);
- SECITEM_FreeItem(&privKey->privateValue, B_FALSE);
- SECITEM_FreeItem(&privKey->publicValue, B_FALSE);
- free(privKey);
-+#endif
- }
-
- if (pSeedBuffer) {
-@@ -223,6 +253,13 @@
- goto cleanup;
- }
-
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Init() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ goto cleanup;
-+ }
-+#endif
-+
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -270,6 +307,11 @@
- if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Shutdown() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
-+#endif
- }
- if (privKey.privateValue.data) {
- env->ReleaseByteArrayElements(privateKey,
-@@ -336,6 +378,13 @@
- goto cleanup;
- }
-
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Init() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ goto cleanup;
-+ }
-+#endif
-+
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -356,9 +405,15 @@
-
- cleanup:
- {
-- if (params_item.data)
-+ if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Shutdown() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
-+#endif
-+ }
-
- if (pubKey.publicValue.data)
- env->ReleaseByteArrayElements(publicKey,
-@@ -419,6 +474,13 @@
- goto cleanup;
- }
-
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Init() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ goto cleanup;
-+ }
-+#endif
-+
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -460,9 +522,15 @@
- env->ReleaseByteArrayElements(publicKey,
- (jbyte *) publicValue_item.data, JNI_ABORT);
-
-- if (params_item.data)
-+ if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Shutdown() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
-+#endif
-+ }
-
- if (ecparams)
- FreeECParams(ecparams, true);
diff --git a/pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binary.patch b/pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binary.patch
new file mode 100644
index 0000000..17e1f69
--- /dev/null
+++ b/pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binary.patch
@@ -0,0 +1,302 @@
+# HG changeset patch
+# User mikael
+# Date 1426870964 25200
+# Fri Mar 20 10:02:44 2015 -0700
+# Node ID ee13ce369705a700b867f8c77423580b7b22cc13
+# Parent 7847ccfb240b35ed0dd328f0404b713b20e0905a
+8074839: Resolve disabled warnings for libunpack and the unpack200 binary
+Reviewed-by: dholmes, ksrini
+
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
+@@ -63,7 +63,7 @@
+ bytes res;
+ res.ptr = ptr + beg;
+ res.len = end - beg;
+- assert(res.len == 0 || inBounds(res.ptr) && inBounds(res.limit()-1));
++ assert(res.len == 0 || (inBounds(res.ptr) && inBounds(res.limit()-1)));
+ return res;
+ }
+ // building C strings inside byte buffers:
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
+@@ -292,7 +292,7 @@
+
+ if (uPtr->aborting()) {
+ THROW_IOE(uPtr->get_abort_message());
+- return false;
++ return null;
+ }
+
+ // We have fetched all the files.
+@@ -310,7 +310,7 @@
+ JNIEXPORT jlong JNICALL
+ Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
+ unpacker* uPtr = get_unpacker(env, pObj, false);
+- CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, 0);
+ size_t consumed = uPtr->input_consumed();
+ free_unpacker(env, pObj, uPtr);
+ return consumed;
+@@ -320,6 +320,7 @@
+ Java_com_sun_java_util_jar_pack_NativeUnpack_setOption(JNIEnv *env, jobject pObj,
+ jstring pProp, jstring pValue) {
+ unpacker* uPtr = get_unpacker(env, pObj);
++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false);
+ const char* prop = env->GetStringUTFChars(pProp, JNI_FALSE);
+ CHECK_EXCEPTION_RETURN_VALUE(prop, false);
+ const char* value = env->GetStringUTFChars(pValue, JNI_FALSE);
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
+@@ -142,31 +142,28 @@
+ return progname;
+ }
+
+-static const char* usage_lines[] = {
+- "Usage: %s [-opt... | --option=value]... x.pack[.gz] y.jar\n",
+- "\n",
+- "Unpacking Options\n",
+- " -H{h}, --deflate-hint={h} override transmitted deflate hint: true, false, or keep (default)\n",
+- " -r, --remove-pack-file remove input file after unpacking\n",
+- " -v, --verbose increase program verbosity\n",
+- " -q, --quiet set verbosity to lowest level\n",
+- " -l{F}, --log-file={F} output to the given log file, or '-' for standard output (default)\n",
+- " -?, -h, --help print this message\n",
+- " -V, --version print program version\n",
+- " -J{X} Java VM argument (ignored)\n",
+- null
+-};
++#define USAGE_HEADER "Usage: %s [-opt... | --option=value]... x.pack[.gz] y.jar\n"
++#define USAGE_OPTIONS \
++ "\n" \
++ "Unpacking Options\n" \
++ " -H{h}, --deflate-hint={h} override transmitted deflate hint: true, false, or keep (default)\n" \
++ " -r, --remove-pack-file remove input file after unpacking\n" \
++ " -v, --verbose increase program verbosity\n" \
++ " -q, --quiet set verbosity to lowest level\n" \
++ " -l{F}, --log-file={F} output to the given log file, or '-' for standard output (default)\n" \
++ " -?, -h, --help print this message\n" \
++ " -V, --version print program version\n" \
++ " -J{X} Java VM argument (ignored)\n"
+
+ static void usage(unpacker* u, const char* progname, bool full = false) {
+ // WinMain does not set argv[0] to the progrname
+ progname = (progname != null) ? nbasename(progname) : "unpack200";
+- for (int i = 0; usage_lines[i] != null; i++) {
+- fprintf(u->errstrm, usage_lines[i], progname);
+- if (!full) {
+- fprintf(u->errstrm,
+- "(For more information, run %s --help .)\n", progname);
+- break;
+- }
++
++ fprintf(u->errstrm, USAGE_HEADER, progname);
++ if (full) {
++ fprintf(u->errstrm, USAGE_OPTIONS);
++ } else {
++ fprintf(u->errstrm, "(For more information, run %s --help .)\n", progname);
+ }
+ }
+
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+@@ -222,9 +222,9 @@
+ }
+
+ #ifdef PRODUCT
+- char* string() { return 0; }
++ const char* string() { return NULL; }
+ #else
+- char* string(); // see far below
++ const char* string(); // see far below
+ #endif
+ };
+
+@@ -715,13 +715,13 @@
+ // Now we can size the whole archive.
+ // Read everything else into a mega-buffer.
+ rp = hdr.rp;
+- int header_size_0 = (int)(rp - input.base()); // used-up header (4byte + 3int)
+- int header_size_1 = (int)(rplimit - rp); // buffered unused initial fragment
+- int header_size = header_size_0+header_size_1;
++ size_t header_size_0 = (rp - input.base()); // used-up header (4byte + 3int)
++ size_t header_size_1 = (rplimit - rp); // buffered unused initial fragment
++ size_t header_size = header_size_0 + header_size_1;
+ unsized_bytes_read = header_size_0;
+ CHECK;
+ if (foreign_buf) {
+- if (archive_size > (size_t)header_size_1) {
++ if (archive_size > header_size_1) {
+ abort("EOF reading fixed input buffer");
+ return;
+ }
+@@ -735,7 +735,7 @@
+ return;
+ }
+ input.set(U_NEW(byte, add_size(header_size_0, archive_size, C_SLOP)),
+- (size_t) header_size_0 + archive_size);
++ header_size_0 + archive_size);
+ CHECK;
+ assert(input.limit()[0] == 0);
+ // Move all the bytes we read initially into the real buffer.
+@@ -958,13 +958,13 @@
+ nentries = next_entry;
+
+ // place a limit on future CP growth:
+- int generous = 0;
++ size_t generous = 0;
+ generous = add_size(generous, u->ic_count); // implicit name
+ generous = add_size(generous, u->ic_count); // outer
+ generous = add_size(generous, u->ic_count); // outer.utf8
+ generous = add_size(generous, 40); // WKUs, misc
+ generous = add_size(generous, u->class_count); // implicit SourceFile strings
+- maxentries = add_size(nentries, generous);
++ maxentries = (uint)add_size(nentries, generous);
+
+ // Note that this CP does not include "empty" entries
+ // for longs and doubles. Those are introduced when
+@@ -982,8 +982,9 @@
+ }
+
+ // Initialize *all* our entries once
+- for (int i = 0 ; i < maxentries ; i++)
++ for (uint i = 0 ; i < maxentries ; i++) {
+ entries[i].outputIndex = REQUESTED_NONE;
++ }
+
+ initGroupIndexes();
+ // Initialize hashTab to a generous power-of-two size.
+@@ -3677,21 +3678,22 @@
+
+ unpacker* debug_u;
+
+-static bytes& getbuf(int len) { // for debugging only!
++static bytes& getbuf(size_t len) { // for debugging only!
+ static int bn = 0;
+ static bytes bufs[8];
+ bytes& buf = bufs[bn++ & 7];
+- while ((int)buf.len < len+10)
++ while (buf.len < len + 10) {
+ buf.realloc(buf.len ? buf.len * 2 : 1000);
++ }
+ buf.ptr[0] = 0; // for the sake of strcat
+ return buf;
+ }
+
+-char* entry::string() {
++const char* entry::string() {
+ bytes buf;
+ switch (tag) {
+ case CONSTANT_None:
+- return (char*)"<empty>";
++ return "<empty>";
+ case CONSTANT_Signature:
+ if (value.b.ptr == null)
+ return ref(0)->string();
+@@ -3711,26 +3713,28 @@
+ break;
+ default:
+ if (nrefs == 0) {
+- buf = getbuf(20);
+- sprintf((char*)buf.ptr, TAG_NAME[tag]);
++ return TAG_NAME[tag];
+ } else if (nrefs == 1) {
+ return refs[0]->string();
+ } else {
+- char* s1 = refs[0]->string();
+- char* s2 = refs[1]->string();
+- buf = getbuf((int)strlen(s1) + 1 + (int)strlen(s2) + 4 + 1);
++ const char* s1 = refs[0]->string();
++ const char* s2 = refs[1]->string();
++ buf = getbuf(strlen(s1) + 1 + strlen(s2) + 4 + 1);
+ buf.strcat(s1).strcat(" ").strcat(s2);
+ if (nrefs > 2) buf.strcat(" ...");
+ }
+ }
+- return (char*)buf.ptr;
++ return (const char*)buf.ptr;
+ }
+
+ void print_cp_entry(int i) {
+ entry& e = debug_u->cp.entries[i];
+- char buf[30];
+- sprintf(buf, ((uint)e.tag < CONSTANT_Limit)? TAG_NAME[e.tag]: "%d", e.tag);
+- printf(" %d\t%s %s\n", i, buf, e.string());
++
++ if ((uint)e.tag < CONSTANT_Limit) {
++ printf(" %d\t%s %s\n", i, TAG_NAME[e.tag], e.string());
++ } else {
++ printf(" %d\t%d %s\n", i, e.tag, e.string());
++ }
+ }
+
+ void print_cp_entries(int beg, int end) {
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
+@@ -209,7 +209,7 @@
+ byte* rp; // read pointer (< rplimit <= input.limit())
+ byte* rplimit; // how much of the input block has been read?
+ julong bytes_read;
+- int unsized_bytes_read;
++ size_t unsized_bytes_read;
+
+ // callback to read at least one byte, up to available input
+ typedef jlong (*read_input_fn_t)(unpacker* self, void* buf, jlong minlen, jlong maxlen);
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
+@@ -81,7 +81,7 @@
+ int assert_failed(const char* p) {
+ char message[1<<12];
+ sprintf(message, "@assert failed: %s\n", p);
+- fprintf(stdout, 1+message);
++ fprintf(stdout, "%s", 1+message);
+ breakpoint();
+ unpack_abort(message);
+ return 0;
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
+@@ -84,7 +84,7 @@
+ }
+
+ // Write data to the ZIP output stream.
+-void jar::write_data(void* buff, int len) {
++void jar::write_data(void* buff, size_t len) {
+ while (len > 0) {
+ int rc = (int)fwrite(buff, 1, len, jarfp);
+ if (rc <= 0) {
+@@ -323,12 +323,12 @@
+ // Total number of disks (int)
+ header64[36] = (ushort)SWAP_BYTES(1);
+ header64[37] = 0;
+- write_data(header64, (int)sizeof(header64));
++ write_data(header64, sizeof(header64));
+ }
+
+ // Write the End of Central Directory structure.
+ PRINTCR((2, "end-of-directory at %d\n", output_file_offset));
+- write_data(header, (int)sizeof(header));
++ write_data(header, sizeof(header));
+
+ PRINTCR((2, "writing zip comment\n"));
+ // Write the comment.
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
+@@ -68,8 +68,8 @@
+ }
+
+ // Private Methods
+- void write_data(void* ptr, int len);
+- void write_data(bytes& b) { write_data(b.ptr, (int)b.len); }
++ void write_data(void* ptr, size_t len);
++ void write_data(bytes& b) { write_data(b.ptr, b.len); }
+ void add_to_jar_directory(const char* fname, bool store, int modtime,
+ int len, int clen, uLong crc);
+ void write_jar_header(const char* fname, bool store, int modtime,
diff --git a/pr2462.patch b/pr2462.patch
deleted file mode 100644
index 17e1f69..0000000
--- a/pr2462.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-# HG changeset patch
-# User mikael
-# Date 1426870964 25200
-# Fri Mar 20 10:02:44 2015 -0700
-# Node ID ee13ce369705a700b867f8c77423580b7b22cc13
-# Parent 7847ccfb240b35ed0dd328f0404b713b20e0905a
-8074839: Resolve disabled warnings for libunpack and the unpack200 binary
-Reviewed-by: dholmes, ksrini
-
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
-@@ -63,7 +63,7 @@
- bytes res;
- res.ptr = ptr + beg;
- res.len = end - beg;
-- assert(res.len == 0 || inBounds(res.ptr) && inBounds(res.limit()-1));
-+ assert(res.len == 0 || (inBounds(res.ptr) && inBounds(res.limit()-1)));
- return res;
- }
- // building C strings inside byte buffers:
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
-@@ -292,7 +292,7 @@
-
- if (uPtr->aborting()) {
- THROW_IOE(uPtr->get_abort_message());
-- return false;
-+ return null;
- }
-
- // We have fetched all the files.
-@@ -310,7 +310,7 @@
- JNIEXPORT jlong JNICALL
- Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
- unpacker* uPtr = get_unpacker(env, pObj, false);
-- CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
-+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, 0);
- size_t consumed = uPtr->input_consumed();
- free_unpacker(env, pObj, uPtr);
- return consumed;
-@@ -320,6 +320,7 @@
- Java_com_sun_java_util_jar_pack_NativeUnpack_setOption(JNIEnv *env, jobject pObj,
- jstring pProp, jstring pValue) {
- unpacker* uPtr = get_unpacker(env, pObj);
-+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false);
- const char* prop = env->GetStringUTFChars(pProp, JNI_FALSE);
- CHECK_EXCEPTION_RETURN_VALUE(prop, false);
- const char* value = env->GetStringUTFChars(pValue, JNI_FALSE);
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
-@@ -142,31 +142,28 @@
- return progname;
- }
-
--static const char* usage_lines[] = {
-- "Usage: %s [-opt... | --option=value]... x.pack[.gz] y.jar\n",
-- "\n",
-- "Unpacking Options\n",
-- " -H{h}, --deflate-hint={h} override transmitted deflate hint: true, false, or keep (default)\n",
-- " -r, --remove-pack-file remove input file after unpacking\n",
-- " -v, --verbose increase program verbosity\n",
-- " -q, --quiet set verbosity to lowest level\n",
-- " -l{F}, --log-file={F} output to the given log file, or '-' for standard output (default)\n",
-- " -?, -h, --help print this message\n",
-- " -V, --version print program version\n",
-- " -J{X} Java VM argument (ignored)\n",
-- null
--};
-+#define USAGE_HEADER "Usage: %s [-opt... | --option=value]... x.pack[.gz] y.jar\n"
-+#define USAGE_OPTIONS \
-+ "\n" \
-+ "Unpacking Options\n" \
-+ " -H{h}, --deflate-hint={h} override transmitted deflate hint: true, false, or keep (default)\n" \
-+ " -r, --remove-pack-file remove input file after unpacking\n" \
-+ " -v, --verbose increase program verbosity\n" \
-+ " -q, --quiet set verbosity to lowest level\n" \
-+ " -l{F}, --log-file={F} output to the given log file, or '-' for standard output (default)\n" \
-+ " -?, -h, --help print this message\n" \
-+ " -V, --version print program version\n" \
-+ " -J{X} Java VM argument (ignored)\n"
-
- static void usage(unpacker* u, const char* progname, bool full = false) {
- // WinMain does not set argv[0] to the progrname
- progname = (progname != null) ? nbasename(progname) : "unpack200";
-- for (int i = 0; usage_lines[i] != null; i++) {
-- fprintf(u->errstrm, usage_lines[i], progname);
-- if (!full) {
-- fprintf(u->errstrm,
-- "(For more information, run %s --help .)\n", progname);
-- break;
-- }
-+
-+ fprintf(u->errstrm, USAGE_HEADER, progname);
-+ if (full) {
-+ fprintf(u->errstrm, USAGE_OPTIONS);
-+ } else {
-+ fprintf(u->errstrm, "(For more information, run %s --help .)\n", progname);
- }
- }
-
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
-@@ -222,9 +222,9 @@
- }
-
- #ifdef PRODUCT
-- char* string() { return 0; }
-+ const char* string() { return NULL; }
- #else
-- char* string(); // see far below
-+ const char* string(); // see far below
- #endif
- };
-
-@@ -715,13 +715,13 @@
- // Now we can size the whole archive.
- // Read everything else into a mega-buffer.
- rp = hdr.rp;
-- int header_size_0 = (int)(rp - input.base()); // used-up header (4byte + 3int)
-- int header_size_1 = (int)(rplimit - rp); // buffered unused initial fragment
-- int header_size = header_size_0+header_size_1;
-+ size_t header_size_0 = (rp - input.base()); // used-up header (4byte + 3int)
-+ size_t header_size_1 = (rplimit - rp); // buffered unused initial fragment
-+ size_t header_size = header_size_0 + header_size_1;
- unsized_bytes_read = header_size_0;
- CHECK;
- if (foreign_buf) {
-- if (archive_size > (size_t)header_size_1) {
-+ if (archive_size > header_size_1) {
- abort("EOF reading fixed input buffer");
- return;
- }
-@@ -735,7 +735,7 @@
- return;
- }
- input.set(U_NEW(byte, add_size(header_size_0, archive_size, C_SLOP)),
-- (size_t) header_size_0 + archive_size);
-+ header_size_0 + archive_size);
- CHECK;
- assert(input.limit()[0] == 0);
- // Move all the bytes we read initially into the real buffer.
-@@ -958,13 +958,13 @@
- nentries = next_entry;
-
- // place a limit on future CP growth:
-- int generous = 0;
-+ size_t generous = 0;
- generous = add_size(generous, u->ic_count); // implicit name
- generous = add_size(generous, u->ic_count); // outer
- generous = add_size(generous, u->ic_count); // outer.utf8
- generous = add_size(generous, 40); // WKUs, misc
- generous = add_size(generous, u->class_count); // implicit SourceFile strings
-- maxentries = add_size(nentries, generous);
-+ maxentries = (uint)add_size(nentries, generous);
-
- // Note that this CP does not include "empty" entries
- // for longs and doubles. Those are introduced when
-@@ -982,8 +982,9 @@
- }
-
- // Initialize *all* our entries once
-- for (int i = 0 ; i < maxentries ; i++)
-+ for (uint i = 0 ; i < maxentries ; i++) {
- entries[i].outputIndex = REQUESTED_NONE;
-+ }
-
- initGroupIndexes();
- // Initialize hashTab to a generous power-of-two size.
-@@ -3677,21 +3678,22 @@
-
- unpacker* debug_u;
-
--static bytes& getbuf(int len) { // for debugging only!
-+static bytes& getbuf(size_t len) { // for debugging only!
- static int bn = 0;
- static bytes bufs[8];
- bytes& buf = bufs[bn++ & 7];
-- while ((int)buf.len < len+10)
-+ while (buf.len < len + 10) {
- buf.realloc(buf.len ? buf.len * 2 : 1000);
-+ }
- buf.ptr[0] = 0; // for the sake of strcat
- return buf;
- }
-
--char* entry::string() {
-+const char* entry::string() {
- bytes buf;
- switch (tag) {
- case CONSTANT_None:
-- return (char*)"<empty>";
-+ return "<empty>";
- case CONSTANT_Signature:
- if (value.b.ptr == null)
- return ref(0)->string();
-@@ -3711,26 +3713,28 @@
- break;
- default:
- if (nrefs == 0) {
-- buf = getbuf(20);
-- sprintf((char*)buf.ptr, TAG_NAME[tag]);
-+ return TAG_NAME[tag];
- } else if (nrefs == 1) {
- return refs[0]->string();
- } else {
-- char* s1 = refs[0]->string();
-- char* s2 = refs[1]->string();
-- buf = getbuf((int)strlen(s1) + 1 + (int)strlen(s2) + 4 + 1);
-+ const char* s1 = refs[0]->string();
-+ const char* s2 = refs[1]->string();
-+ buf = getbuf(strlen(s1) + 1 + strlen(s2) + 4 + 1);
- buf.strcat(s1).strcat(" ").strcat(s2);
- if (nrefs > 2) buf.strcat(" ...");
- }
- }
-- return (char*)buf.ptr;
-+ return (const char*)buf.ptr;
- }
-
- void print_cp_entry(int i) {
- entry& e = debug_u->cp.entries[i];
-- char buf[30];
-- sprintf(buf, ((uint)e.tag < CONSTANT_Limit)? TAG_NAME[e.tag]: "%d", e.tag);
-- printf(" %d\t%s %s\n", i, buf, e.string());
-+
-+ if ((uint)e.tag < CONSTANT_Limit) {
-+ printf(" %d\t%s %s\n", i, TAG_NAME[e.tag], e.string());
-+ } else {
-+ printf(" %d\t%d %s\n", i, e.tag, e.string());
-+ }
- }
-
- void print_cp_entries(int beg, int end) {
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
-@@ -209,7 +209,7 @@
- byte* rp; // read pointer (< rplimit <= input.limit())
- byte* rplimit; // how much of the input block has been read?
- julong bytes_read;
-- int unsized_bytes_read;
-+ size_t unsized_bytes_read;
-
- // callback to read at least one byte, up to available input
- typedef jlong (*read_input_fn_t)(unpacker* self, void* buf, jlong minlen, jlong maxlen);
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
-@@ -81,7 +81,7 @@
- int assert_failed(const char* p) {
- char message[1<<12];
- sprintf(message, "@assert failed: %s\n", p);
-- fprintf(stdout, 1+message);
-+ fprintf(stdout, "%s", 1+message);
- breakpoint();
- unpack_abort(message);
- return 0;
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
-@@ -84,7 +84,7 @@
- }
-
- // Write data to the ZIP output stream.
--void jar::write_data(void* buff, int len) {
-+void jar::write_data(void* buff, size_t len) {
- while (len > 0) {
- int rc = (int)fwrite(buff, 1, len, jarfp);
- if (rc <= 0) {
-@@ -323,12 +323,12 @@
- // Total number of disks (int)
- header64[36] = (ushort)SWAP_BYTES(1);
- header64[37] = 0;
-- write_data(header64, (int)sizeof(header64));
-+ write_data(header64, sizeof(header64));
- }
-
- // Write the End of Central Directory structure.
- PRINTCR((2, "end-of-directory at %d\n", output_file_offset));
-- write_data(header, (int)sizeof(header));
-+ write_data(header, sizeof(header));
-
- PRINTCR((2, "writing zip comment\n"));
- // Write the comment.
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
-@@ -68,8 +68,8 @@
- }
-
- // Private Methods
-- void write_data(void* ptr, int len);
-- void write_data(bytes& b) { write_data(b.ptr, (int)b.len); }
-+ void write_data(void* ptr, size_t len);
-+ void write_data(bytes& b) { write_data(b.ptr, b.len); }
- void add_to_jar_directory(const char* fname, bool store, int modtime,
- int len, int clen, uLong crc);
- void write_jar_header(const char* fname, bool store, int modtime,
diff --git a/pr2737-allow_multiple_pkcs11_library_initialisation_to_be_a_non_critical_error.patch b/pr2737-allow_multiple_pkcs11_library_initialisation_to_be_a_non_critical_error.patch
new file mode 100644
index 0000000..f1e8bc2
--- /dev/null
+++ b/pr2737-allow_multiple_pkcs11_library_initialisation_to_be_a_non_critical_error.patch
@@ -0,0 +1,74 @@
+# 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 {
diff --git a/pr2815-race_condition_in_sunec_provider_with_system_nss_fix.patch b/pr2815-race_condition_in_sunec_provider_with_system_nss_fix.patch
new file mode 100644
index 0000000..db14f10
--- /dev/null
+++ b/pr2815-race_condition_in_sunec_provider_with_system_nss_fix.patch
@@ -0,0 +1,189 @@
+# HG changeset patch
+# User andrew
+# Date 1453867347 0
+# Wed Jan 27 04:02:27 2016 +0000
+# Node ID 26e2e029ee256e9815fdc324831a03d8582255e1
+# Parent 0ff7720931e8dbf7de25720bdc93b18527ab89e8
+PR2815: Race condition in SunEC provider with system NSS
+Summary: Perform initialisation and shutdown only when library is loaded or SunEC is finalized respectively
+
+diff -r 0ff7720931e8 -r 26e2e029ee25 make/mapfiles/libsunec/mapfile-vers
+--- openjdk/jdk/make/mapfiles/libsunec/mapfile-vers Wed Jan 27 03:45:06 2016 +0000
++++ openjdk/jdk/make/mapfiles/libsunec/mapfile-vers Wed Jan 27 04:02:27 2016 +0000
+@@ -31,6 +31,8 @@
+ Java_sun_security_ec_ECDSASignature_signDigest;
+ Java_sun_security_ec_ECDSASignature_verifySignedDigest;
+ Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
++ Java_sun_security_ec_SunEC_initialize;
++ Java_sun_security_ec_SunEC_cleanup;
+ local:
+ *;
+ };
+diff -r 0ff7720931e8 -r 26e2e029ee25 src/share/classes/sun/security/ec/SunEC.java
+--- openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java Wed Jan 27 03:45:06 2016 +0000
++++ openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java Wed Jan 27 04:02:27 2016 +0000
+@@ -58,6 +58,7 @@
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ public Void run() {
+ System.loadLibrary("sunec"); // check for native library
++ initialize();
+ return null;
+ }
+ });
+@@ -81,4 +82,22 @@
+ }
+ }
+
++ /**
++ * Cleanup native resources during finalisation.
++ */
++ @Override
++ protected void finalize() {
++ cleanup();
++ }
++
++ /**
++ * Initialize the native code.
++ */
++ private static native void initialize();
++
++ /**
++ * Cleanup in the native layer.
++ */
++ private static native void cleanup();
++
+ }
+diff -r 0ff7720931e8 -r 26e2e029ee25 src/share/native/sun/security/ec/ECC_JNI.cpp
+--- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 03:45:06 2016 +0000
++++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 04:02:27 2016 +0000
+@@ -121,13 +121,6 @@
+ goto cleanup;
+ }
+
+-#ifdef SYSTEM_NSS
+- if (SECOID_Init() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- goto cleanup;
+- }
+-#endif
+-
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -183,11 +176,6 @@
+ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
+-#ifdef SYSTEM_NSS
+- if (SECOID_Shutdown() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- }
+-#endif
+ }
+ if (ecparams) {
+ FreeECParams(ecparams, true);
+@@ -253,13 +241,6 @@
+ goto cleanup;
+ }
+
+-#ifdef SYSTEM_NSS
+- if (SECOID_Init() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- goto cleanup;
+- }
+-#endif
+-
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -307,11 +288,6 @@
+ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
+-#ifdef SYSTEM_NSS
+- if (SECOID_Shutdown() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- }
+-#endif
+ }
+ if (privKey.privateValue.data) {
+ env->ReleaseByteArrayElements(privateKey,
+@@ -378,13 +354,6 @@
+ goto cleanup;
+ }
+
+-#ifdef SYSTEM_NSS
+- if (SECOID_Init() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- goto cleanup;
+- }
+-#endif
+-
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -408,11 +377,6 @@
+ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
+-#ifdef SYSTEM_NSS
+- if (SECOID_Shutdown() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- }
+-#endif
+ }
+
+ if (pubKey.publicValue.data)
+@@ -474,13 +438,6 @@
+ goto cleanup;
+ }
+
+-#ifdef SYSTEM_NSS
+- if (SECOID_Init() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- goto cleanup;
+- }
+-#endif
+-
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -525,11 +482,6 @@
+ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
+-#ifdef SYSTEM_NSS
+- if (SECOID_Shutdown() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- }
+-#endif
+ }
+
+ if (ecparams)
+@@ -539,4 +491,26 @@
+ return jSecret;
+ }
+
++JNIEXPORT void
++JNICALL Java_sun_security_ec_SunEC_initialize
++ (JNIEnv *env, jclass UNUSED(clazz))
++{
++#ifdef SYSTEM_NSS
++ if (SECOID_Init() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
++#endif
++}
++
++JNIEXPORT void
++JNICALL Java_sun_security_ec_SunEC_cleanup
++ (JNIEnv *env, jclass UNUSED(clazz))
++{
++#ifdef SYSTEM_NSS
++ if (SECOID_Shutdown() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
++#endif
++}
++
+ } /* extern "C" */
diff --git a/pr2815.patch b/pr2815.patch
deleted file mode 100644
index db14f10..0000000
--- a/pr2815.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1453867347 0
-# Wed Jan 27 04:02:27 2016 +0000
-# Node ID 26e2e029ee256e9815fdc324831a03d8582255e1
-# Parent 0ff7720931e8dbf7de25720bdc93b18527ab89e8
-PR2815: Race condition in SunEC provider with system NSS
-Summary: Perform initialisation and shutdown only when library is loaded or SunEC is finalized respectively
-
-diff -r 0ff7720931e8 -r 26e2e029ee25 make/mapfiles/libsunec/mapfile-vers
---- openjdk/jdk/make/mapfiles/libsunec/mapfile-vers Wed Jan 27 03:45:06 2016 +0000
-+++ openjdk/jdk/make/mapfiles/libsunec/mapfile-vers Wed Jan 27 04:02:27 2016 +0000
-@@ -31,6 +31,8 @@
- Java_sun_security_ec_ECDSASignature_signDigest;
- Java_sun_security_ec_ECDSASignature_verifySignedDigest;
- Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
-+ Java_sun_security_ec_SunEC_initialize;
-+ Java_sun_security_ec_SunEC_cleanup;
- local:
- *;
- };
-diff -r 0ff7720931e8 -r 26e2e029ee25 src/share/classes/sun/security/ec/SunEC.java
---- openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java Wed Jan 27 03:45:06 2016 +0000
-+++ openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java Wed Jan 27 04:02:27 2016 +0000
-@@ -58,6 +58,7 @@
- AccessController.doPrivileged(new PrivilegedAction<Void>() {
- public Void run() {
- System.loadLibrary("sunec"); // check for native library
-+ initialize();
- return null;
- }
- });
-@@ -81,4 +82,22 @@
- }
- }
-
-+ /**
-+ * Cleanup native resources during finalisation.
-+ */
-+ @Override
-+ protected void finalize() {
-+ cleanup();
-+ }
-+
-+ /**
-+ * Initialize the native code.
-+ */
-+ private static native void initialize();
-+
-+ /**
-+ * Cleanup in the native layer.
-+ */
-+ private static native void cleanup();
-+
- }
-diff -r 0ff7720931e8 -r 26e2e029ee25 src/share/native/sun/security/ec/ECC_JNI.cpp
---- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 03:45:06 2016 +0000
-+++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 04:02:27 2016 +0000
-@@ -121,13 +121,6 @@
- goto cleanup;
- }
-
--#ifdef SYSTEM_NSS
-- if (SECOID_Init() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- goto cleanup;
-- }
--#endif
--
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -183,11 +176,6 @@
- if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
--#ifdef SYSTEM_NSS
-- if (SECOID_Shutdown() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- }
--#endif
- }
- if (ecparams) {
- FreeECParams(ecparams, true);
-@@ -253,13 +241,6 @@
- goto cleanup;
- }
-
--#ifdef SYSTEM_NSS
-- if (SECOID_Init() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- goto cleanup;
-- }
--#endif
--
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -307,11 +288,6 @@
- if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
--#ifdef SYSTEM_NSS
-- if (SECOID_Shutdown() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- }
--#endif
- }
- if (privKey.privateValue.data) {
- env->ReleaseByteArrayElements(privateKey,
-@@ -378,13 +354,6 @@
- goto cleanup;
- }
-
--#ifdef SYSTEM_NSS
-- if (SECOID_Init() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- goto cleanup;
-- }
--#endif
--
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -408,11 +377,6 @@
- if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
--#ifdef SYSTEM_NSS
-- if (SECOID_Shutdown() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- }
--#endif
- }
-
- if (pubKey.publicValue.data)
-@@ -474,13 +438,6 @@
- goto cleanup;
- }
-
--#ifdef SYSTEM_NSS
-- if (SECOID_Init() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- goto cleanup;
-- }
--#endif
--
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -525,11 +482,6 @@
- if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
--#ifdef SYSTEM_NSS
-- if (SECOID_Shutdown() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- }
--#endif
- }
-
- if (ecparams)
-@@ -539,4 +491,26 @@
- return jSecret;
- }
-
-+JNIEXPORT void
-+JNICALL Java_sun_security_ec_SunEC_initialize
-+ (JNIEnv *env, jclass UNUSED(clazz))
-+{
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Init() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
-+#endif
-+}
-+
-+JNIEXPORT void
-+JNICALL Java_sun_security_ec_SunEC_cleanup
-+ (JNIEnv *env, jclass UNUSED(clazz))
-+{
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Shutdown() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
-+#endif
-+}
-+
- } /* extern "C" */
diff --git a/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch b/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch
new file mode 100644
index 0000000..fc8f981
--- /dev/null
+++ b/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch
@@ -0,0 +1,60 @@
+# HG changeset patch
+# User andrew
+# Date 1459487045 -3600
+# Fri Apr 01 06:04:05 2016 +0100
+# Node ID 3334efeacd8327a14b7d2f392f4546e3c29c594b
+# Parent 6b81fd2227d14226f2121f2d51b464536925686e
+PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
+
+diff --git a/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java b/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
+--- openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
++++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
+@@ -174,15 +174,20 @@
+ storeFile = new File(storeFileName);
+ fis = getFileInputStream(storeFile);
+ } else {
+- String javaHome = props.get("javaHome");
+- storeFile = new File(javaHome + sep + "lib" + sep
+- + "security" + sep +
+- "jssecacerts");
++ /* Check system cacerts DB first; /etc/pki/java/cacerts */
++ storeFile = new File(sep + "etc" + sep + "pki" + sep
++ + "java" + sep + "cacerts");
+ if ((fis = getFileInputStream(storeFile)) == null) {
++ String javaHome = props.get("javaHome");
+ storeFile = new File(javaHome + sep + "lib" + sep
+- + "security" + sep +
+- "cacerts");
+- fis = getFileInputStream(storeFile);
++ + "security" + sep +
++ "jssecacerts");
++ if ((fis = getFileInputStream(storeFile)) == null) {
++ storeFile = new File(javaHome + sep + "lib" + sep
++ + "security" + sep +
++ "cacerts");
++ fis = getFileInputStream(storeFile);
++ }
+ }
+ }
+
+diff --git a/src/share/classes/sun/security/tools/KeyStoreUtil.java b/src/share/classes/sun/security/tools/KeyStoreUtil.java
+--- openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
++++ openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
+@@ -87,9 +87,14 @@
+ throws Exception
+ {
+ String sep = File.separator;
+- File file = new File(System.getProperty("java.home") + sep
+- + "lib" + sep + "security" + sep
+- + "cacerts");
++ /* Check system cacerts DB first; /etc/pki/java/cacerts */
++ File file = new File(sep + "etc" + sep + "pki" + sep
++ + "java" + sep + "cacerts");
++ if (!file.exists()) {
++ file = new File(System.getProperty("java.home") + sep
++ + "lib" + sep + "security" + sep
++ + "cacerts");
++ }
+ if (!file.exists()) {
+ return null;
+ }
diff --git a/pr2888.patch b/pr2888.patch
deleted file mode 100644
index fc8f981..0000000
--- a/pr2888.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1459487045 -3600
-# Fri Apr 01 06:04:05 2016 +0100
-# Node ID 3334efeacd8327a14b7d2f392f4546e3c29c594b
-# Parent 6b81fd2227d14226f2121f2d51b464536925686e
-PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
-
-diff --git a/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java b/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
---- openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
-+++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
-@@ -174,15 +174,20 @@
- storeFile = new File(storeFileName);
- fis = getFileInputStream(storeFile);
- } else {
-- String javaHome = props.get("javaHome");
-- storeFile = new File(javaHome + sep + "lib" + sep
-- + "security" + sep +
-- "jssecacerts");
-+ /* Check system cacerts DB first; /etc/pki/java/cacerts */
-+ storeFile = new File(sep + "etc" + sep + "pki" + sep
-+ + "java" + sep + "cacerts");
- if ((fis = getFileInputStream(storeFile)) == null) {
-+ String javaHome = props.get("javaHome");
- storeFile = new File(javaHome + sep + "lib" + sep
-- + "security" + sep +
-- "cacerts");
-- fis = getFileInputStream(storeFile);
-+ + "security" + sep +
-+ "jssecacerts");
-+ if ((fis = getFileInputStream(storeFile)) == null) {
-+ storeFile = new File(javaHome + sep + "lib" + sep
-+ + "security" + sep +
-+ "cacerts");
-+ fis = getFileInputStream(storeFile);
-+ }
- }
- }
-
-diff --git a/src/share/classes/sun/security/tools/KeyStoreUtil.java b/src/share/classes/sun/security/tools/KeyStoreUtil.java
---- openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
-+++ openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
-@@ -87,9 +87,14 @@
- throws Exception
- {
- String sep = File.separator;
-- File file = new File(System.getProperty("java.home") + sep
-- + "lib" + sep + "security" + sep
-- + "cacerts");
-+ /* Check system cacerts DB first; /etc/pki/java/cacerts */
-+ File file = new File(sep + "etc" + sep + "pki" + sep
-+ + "java" + sep + "cacerts");
-+ if (!file.exists()) {
-+ file = new File(System.getProperty("java.home") + sep
-+ + "lib" + sep + "security" + sep
-+ + "cacerts");
-+ }
- if (!file.exists()) {
- return null;
- }
diff --git a/pr2899-dont_use_withseed_versions_of_nss_functions_as_they_dont_fully_process_the_seed.patch b/pr2899-dont_use_withseed_versions_of_nss_functions_as_they_dont_fully_process_the_seed.patch
new file mode 100644
index 0000000..ffdefb0
--- /dev/null
+++ b/pr2899-dont_use_withseed_versions_of_nss_functions_as_they_dont_fully_process_the_seed.patch
@@ -0,0 +1,24 @@
+# HG changeset patch
+# User andrew
+# Date 1459313680 -3600
+# Wed Mar 30 05:54:40 2016 +0100
+# Node ID 9dc0eca5fa8926e6a952fa4f1931e78aa1f52443
+# Parent 8957aff589013e671f02d38023d5ff245ef27e87
+PR2899: Don't use WithSeed versions of NSS functions as they don't fully process the seed
+Contributed-by: Alex Kashchenko <akashche(a)redhat.com>
+Updated 2017/07/04 to accomodate 8175110 by Andrew Hughes <gnu.andrew(a)redhat.com>
+
+diff -r e5fdbb82bd49 src/share/native/sun/security/ec/ecc_impl.h
+--- openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
++++ openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
+@@ -267,8 +267,8 @@
+
+ #ifdef SYSTEM_NSS
+ #define EC_DecodeParams(a,b,c) EC_DecodeParams(a,b)
+-#define EC_NewKey(a,b,c,d,e) EC_NewKeyFromSeed(a,b,c,d)
+-#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigestWithSeed(a,b,c,d,e)
++#define EC_NewKey(a,b,c,d,e) EC_NewKey(a,b)
++#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigest(a,b,c)
+ #define ECDSA_VerifyDigest(a,b,c,d) ECDSA_VerifyDigest(a,b,c)
+ #define ECDH_Derive(a,b,c,d,e,f) ECDH_Derive(a,b,c,d,e)
+ #else
diff --git a/pr2899.patch b/pr2899.patch
deleted file mode 100644
index ffdefb0..0000000
--- a/pr2899.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1459313680 -3600
-# Wed Mar 30 05:54:40 2016 +0100
-# Node ID 9dc0eca5fa8926e6a952fa4f1931e78aa1f52443
-# Parent 8957aff589013e671f02d38023d5ff245ef27e87
-PR2899: Don't use WithSeed versions of NSS functions as they don't fully process the seed
-Contributed-by: Alex Kashchenko <akashche(a)redhat.com>
-Updated 2017/07/04 to accomodate 8175110 by Andrew Hughes <gnu.andrew(a)redhat.com>
-
-diff -r e5fdbb82bd49 src/share/native/sun/security/ec/ecc_impl.h
---- openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
-+++ openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
-@@ -267,8 +267,8 @@
-
- #ifdef SYSTEM_NSS
- #define EC_DecodeParams(a,b,c) EC_DecodeParams(a,b)
--#define EC_NewKey(a,b,c,d,e) EC_NewKeyFromSeed(a,b,c,d)
--#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigestWithSeed(a,b,c,d,e)
-+#define EC_NewKey(a,b,c,d,e) EC_NewKey(a,b)
-+#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigest(a,b,c)
- #define ECDSA_VerifyDigest(a,b,c,d) ECDSA_VerifyDigest(a,b,c)
- #define ECDH_Derive(a,b,c,d,e,f) ECDH_Derive(a,b,c,d,e)
- #else
diff --git a/pr2934-sunec_provider_throwing_keyexception_withine.separator_current_nss_thus_initialise_the_random_number_generator_and_feed_the_seed_to_it.patch b/pr2934-sunec_provider_throwing_keyexception_withine.separator_current_nss_thus_initialise_the_random_number_generator_and_feed_the_seed_to_it.patch
new file mode 100644
index 0000000..83385da
--- /dev/null
+++ b/pr2934-sunec_provider_throwing_keyexception_withine.separator_current_nss_thus_initialise_the_random_number_generator_and_feed_the_seed_to_it.patch
@@ -0,0 +1,91 @@
+# HG changeset patch
+# User andrew
+# Date 1461349033 -3600
+# Fri Apr 22 19:17:13 2016 +0100
+# Node ID dab76de2f91cf1791c03560a3f45aaa69f8351fd
+# Parent 3fa42705acab6d69b6141f47ebba4f85739a338c
+PR2934: SunEC provider throwing KeyException with current NSS
+Summary: Initialise the random number generator and feed the seed to it.
+Updated 2017/07/04 to accomodate 8175110
+
+diff -r 8aed1e903a4c src/share/native/sun/security/ec/ECC_JNI.cpp
+--- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
++++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
+@@ -134,8 +134,17 @@
+ env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
+
+ // Generate the new keypair (using the supplied seed)
++#ifdef SYSTEM_NSS
++ if (RNG_RandomUpdate((unsigned char *) pSeedBuffer, jSeedLength)
++ != SECSuccess) {
++ ThrowException(env, KEY_EXCEPTION);
++ goto cleanup;
++ }
++ if (EC_NewKey(ecparams, &privKey) != SECSuccess) {
++#else
+ if (EC_NewKey(ecparams, &privKey, (unsigned char *) pSeedBuffer,
+ jSeedLength, 0) != SECSuccess) {
++#endif
+ ThrowException(env, KEY_EXCEPTION);
+ goto cleanup;
+ }
+@@ -267,8 +276,18 @@
+ env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
+
+ // Sign the digest (using the supplied seed)
++#ifdef SYSTEM_NSS
++ if (RNG_RandomUpdate((unsigned char *) pSeedBuffer, jSeedLength)
++ != SECSuccess) {
++ ThrowException(env, KEY_EXCEPTION);
++ goto cleanup;
++ }
++ if (ECDSA_SignDigest(&privKey, &signature_item, &digest_item)
++ != SECSuccess) {
++#else
+ if (ECDSA_SignDigest(&privKey, &signature_item, &digest_item,
+ (unsigned char *) pSeedBuffer, jSeedLength, 0, timing) != SECSuccess) {
++#endif
+ ThrowException(env, KEY_EXCEPTION);
+ goto cleanup;
+ }
+@@ -499,6 +518,9 @@
+ if (SECOID_Init() != SECSuccess) {
+ ThrowException(env, INTERNAL_ERROR);
+ }
++ if (RNG_RNGInit() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
+ #endif
+ }
+
+@@ -507,6 +529,7 @@
+ (JNIEnv *env, jclass UNUSED(clazz))
+ {
+ #ifdef SYSTEM_NSS
++ RNG_RNGShutdown();
+ if (SECOID_Shutdown() != SECSuccess) {
+ ThrowException(env, INTERNAL_ERROR);
+ }
+diff -r 8aed1e903a4c src/share/native/sun/security/ec/ecc_impl.h
+--- openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
++++ openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
+@@ -254,8 +254,10 @@
+ This function is no longer required because the random bytes are now
+ supplied by the caller. Force a failure.
+ */
++#ifndef SYSTEM_NSS
+ #define RNG_GenerateGlobalRandomBytes(p,l) SECFailure
+ #endif
++#endif
+ #define CHECK_MPI_OK(func) if (MP_OKAY > (err = func)) goto cleanup
+ #define MP_TO_SEC_ERROR(err)
+
+@@ -267,8 +269,6 @@
+
+ #ifdef SYSTEM_NSS
+ #define EC_DecodeParams(a,b,c) EC_DecodeParams(a,b)
+-#define EC_NewKey(a,b,c,d,e) EC_NewKey(a,b)
+-#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigest(a,b,c)
+ #define ECDSA_VerifyDigest(a,b,c,d) ECDSA_VerifyDigest(a,b,c)
+ #define ECDH_Derive(a,b,c,d,e,f) ECDH_Derive(a,b,c,d,e)
+ #else
diff --git a/pr2934.patch b/pr2934.patch
deleted file mode 100644
index 83385da..0000000
--- a/pr2934.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1461349033 -3600
-# Fri Apr 22 19:17:13 2016 +0100
-# Node ID dab76de2f91cf1791c03560a3f45aaa69f8351fd
-# Parent 3fa42705acab6d69b6141f47ebba4f85739a338c
-PR2934: SunEC provider throwing KeyException with current NSS
-Summary: Initialise the random number generator and feed the seed to it.
-Updated 2017/07/04 to accomodate 8175110
-
-diff -r 8aed1e903a4c src/share/native/sun/security/ec/ECC_JNI.cpp
---- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
-+++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
-@@ -134,8 +134,17 @@
- env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
-
- // Generate the new keypair (using the supplied seed)
-+#ifdef SYSTEM_NSS
-+ if (RNG_RandomUpdate((unsigned char *) pSeedBuffer, jSeedLength)
-+ != SECSuccess) {
-+ ThrowException(env, KEY_EXCEPTION);
-+ goto cleanup;
-+ }
-+ if (EC_NewKey(ecparams, &privKey) != SECSuccess) {
-+#else
- if (EC_NewKey(ecparams, &privKey, (unsigned char *) pSeedBuffer,
- jSeedLength, 0) != SECSuccess) {
-+#endif
- ThrowException(env, KEY_EXCEPTION);
- goto cleanup;
- }
-@@ -267,8 +276,18 @@
- env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
-
- // Sign the digest (using the supplied seed)
-+#ifdef SYSTEM_NSS
-+ if (RNG_RandomUpdate((unsigned char *) pSeedBuffer, jSeedLength)
-+ != SECSuccess) {
-+ ThrowException(env, KEY_EXCEPTION);
-+ goto cleanup;
-+ }
-+ if (ECDSA_SignDigest(&privKey, &signature_item, &digest_item)
-+ != SECSuccess) {
-+#else
- if (ECDSA_SignDigest(&privKey, &signature_item, &digest_item,
- (unsigned char *) pSeedBuffer, jSeedLength, 0, timing) != SECSuccess) {
-+#endif
- ThrowException(env, KEY_EXCEPTION);
- goto cleanup;
- }
-@@ -499,6 +518,9 @@
- if (SECOID_Init() != SECSuccess) {
- ThrowException(env, INTERNAL_ERROR);
- }
-+ if (RNG_RNGInit() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
- #endif
- }
-
-@@ -507,6 +529,7 @@
- (JNIEnv *env, jclass UNUSED(clazz))
- {
- #ifdef SYSTEM_NSS
-+ RNG_RNGShutdown();
- if (SECOID_Shutdown() != SECSuccess) {
- ThrowException(env, INTERNAL_ERROR);
- }
-diff -r 8aed1e903a4c src/share/native/sun/security/ec/ecc_impl.h
---- openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
-+++ openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
-@@ -254,8 +254,10 @@
- This function is no longer required because the random bytes are now
- supplied by the caller. Force a failure.
- */
-+#ifndef SYSTEM_NSS
- #define RNG_GenerateGlobalRandomBytes(p,l) SECFailure
- #endif
-+#endif
- #define CHECK_MPI_OK(func) if (MP_OKAY > (err = func)) goto cleanup
- #define MP_TO_SEC_ERROR(err)
-
-@@ -267,8 +269,6 @@
-
- #ifdef SYSTEM_NSS
- #define EC_DecodeParams(a,b,c) EC_DecodeParams(a,b)
--#define EC_NewKey(a,b,c,d,e) EC_NewKey(a,b)
--#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigest(a,b,c)
- #define ECDSA_VerifyDigest(a,b,c,d) ECDSA_VerifyDigest(a,b,c)
- #define ECDH_Derive(a,b,c,d,e,f) ECDH_Derive(a,b,c,d,e)
- #else
diff --git a/pr2974-rh1337583-add_systemlineendings_option_to_keytool_and_use_line_separator_instead_of_crlf_in_pkcs10.patch b/pr2974-rh1337583-add_systemlineendings_option_to_keytool_and_use_line_separator_instead_of_crlf_in_pkcs10.patch
new file mode 100644
index 0000000..4859ca6
--- /dev/null
+++ b/pr2974-rh1337583-add_systemlineendings_option_to_keytool_and_use_line_separator_instead_of_crlf_in_pkcs10.patch
@@ -0,0 +1,148 @@
+# HG changeset patch
+# User andrew
+# Date 1464316115 -3600
+# Fri May 27 03:28:35 2016 +0100
+# Node ID 794541fbbdc323f7da8a5cee75611f977eee66ee
+# Parent 0be28a33e12dfc9ae1e4be381530643f691d351a
+PR2974: PKCS#10 certificate requests now use CRLF line endings rather than system line endings
+Summary: Add -systemlineendings option to keytool to allow system line endings to be used again.
+
+diff --git a/src/share/classes/sun/security/pkcs10/PKCS10.java b/src/share/classes/sun/security/pkcs10/PKCS10.java
+--- openjdk/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
+@@ -30,6 +30,7 @@
+ import java.io.IOException;
+ import java.math.BigInteger;
+
++import java.security.AccessController;
+ import java.security.cert.CertificateException;
+ import java.security.NoSuchAlgorithmException;
+ import java.security.InvalidKeyException;
+@@ -39,6 +40,7 @@
+
+ import java.util.Base64;
+
++import sun.security.action.GetPropertyAction;
+ import sun.security.util.*;
+ import sun.security.x509.AlgorithmId;
+ import sun.security.x509.X509Key;
+@@ -76,6 +78,14 @@
+ * @author Hemma Prafullchandra
+ */
+ public class PKCS10 {
++
++ private static final byte[] sysLineEndings;
++
++ static {
++ sysLineEndings =
++ AccessController.doPrivileged(new GetPropertyAction("line.separator")).getBytes();
++ }
++
+ /**
+ * Constructs an unsigned PKCS #10 certificate request. Before this
+ * request may be used, it must be encoded and signed. Then it
+@@ -293,13 +303,39 @@
+ */
+ public void print(PrintStream out)
+ throws IOException, SignatureException {
++ print(out, false);
++ }
++
++ /**
++ * Prints an E-Mailable version of the certificate request on the print
++ * stream passed. The format is a common base64 encoded one, supported
++ * by most Certificate Authorities because Netscape web servers have
++ * used this for some time. Some certificate authorities expect some
++ * more information, in particular contact information for the web
++ * server administrator.
++ *
++ * @param out the print stream where the certificate request
++ * will be printed.
++ * @param systemLineEndings true if the request should be terminated
++ * using the system line endings.
++ * @exception IOException when an output operation failed
++ * @exception SignatureException when the certificate request was
++ * not yet signed.
++ */
++ public void print(PrintStream out, boolean systemLineEndings)
++ throws IOException, SignatureException {
++ byte[] lineEndings;
++
+ if (encoded == null)
+ throw new SignatureException("Cert request was not signed");
+
++ if (systemLineEndings)
++ lineEndings = sysLineEndings;
++ else
++ lineEndings = new byte[] {'\r', '\n'}; // CRLF
+
+- byte[] CRLF = new byte[] {'\r', '\n'};
+ out.println("-----BEGIN NEW CERTIFICATE REQUEST-----");
+- out.println(Base64.getMimeEncoder(64, CRLF).encodeToString(encoded));
++ out.println(Base64.getMimeEncoder(64, lineEndings).encodeToString(encoded));
+ out.println("-----END NEW CERTIFICATE REQUEST-----");
+ }
+
+diff --git a/src/share/classes/sun/security/tools/keytool/Main.java b/src/share/classes/sun/security/tools/keytool/Main.java
+--- openjdk/jdk/src/share/classes/sun/security/tools/keytool/Main.java
++++ openjdk/jdk/src/share/classes/sun/security/tools/keytool/Main.java
+@@ -124,6 +124,7 @@
+ private String infilename = null;
+ private String outfilename = null;
+ private String srcksfname = null;
++ private boolean systemLineEndings = false;
+
+ // User-specified providers are added before any command is called.
+ // However, they are not removed before the end of the main() method.
+@@ -186,7 +187,7 @@
+ CERTREQ("Generates.a.certificate.request",
+ ALIAS, SIGALG, FILEOUT, KEYPASS, KEYSTORE, DNAME,
+ STOREPASS, STORETYPE, PROVIDERNAME, PROVIDERCLASS,
+- PROVIDERARG, PROVIDERPATH, V, PROTECTED),
++ PROVIDERARG, PROVIDERPATH, SYSTEMLINEENDINGS, V, PROTECTED),
+ CHANGEALIAS("Changes.an.entry.s.alias",
+ ALIAS, DESTALIAS, KEYPASS, KEYSTORE, STOREPASS,
+ STORETYPE, PROVIDERNAME, PROVIDERCLASS, PROVIDERARG,
+@@ -319,6 +320,7 @@
+ STARTDATE("startdate", "<startdate>", "certificate.validity.start.date.time"),
+ STOREPASS("storepass", "<arg>", "keystore.password"),
+ STORETYPE("storetype", "<storetype>", "keystore.type"),
++ SYSTEMLINEENDINGS("systemlineendings", null, "system.line.endings"),
+ TRUSTCACERTS("trustcacerts", null, "trust.certificates.from.cacerts"),
+ V("v", null, "verbose.output"),
+ VALIDITY("validity", "<valDays>", "validity.number.of.days");
+@@ -559,6 +561,8 @@
+ protectedPath = true;
+ } else if (collator.compare(flags, "-srcprotected") == 0) {
+ srcprotectedPath = true;
++ } else if (collator.compare(flags, "-systemlineendings") == 0) {
++ systemLineEndings = true;
+ } else {
+ System.err.println(rb.getString("Illegal.option.") + flags);
+ tinyHelp();
+@@ -1463,7 +1467,7 @@
+
+ // Sign the request and base-64 encode it
+ request.encodeAndSign(subject, signature);
+- request.print(out);
++ request.print(out, systemLineEndings);
+
+ checkWeak(rb.getString("the.generated.certificate.request"), request);
+ }
+@@ -4540,4 +4544,3 @@
+ return new Pair<>(a,b);
+ }
+ }
+-
+diff --git a/src/share/classes/sun/security/tools/keytool/Resources.java b/src/share/classes/sun/security/tools/keytool/Resources.java
+--- openjdk/jdk/src/share/classes/sun/security/tools/keytool/Resources.java
++++ openjdk/jdk/src/share/classes/sun/security/tools/keytool/Resources.java
+@@ -168,6 +168,8 @@
+ "keystore password"}, //-storepass
+ {"keystore.type",
+ "keystore type"}, //-storetype
++ {"system.line.endings",
++ "use system line endings rather than CRLF to terminate output"}, //-systemlineendings
+ {"trust.certificates.from.cacerts",
+ "trust certificates from cacerts"}, //-trustcacerts
+ {"verbose.output",
diff --git a/pr2974-rh1337583.patch b/pr2974-rh1337583.patch
deleted file mode 100644
index 4859ca6..0000000
--- a/pr2974-rh1337583.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1464316115 -3600
-# Fri May 27 03:28:35 2016 +0100
-# Node ID 794541fbbdc323f7da8a5cee75611f977eee66ee
-# Parent 0be28a33e12dfc9ae1e4be381530643f691d351a
-PR2974: PKCS#10 certificate requests now use CRLF line endings rather than system line endings
-Summary: Add -systemlineendings option to keytool to allow system line endings to be used again.
-
-diff --git a/src/share/classes/sun/security/pkcs10/PKCS10.java b/src/share/classes/sun/security/pkcs10/PKCS10.java
---- openjdk/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
-+++ openjdk/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
-@@ -30,6 +30,7 @@
- import java.io.IOException;
- import java.math.BigInteger;
-
-+import java.security.AccessController;
- import java.security.cert.CertificateException;
- import java.security.NoSuchAlgorithmException;
- import java.security.InvalidKeyException;
-@@ -39,6 +40,7 @@
-
- import java.util.Base64;
-
-+import sun.security.action.GetPropertyAction;
- import sun.security.util.*;
- import sun.security.x509.AlgorithmId;
- import sun.security.x509.X509Key;
-@@ -76,6 +78,14 @@
- * @author Hemma Prafullchandra
- */
- public class PKCS10 {
-+
-+ private static final byte[] sysLineEndings;
-+
-+ static {
-+ sysLineEndings =
-+ AccessController.doPrivileged(new GetPropertyAction("line.separator")).getBytes();
-+ }
-+
- /**
- * Constructs an unsigned PKCS #10 certificate request. Before this
- * request may be used, it must be encoded and signed. Then it
-@@ -293,13 +303,39 @@
- */
- public void print(PrintStream out)
- throws IOException, SignatureException {
-+ print(out, false);
-+ }
-+
-+ /**
-+ * Prints an E-Mailable version of the certificate request on the print
-+ * stream passed. The format is a common base64 encoded one, supported
-+ * by most Certificate Authorities because Netscape web servers have
-+ * used this for some time. Some certificate authorities expect some
-+ * more information, in particular contact information for the web
-+ * server administrator.
-+ *
-+ * @param out the print stream where the certificate request
-+ * will be printed.
-+ * @param systemLineEndings true if the request should be terminated
-+ * using the system line endings.
-+ * @exception IOException when an output operation failed
-+ * @exception SignatureException when the certificate request was
-+ * not yet signed.
-+ */
-+ public void print(PrintStream out, boolean systemLineEndings)
-+ throws IOException, SignatureException {
-+ byte[] lineEndings;
-+
- if (encoded == null)
- throw new SignatureException("Cert request was not signed");
-
-+ if (systemLineEndings)
-+ lineEndings = sysLineEndings;
-+ else
-+ lineEndings = new byte[] {'\r', '\n'}; // CRLF
-
-- byte[] CRLF = new byte[] {'\r', '\n'};
- out.println("-----BEGIN NEW CERTIFICATE REQUEST-----");
-- out.println(Base64.getMimeEncoder(64, CRLF).encodeToString(encoded));
-+ out.println(Base64.getMimeEncoder(64, lineEndings).encodeToString(encoded));
- out.println("-----END NEW CERTIFICATE REQUEST-----");
- }
-
-diff --git a/src/share/classes/sun/security/tools/keytool/Main.java b/src/share/classes/sun/security/tools/keytool/Main.java
---- openjdk/jdk/src/share/classes/sun/security/tools/keytool/Main.java
-+++ openjdk/jdk/src/share/classes/sun/security/tools/keytool/Main.java
-@@ -124,6 +124,7 @@
- private String infilename = null;
- private String outfilename = null;
- private String srcksfname = null;
-+ private boolean systemLineEndings = false;
-
- // User-specified providers are added before any command is called.
- // However, they are not removed before the end of the main() method.
-@@ -186,7 +187,7 @@
- CERTREQ("Generates.a.certificate.request",
- ALIAS, SIGALG, FILEOUT, KEYPASS, KEYSTORE, DNAME,
- STOREPASS, STORETYPE, PROVIDERNAME, PROVIDERCLASS,
-- PROVIDERARG, PROVIDERPATH, V, PROTECTED),
-+ PROVIDERARG, PROVIDERPATH, SYSTEMLINEENDINGS, V, PROTECTED),
- CHANGEALIAS("Changes.an.entry.s.alias",
- ALIAS, DESTALIAS, KEYPASS, KEYSTORE, STOREPASS,
- STORETYPE, PROVIDERNAME, PROVIDERCLASS, PROVIDERARG,
-@@ -319,6 +320,7 @@
- STARTDATE("startdate", "<startdate>", "certificate.validity.start.date.time"),
- STOREPASS("storepass", "<arg>", "keystore.password"),
- STORETYPE("storetype", "<storetype>", "keystore.type"),
-+ SYSTEMLINEENDINGS("systemlineendings", null, "system.line.endings"),
- TRUSTCACERTS("trustcacerts", null, "trust.certificates.from.cacerts"),
- V("v", null, "verbose.output"),
- VALIDITY("validity", "<valDays>", "validity.number.of.days");
-@@ -559,6 +561,8 @@
- protectedPath = true;
- } else if (collator.compare(flags, "-srcprotected") == 0) {
- srcprotectedPath = true;
-+ } else if (collator.compare(flags, "-systemlineendings") == 0) {
-+ systemLineEndings = true;
- } else {
- System.err.println(rb.getString("Illegal.option.") + flags);
- tinyHelp();
-@@ -1463,7 +1467,7 @@
-
- // Sign the request and base-64 encode it
- request.encodeAndSign(subject, signature);
-- request.print(out);
-+ request.print(out, systemLineEndings);
-
- checkWeak(rb.getString("the.generated.certificate.request"), request);
- }
-@@ -4540,4 +4544,3 @@
- return new Pair<>(a,b);
- }
- }
--
-diff --git a/src/share/classes/sun/security/tools/keytool/Resources.java b/src/share/classes/sun/security/tools/keytool/Resources.java
---- openjdk/jdk/src/share/classes/sun/security/tools/keytool/Resources.java
-+++ openjdk/jdk/src/share/classes/sun/security/tools/keytool/Resources.java
-@@ -168,6 +168,8 @@
- "keystore password"}, //-storepass
- {"keystore.type",
- "keystore type"}, //-storetype
-+ {"system.line.endings",
-+ "use system line endings rather than CRLF to terminate output"}, //-systemlineendings
- {"trust.certificates.from.cacerts",
- "trust certificates from cacerts"}, //-trustcacerts
- {"verbose.output",
diff --git a/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch b/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch
new file mode 100644
index 0000000..d44ed1d
--- /dev/null
+++ b/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch
@@ -0,0 +1,152 @@
+# HG changeset patch
+# User andrew
+# Date 1467652889 -3600
+# Mon Jul 04 18:21:29 2016 +0100
+# Node ID a4541d1d8609cadb08d3e31b40b9184ff32dd6c3
+# Parent bc6eab2038c603afb2eb2b4644f3b900c8fd0c46
+PR3083, RH1346460: Regression in SSL debug output without an ECC provider
+Summary: Return null rather than throwing an exception when there's no ECC provider.
+
+diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/Debug.java
+--- openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 17:08:12 2016 +0100
++++ openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 18:21:29 2016 +0100
+@@ -73,6 +73,7 @@
+ System.err.println("certpath PKIX CertPathBuilder and");
+ System.err.println(" CertPathValidator debugging");
+ System.err.println("combiner SubjectDomainCombiner debugging");
++ System.err.println("ecc Elliptic Curve Cryptography debugging");
+ System.err.println("gssloginconfig");
+ System.err.println(" GSS LoginConfigImpl debugging");
+ System.err.println("configfile JAAS ConfigFile loading");
+diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/ECUtil.java
+--- openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 17:08:12 2016 +0100
++++ openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 18:21:29 2016 +0100
+@@ -41,6 +41,9 @@
+
+ public class ECUtil {
+
++ /* Are we debugging ? */
++ private static final Debug debug = Debug.getInstance("ecc");
++
+ // Used by SunPKCS11 and SunJSSE.
+ public static ECPoint decodePoint(byte[] data, EllipticCurve curve)
+ throws IOException {
+@@ -90,6 +93,10 @@
+ }
+
+ private static AlgorithmParameters getECParameters(Provider p) {
++ return getECParameters(p, false);
++ }
++
++ private static AlgorithmParameters getECParameters(Provider p, boolean throwException) {
+ try {
+ if (p != null) {
+ return AlgorithmParameters.getInstance("EC", p);
+@@ -97,13 +104,21 @@
+
+ return AlgorithmParameters.getInstance("EC");
+ } catch (NoSuchAlgorithmException nsae) {
+- throw new RuntimeException(nsae);
++ if (throwException) {
++ throw new RuntimeException(nsae);
++ } else {
++ // ECC provider is optional so just return null
++ if (debug != null) {
++ debug.println("Provider unavailable: " + nsae);
++ }
++ return null;
++ }
+ }
+ }
+
+ public static byte[] encodeECParameterSpec(Provider p,
+ ECParameterSpec spec) {
+- AlgorithmParameters parameters = getECParameters(p);
++ AlgorithmParameters parameters = getECParameters(p, true);
+
+ try {
+ parameters.init(spec);
+@@ -122,11 +137,16 @@
+ public static ECParameterSpec getECParameterSpec(Provider p,
+ ECParameterSpec spec) {
+ AlgorithmParameters parameters = getECParameters(p);
++ if (parameters == null)
++ return null;
+
+ try {
+ parameters.init(spec);
+ return parameters.getParameterSpec(ECParameterSpec.class);
+ } catch (InvalidParameterSpecException ipse) {
++ if (debug != null) {
++ debug.println("Invalid parameter specification: " + ipse);
++ }
+ return null;
+ }
+ }
+@@ -135,34 +155,49 @@
+ byte[] params)
+ throws IOException {
+ AlgorithmParameters parameters = getECParameters(p);
++ if (parameters == null)
++ return null;
+
+ parameters.init(params);
+
+ try {
+ return parameters.getParameterSpec(ECParameterSpec.class);
+ } catch (InvalidParameterSpecException ipse) {
++ if (debug != null) {
++ debug.println("Invalid parameter specification: " + ipse);
++ }
+ return null;
+ }
+ }
+
+ public static ECParameterSpec getECParameterSpec(Provider p, String name) {
+ AlgorithmParameters parameters = getECParameters(p);
++ if (parameters == null)
++ return null;
+
+ try {
+ parameters.init(new ECGenParameterSpec(name));
+ return parameters.getParameterSpec(ECParameterSpec.class);
+ } catch (InvalidParameterSpecException ipse) {
++ if (debug != null) {
++ debug.println("Invalid parameter specification: " + ipse);
++ }
+ return null;
+ }
+ }
+
+ public static ECParameterSpec getECParameterSpec(Provider p, int keySize) {
+ AlgorithmParameters parameters = getECParameters(p);
++ if (parameters == null)
++ return null;
+
+ try {
+ parameters.init(new ECKeySizeParameterSpec(keySize));
+ return parameters.getParameterSpec(ECParameterSpec.class);
+ } catch (InvalidParameterSpecException ipse) {
++ if (debug != null) {
++ debug.println("Invalid parameter specification: " + ipse);
++ }
+ return null;
+ }
+
+@@ -171,11 +206,16 @@
+ public static String getCurveName(Provider p, ECParameterSpec spec) {
+ ECGenParameterSpec nameSpec;
+ AlgorithmParameters parameters = getECParameters(p);
++ if (parameters == null)
++ return null;
+
+ try {
+ parameters.init(spec);
+ nameSpec = parameters.getParameterSpec(ECGenParameterSpec.class);
+ } catch (InvalidParameterSpecException ipse) {
++ if (debug != null) {
++ debug.println("Invalid parameter specification: " + ipse);
++ }
+ return null;
+ }
+
diff --git a/pr3083-rh1346460.patch b/pr3083-rh1346460.patch
deleted file mode 100644
index d44ed1d..0000000
--- a/pr3083-rh1346460.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1467652889 -3600
-# Mon Jul 04 18:21:29 2016 +0100
-# Node ID a4541d1d8609cadb08d3e31b40b9184ff32dd6c3
-# Parent bc6eab2038c603afb2eb2b4644f3b900c8fd0c46
-PR3083, RH1346460: Regression in SSL debug output without an ECC provider
-Summary: Return null rather than throwing an exception when there's no ECC provider.
-
-diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/Debug.java
---- openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 17:08:12 2016 +0100
-+++ openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 18:21:29 2016 +0100
-@@ -73,6 +73,7 @@
- System.err.println("certpath PKIX CertPathBuilder and");
- System.err.println(" CertPathValidator debugging");
- System.err.println("combiner SubjectDomainCombiner debugging");
-+ System.err.println("ecc Elliptic Curve Cryptography debugging");
- System.err.println("gssloginconfig");
- System.err.println(" GSS LoginConfigImpl debugging");
- System.err.println("configfile JAAS ConfigFile loading");
-diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/ECUtil.java
---- openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 17:08:12 2016 +0100
-+++ openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 18:21:29 2016 +0100
-@@ -41,6 +41,9 @@
-
- public class ECUtil {
-
-+ /* Are we debugging ? */
-+ private static final Debug debug = Debug.getInstance("ecc");
-+
- // Used by SunPKCS11 and SunJSSE.
- public static ECPoint decodePoint(byte[] data, EllipticCurve curve)
- throws IOException {
-@@ -90,6 +93,10 @@
- }
-
- private static AlgorithmParameters getECParameters(Provider p) {
-+ return getECParameters(p, false);
-+ }
-+
-+ private static AlgorithmParameters getECParameters(Provider p, boolean throwException) {
- try {
- if (p != null) {
- return AlgorithmParameters.getInstance("EC", p);
-@@ -97,13 +104,21 @@
-
- return AlgorithmParameters.getInstance("EC");
- } catch (NoSuchAlgorithmException nsae) {
-- throw new RuntimeException(nsae);
-+ if (throwException) {
-+ throw new RuntimeException(nsae);
-+ } else {
-+ // ECC provider is optional so just return null
-+ if (debug != null) {
-+ debug.println("Provider unavailable: " + nsae);
-+ }
-+ return null;
-+ }
- }
- }
-
- public static byte[] encodeECParameterSpec(Provider p,
- ECParameterSpec spec) {
-- AlgorithmParameters parameters = getECParameters(p);
-+ AlgorithmParameters parameters = getECParameters(p, true);
-
- try {
- parameters.init(spec);
-@@ -122,11 +137,16 @@
- public static ECParameterSpec getECParameterSpec(Provider p,
- ECParameterSpec spec) {
- AlgorithmParameters parameters = getECParameters(p);
-+ if (parameters == null)
-+ return null;
-
- try {
- parameters.init(spec);
- return parameters.getParameterSpec(ECParameterSpec.class);
- } catch (InvalidParameterSpecException ipse) {
-+ if (debug != null) {
-+ debug.println("Invalid parameter specification: " + ipse);
-+ }
- return null;
- }
- }
-@@ -135,34 +155,49 @@
- byte[] params)
- throws IOException {
- AlgorithmParameters parameters = getECParameters(p);
-+ if (parameters == null)
-+ return null;
-
- parameters.init(params);
-
- try {
- return parameters.getParameterSpec(ECParameterSpec.class);
- } catch (InvalidParameterSpecException ipse) {
-+ if (debug != null) {
-+ debug.println("Invalid parameter specification: " + ipse);
-+ }
- return null;
- }
- }
-
- public static ECParameterSpec getECParameterSpec(Provider p, String name) {
- AlgorithmParameters parameters = getECParameters(p);
-+ if (parameters == null)
-+ return null;
-
- try {
- parameters.init(new ECGenParameterSpec(name));
- return parameters.getParameterSpec(ECParameterSpec.class);
- } catch (InvalidParameterSpecException ipse) {
-+ if (debug != null) {
-+ debug.println("Invalid parameter specification: " + ipse);
-+ }
- return null;
- }
- }
-
- public static ECParameterSpec getECParameterSpec(Provider p, int keySize) {
- AlgorithmParameters parameters = getECParameters(p);
-+ if (parameters == null)
-+ return null;
-
- try {
- parameters.init(new ECKeySizeParameterSpec(keySize));
- return parameters.getParameterSpec(ECParameterSpec.class);
- } catch (InvalidParameterSpecException ipse) {
-+ if (debug != null) {
-+ debug.println("Invalid parameter specification: " + ipse);
-+ }
- return null;
- }
-
-@@ -171,11 +206,16 @@
- public static String getCurveName(Provider p, ECParameterSpec spec) {
- ECGenParameterSpec nameSpec;
- AlgorithmParameters parameters = getECParameters(p);
-+ if (parameters == null)
-+ return null;
-
- try {
- parameters.init(spec);
- nameSpec = parameters.getParameterSpec(ECGenParameterSpec.class);
- } catch (InvalidParameterSpecException ipse) {
-+ if (debug != null) {
-+ debug.println("Invalid parameter specification: " + ipse);
-+ }
- return null;
- }
-
diff --git a/pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch b/pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch
new file mode 100644
index 0000000..5a619b4
--- /dev/null
+++ b/pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch
@@ -0,0 +1,158 @@
+
+# HG changeset patch
+# User andrew
+# Date 1478057514 0
+# Node ID 1c4d5cb2096ae55106111da200b0bcad304f650c
+# Parent 3d53f19b48384e5252f4ec8891f7a3a82d77af2a
+PR3183: Support Fedora/RHEL system crypto policy
+
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/classes/java/security/Security.java
+--- openjdk/jdk/src/share/classes/java/security/Security.java Wed Oct 26 03:51:39 2016 +0100
++++ openjdk/jdk/src/share/classes/java/security/Security.java Wed Nov 02 03:31:54 2016 +0000
+@@ -43,6 +43,9 @@
+ * implementation-specific location, which is typically the properties file
+ * {@code lib/security/java.security} in the Java installation directory.
+ *
++ * <p>Additional default values of security properties are read from a
++ * system-specific location, if available.</p>
++ *
+ * @author Benjamin Renaud
+ */
+
+@@ -52,6 +55,10 @@
+ private static final Debug sdebug =
+ Debug.getInstance("properties");
+
++ /* System property file*/
++ private static final String SYSTEM_PROPERTIES =
++ "/etc/crypto-policies/back-ends/java.config";
++
+ /* The java.security properties */
+ private static Properties props;
+
+@@ -93,6 +100,7 @@
+ if (sdebug != null) {
+ sdebug.println("reading security properties file: " +
+ propFile);
++ sdebug.println(props.toString());
+ }
+ } catch (IOException e) {
+ if (sdebug != null) {
+@@ -114,6 +122,31 @@
+ }
+
+ if ("true".equalsIgnoreCase(props.getProperty
++ ("security.useSystemPropertiesFile"))) {
++
++ // now load the system file, if it exists, so its values
++ // will win if they conflict with the earlier values
++ try (BufferedInputStream bis =
++ new BufferedInputStream(new FileInputStream(SYSTEM_PROPERTIES))) {
++ props.load(bis);
++ loadedProps = true;
++
++ if (sdebug != null) {
++ sdebug.println("reading system security properties file " +
++ SYSTEM_PROPERTIES);
++ sdebug.println(props.toString());
++ }
++ } catch (IOException e) {
++ if (sdebug != null) {
++ sdebug.println
++ ("unable to load security properties from " +
++ SYSTEM_PROPERTIES);
++ e.printStackTrace();
++ }
++ }
++ }
++
++ if ("true".equalsIgnoreCase(props.getProperty
+ ("security.overridePropertiesFile"))) {
+
+ String extraPropFile = System.getProperty
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-aix
+--- openjdk/jdk/src/share/lib/security/java.security-aix Wed Oct 26 03:51:39 2016 +0100
++++ openjdk/jdk/src/share/lib/security/java.security-aix Wed Nov 02 03:31:54 2016 +0000
+@@ -276,6 +276,13 @@
+ security.overridePropertiesFile=true
+
+ #
++# Determines whether this properties file will be appended to
++# using the system properties file stored at
++# /etc/crypto-policies/back-ends/java.config
++#
++security.useSystemPropertiesFile=false
++
++#
+ # Determines the default key and trust manager factory algorithms for
+ # the javax.net.ssl package.
+ #
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-linux
+--- openjdk/jdk/src/share/lib/security/java.security-linux Wed Oct 26 03:51:39 2016 +0100
++++ openjdk/jdk/src/share/lib/security/java.security-linux Wed Nov 02 03:31:54 2016 +0000
+@@ -276,6 +276,13 @@
+ security.overridePropertiesFile=true
+
+ #
++# Determines whether this properties file will be appended to
++# using the system properties file stored at
++# /etc/crypto-policies/back-ends/java.config
++#
++security.useSystemPropertiesFile=true
++
++#
+ # Determines the default key and trust manager factory algorithms for
+ # the javax.net.ssl package.
+ #
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-macosx
+--- openjdk/jdk/src/share/lib/security/java.security-macosx Wed Oct 26 03:51:39 2016 +0100
++++ openjdk/jdk/src/share/lib/security/java.security-macosx Wed Nov 02 03:31:54 2016 +0000
+@@ -279,6 +279,13 @@
+ security.overridePropertiesFile=true
+
+ #
++# Determines whether this properties file will be appended to
++# using the system properties file stored at
++# /etc/crypto-policies/back-ends/java.config
++#
++security.useSystemPropertiesFile=false
++
++#
+ # Determines the default key and trust manager factory algorithms for
+ # the javax.net.ssl package.
+ #
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-solaris
+--- openjdk/jdk/src/share/lib/security/java.security-solaris Wed Oct 26 03:51:39 2016 +0100
++++ openjdk/jdk/src/share/lib/security/java.security-solaris Wed Nov 02 03:31:54 2016 +0000
+@@ -278,6 +278,13 @@
+ security.overridePropertiesFile=true
+
+ #
++# Determines whether this properties file will be appended to
++# using the system properties file stored at
++# /etc/crypto-policies/back-ends/java.config
++#
++security.useSystemPropertiesFile=false
++
++#
+ # Determines the default key and trust manager factory algorithms for
+ # the javax.net.ssl package.
+ #
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-windows
+--- openjdk/jdk/src/share/lib/security/java.security-windows Wed Oct 26 03:51:39 2016 +0100
++++ openjdk/jdk/src/share/lib/security/java.security-windows Wed Nov 02 03:31:54 2016 +0000
+@@ -279,6 +279,13 @@
+ security.overridePropertiesFile=true
+
+ #
++# Determines whether this properties file will be appended to
++# using the system properties file stored at
++# /etc/crypto-policies/back-ends/java.config
++#
++security.useSystemPropertiesFile=false
++
++#
+ # Determines the default key and trust manager factory algorithms for
+ # the javax.net.ssl package.
+ #
+
diff --git a/pr3183-rh1340845-system-crypto-policy.patch b/pr3183-rh1340845-system-crypto-policy.patch
deleted file mode 100644
index 5a619b4..0000000
--- a/pr3183-rh1340845-system-crypto-policy.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-
-# HG changeset patch
-# User andrew
-# Date 1478057514 0
-# Node ID 1c4d5cb2096ae55106111da200b0bcad304f650c
-# Parent 3d53f19b48384e5252f4ec8891f7a3a82d77af2a
-PR3183: Support Fedora/RHEL system crypto policy
-
-diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/classes/java/security/Security.java
---- openjdk/jdk/src/share/classes/java/security/Security.java Wed Oct 26 03:51:39 2016 +0100
-+++ openjdk/jdk/src/share/classes/java/security/Security.java Wed Nov 02 03:31:54 2016 +0000
-@@ -43,6 +43,9 @@
- * implementation-specific location, which is typically the properties file
- * {@code lib/security/java.security} in the Java installation directory.
- *
-+ * <p>Additional default values of security properties are read from a
-+ * system-specific location, if available.</p>
-+ *
- * @author Benjamin Renaud
- */
-
-@@ -52,6 +55,10 @@
- private static final Debug sdebug =
- Debug.getInstance("properties");
-
-+ /* System property file*/
-+ private static final String SYSTEM_PROPERTIES =
-+ "/etc/crypto-policies/back-ends/java.config";
-+
- /* The java.security properties */
- private static Properties props;
-
-@@ -93,6 +100,7 @@
- if (sdebug != null) {
- sdebug.println("reading security properties file: " +
- propFile);
-+ sdebug.println(props.toString());
- }
- } catch (IOException e) {
- if (sdebug != null) {
-@@ -114,6 +122,31 @@
- }
-
- if ("true".equalsIgnoreCase(props.getProperty
-+ ("security.useSystemPropertiesFile"))) {
-+
-+ // now load the system file, if it exists, so its values
-+ // will win if they conflict with the earlier values
-+ try (BufferedInputStream bis =
-+ new BufferedInputStream(new FileInputStream(SYSTEM_PROPERTIES))) {
-+ props.load(bis);
-+ loadedProps = true;
-+
-+ if (sdebug != null) {
-+ sdebug.println("reading system security properties file " +
-+ SYSTEM_PROPERTIES);
-+ sdebug.println(props.toString());
-+ }
-+ } catch (IOException e) {
-+ if (sdebug != null) {
-+ sdebug.println
-+ ("unable to load security properties from " +
-+ SYSTEM_PROPERTIES);
-+ e.printStackTrace();
-+ }
-+ }
-+ }
-+
-+ if ("true".equalsIgnoreCase(props.getProperty
- ("security.overridePropertiesFile"))) {
-
- String extraPropFile = System.getProperty
-diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-aix
---- openjdk/jdk/src/share/lib/security/java.security-aix Wed Oct 26 03:51:39 2016 +0100
-+++ openjdk/jdk/src/share/lib/security/java.security-aix Wed Nov 02 03:31:54 2016 +0000
-@@ -276,6 +276,13 @@
- security.overridePropertiesFile=true
-
- #
-+# Determines whether this properties file will be appended to
-+# using the system properties file stored at
-+# /etc/crypto-policies/back-ends/java.config
-+#
-+security.useSystemPropertiesFile=false
-+
-+#
- # Determines the default key and trust manager factory algorithms for
- # the javax.net.ssl package.
- #
-diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-linux
---- openjdk/jdk/src/share/lib/security/java.security-linux Wed Oct 26 03:51:39 2016 +0100
-+++ openjdk/jdk/src/share/lib/security/java.security-linux Wed Nov 02 03:31:54 2016 +0000
-@@ -276,6 +276,13 @@
- security.overridePropertiesFile=true
-
- #
-+# Determines whether this properties file will be appended to
-+# using the system properties file stored at
-+# /etc/crypto-policies/back-ends/java.config
-+#
-+security.useSystemPropertiesFile=true
-+
-+#
- # Determines the default key and trust manager factory algorithms for
- # the javax.net.ssl package.
- #
-diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-macosx
---- openjdk/jdk/src/share/lib/security/java.security-macosx Wed Oct 26 03:51:39 2016 +0100
-+++ openjdk/jdk/src/share/lib/security/java.security-macosx Wed Nov 02 03:31:54 2016 +0000
-@@ -279,6 +279,13 @@
- security.overridePropertiesFile=true
-
- #
-+# Determines whether this properties file will be appended to
-+# using the system properties file stored at
-+# /etc/crypto-policies/back-ends/java.config
-+#
-+security.useSystemPropertiesFile=false
-+
-+#
- # Determines the default key and trust manager factory algorithms for
- # the javax.net.ssl package.
- #
-diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-solaris
---- openjdk/jdk/src/share/lib/security/java.security-solaris Wed Oct 26 03:51:39 2016 +0100
-+++ openjdk/jdk/src/share/lib/security/java.security-solaris Wed Nov 02 03:31:54 2016 +0000
-@@ -278,6 +278,13 @@
- security.overridePropertiesFile=true
-
- #
-+# Determines whether this properties file will be appended to
-+# using the system properties file stored at
-+# /etc/crypto-policies/back-ends/java.config
-+#
-+security.useSystemPropertiesFile=false
-+
-+#
- # Determines the default key and trust manager factory algorithms for
- # the javax.net.ssl package.
- #
-diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-windows
---- openjdk/jdk/src/share/lib/security/java.security-windows Wed Oct 26 03:51:39 2016 +0100
-+++ openjdk/jdk/src/share/lib/security/java.security-windows Wed Nov 02 03:31:54 2016 +0000
-@@ -279,6 +279,13 @@
- security.overridePropertiesFile=true
-
- #
-+# Determines whether this properties file will be appended to
-+# using the system properties file stored at
-+# /etc/crypto-policies/back-ends/java.config
-+#
-+security.useSystemPropertiesFile=false
-+
-+#
- # Determines the default key and trust manager factory algorithms for
- # the javax.net.ssl package.
- #
-
diff --git a/pr3479-rh1486025-sunec_provider_can_have_multiple_instances_leading_to_premature_nss_shutdown.patch b/pr3479-rh1486025-sunec_provider_can_have_multiple_instances_leading_to_premature_nss_shutdown.patch
new file mode 100644
index 0000000..14c693b
--- /dev/null
+++ b/pr3479-rh1486025-sunec_provider_can_have_multiple_instances_leading_to_premature_nss_shutdown.patch
@@ -0,0 +1,67 @@
+# HG changeset patch
+# User andrew
+# Date 1508194072 -3600
+# Mon Oct 16 23:47:52 2017 +0100
+# Node ID 5dcb55da00c1531264934559c9f10c2e0ae46420
+# Parent bf62c56e3604fee0018b19f65fd56c76dc156630
+PR3479, RH1486025: ECC and NSS JVM crash
+Summary: SunEC provider can have multiple instances, leading to premature NSS shutdown
+Contributed-by: Martin Balao <mbalao(a)redhat.com>
+
+diff --git a/make/mapfiles/libsunec/mapfile-vers b/make/mapfiles/libsunec/mapfile-vers
+--- openjdk/jdk/make/mapfiles/libsunec/mapfile-vers
++++ openjdk/jdk/make/mapfiles/libsunec/mapfile-vers
+@@ -32,7 +32,6 @@
+ Java_sun_security_ec_ECDSASignature_verifySignedDigest;
+ Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
+ Java_sun_security_ec_SunEC_initialize;
+- Java_sun_security_ec_SunEC_cleanup;
+ local:
+ *;
+ };
+diff --git a/src/share/classes/sun/security/ec/SunEC.java b/src/share/classes/sun/security/ec/SunEC.java
+--- openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java
++++ openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java
+@@ -83,21 +83,8 @@
+ }
+
+ /**
+- * Cleanup native resources during finalisation.
+- */
+- @Override
+- protected void finalize() {
+- cleanup();
+- }
+-
+- /**
+ * Initialize the native code.
+ */
+ private static native void initialize();
+
+- /**
+- * Cleanup in the native layer.
+- */
+- private static native void cleanup();
+-
+ }
+diff --git a/src/share/native/sun/security/ec/ECC_JNI.cpp b/src/share/native/sun/security/ec/ECC_JNI.cpp
+--- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
++++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
+@@ -525,14 +525,12 @@
+ }
+
+ JNIEXPORT void
+-JNICALL Java_sun_security_ec_SunEC_cleanup
+- (JNIEnv *env, jclass UNUSED(clazz))
++JNICALL JNI_OnUnload
++ (JavaVM *vm, void *reserved)
+ {
+ #ifdef SYSTEM_NSS
+ RNG_RNGShutdown();
+- if (SECOID_Shutdown() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- }
++ SECOID_Shutdown();
+ #endif
+ }
+
diff --git a/pr3479-rh1486025.patch b/pr3479-rh1486025.patch
deleted file mode 100644
index 14c693b..0000000
--- a/pr3479-rh1486025.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1508194072 -3600
-# Mon Oct 16 23:47:52 2017 +0100
-# Node ID 5dcb55da00c1531264934559c9f10c2e0ae46420
-# Parent bf62c56e3604fee0018b19f65fd56c76dc156630
-PR3479, RH1486025: ECC and NSS JVM crash
-Summary: SunEC provider can have multiple instances, leading to premature NSS shutdown
-Contributed-by: Martin Balao <mbalao(a)redhat.com>
-
-diff --git a/make/mapfiles/libsunec/mapfile-vers b/make/mapfiles/libsunec/mapfile-vers
---- openjdk/jdk/make/mapfiles/libsunec/mapfile-vers
-+++ openjdk/jdk/make/mapfiles/libsunec/mapfile-vers
-@@ -32,7 +32,6 @@
- Java_sun_security_ec_ECDSASignature_verifySignedDigest;
- Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
- Java_sun_security_ec_SunEC_initialize;
-- Java_sun_security_ec_SunEC_cleanup;
- local:
- *;
- };
-diff --git a/src/share/classes/sun/security/ec/SunEC.java b/src/share/classes/sun/security/ec/SunEC.java
---- openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java
-+++ openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java
-@@ -83,21 +83,8 @@
- }
-
- /**
-- * Cleanup native resources during finalisation.
-- */
-- @Override
-- protected void finalize() {
-- cleanup();
-- }
--
-- /**
- * Initialize the native code.
- */
- private static native void initialize();
-
-- /**
-- * Cleanup in the native layer.
-- */
-- private static native void cleanup();
--
- }
-diff --git a/src/share/native/sun/security/ec/ECC_JNI.cpp b/src/share/native/sun/security/ec/ECC_JNI.cpp
---- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
-+++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
-@@ -525,14 +525,12 @@
- }
-
- JNIEXPORT void
--JNICALL Java_sun_security_ec_SunEC_cleanup
-- (JNIEnv *env, jclass UNUSED(clazz))
-+JNICALL JNI_OnUnload
-+ (JavaVM *vm, void *reserved)
- {
- #ifdef SYSTEM_NSS
- RNG_RNGShutdown();
-- if (SECOID_Shutdown() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- }
-+ SECOID_Shutdown();
- #endif
- }
-
diff --git a/pr3519-fix_further_functions_with_a_missing_return_value.patch b/pr3519-fix_further_functions_with_a_missing_return_value.patch
new file mode 100644
index 0000000..51ca7f1
--- /dev/null
+++ b/pr3519-fix_further_functions_with_a_missing_return_value.patch
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User andrew
+# Date 1518669922 0
+# Thu Feb 15 04:45:22 2018 +0000
+# Node ID adaf109718c10888cce5b6e73af7f3e15a7ab0db
+# Parent 3ade0115344b77e6d00462044e0cf68722685bfe
+PR3519: Fix further functions with a missing return value.
+
+diff --git openjdk.orig/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
+--- openjdk.orig/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
++++ openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
+@@ -205,6 +205,7 @@
+ return Address(base, tmp, Address::lsl(addr->scale()));
+ }
+ }
++ return Address();
+ }
+
+ Address LIR_Assembler::as_Address_hi(LIR_Address* addr) {
diff --git a/pr3559-use_ldrexd_for_atomic_reads_on_armv7_zero.patch b/pr3559-use_ldrexd_for_atomic_reads_on_armv7_zero.patch
new file mode 100644
index 0000000..1c322fa
--- /dev/null
+++ b/pr3559-use_ldrexd_for_atomic_reads_on_armv7_zero.patch
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User aph
+# Date 1338206478 14400
+# Mon May 28 08:01:18 2012 -0400
+# Node ID 6275d7b419091092752d5a1854194c98897892ba
+# Parent be1379a186ba527b32c93a83e04c9600735fe44b
+PR3559: Use ldrexd for atomic reads on ARMv7.
+
+2012-05-28 Andrew Haley <aph(a)redhat.com>
+
+ * os_linux_zero.hpp (atomic_copy64): Use ldrexd for atomic reads
+ on ARMv7.
+
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
+@@ -54,6 +54,12 @@
+ "std %0, %1\n"
+ : "=&f"(tmp), "=Q"(*(volatile double*)dst)
+ : "Q"(*(volatile double*)src));
++#elif defined(__ARM_ARCH_7A__)
++ jlong tmp;
++ asm volatile ("ldrexd %0, [%1]\n"
++ : "=r"(tmp)
++ : "r"(src), "m"(src));
++ *(jlong *) dst = tmp;
+ #else
+ *(jlong *) dst = *(jlong *) src;
+ #endif
diff --git a/pr3559.patch b/pr3559.patch
deleted file mode 100644
index 48211dc..0000000
--- a/pr3559.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# HG changeset patch
-# User aph
-# Date 1338206478 14400
-# Mon May 28 08:01:18 2012 -0400
-# Node ID 6275d7b419091092752d5a1854194c98897892ba
-# Parent be1379a186ba527b32c93a83e04c9600735fe44b
-PR3559: Use ldrexd for atomic reads on ARMv7.
-
-2012-05-28 Andrew Haley <aph(a)redhat.com>
-
- * os_linux_zero.hpp (atomic_copy64): Use ldrexd for atomic reads
- on ARMv7.
-
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-@@ -54,6 +54,12 @@
- "std %0, 0(%2)\n"
- : "=r"(tmp)
- : "a"(src), "a"(dst));
-+#elif defined(__ARM_ARCH_7A__)
-+ jlong tmp;
-+ asm volatile ("ldrexd %0, [%1]\n"
-+ : "=r"(tmp)
-+ : "r"(src), "m"(src));
-+ *(jlong *) dst = tmp;
- #else
- *(jlong *) dst = *(jlong *) src;
- #endif
diff --git a/pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch b/pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch
new file mode 100644
index 0000000..ce24c59
--- /dev/null
+++ b/pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch
@@ -0,0 +1,42 @@
+# HG changeset patch
+# User andrew
+# Date 1525111445 -3600
+# Mon Apr 30 19:04:05 2018 +0100
+# Node ID 388fc8da23044317c160678ffa8ff541c216a255
+# Parent 556adf3a76aa81bf3918d7d46554dae7cc1d5c5c
+PR3575: System cacerts database handling should not affect jssecacerts
+
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
++++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
+@@ -162,7 +162,7 @@
+ * Try:
+ * javax.net.ssl.trustStore (if this variable exists, stop)
+ * jssecacerts
+- * cacerts
++ * cacerts (system and local)
+ *
+ * If none exists, we use an empty keystore.
+ */
+@@ -174,14 +174,14 @@
+ storeFile = new File(storeFileName);
+ fis = getFileInputStream(storeFile);
+ } else {
+- /* Check system cacerts DB first; /etc/pki/java/cacerts */
+- storeFile = new File(sep + "etc" + sep + "pki" + sep
+- + "java" + sep + "cacerts");
++ String javaHome = props.get("javaHome");
++ storeFile = new File(javaHome + sep + "lib" + sep
++ + "security" + sep +
++ "jssecacerts");
+ if ((fis = getFileInputStream(storeFile)) == null) {
+- String javaHome = props.get("javaHome");
+- storeFile = new File(javaHome + sep + "lib" + sep
+- + "security" + sep +
+- "jssecacerts");
++ /* Check system cacerts DB first; /etc/pki/java/cacerts */
++ storeFile = new File(sep + "etc" + sep + "pki" + sep
++ + "java" + sep + "cacerts");
+ if ((fis = getFileInputStream(storeFile)) == null) {
+ storeFile = new File(javaHome + sep + "lib" + sep
+ + "security" + sep +
diff --git a/pr3575-rh1567204.patch b/pr3575-rh1567204.patch
deleted file mode 100644
index ce24c59..0000000
--- a/pr3575-rh1567204.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1525111445 -3600
-# Mon Apr 30 19:04:05 2018 +0100
-# Node ID 388fc8da23044317c160678ffa8ff541c216a255
-# Parent 556adf3a76aa81bf3918d7d46554dae7cc1d5c5c
-PR3575: System cacerts database handling should not affect jssecacerts
-
-diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
---- openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
-+++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
-@@ -162,7 +162,7 @@
- * Try:
- * javax.net.ssl.trustStore (if this variable exists, stop)
- * jssecacerts
-- * cacerts
-+ * cacerts (system and local)
- *
- * If none exists, we use an empty keystore.
- */
-@@ -174,14 +174,14 @@
- storeFile = new File(storeFileName);
- fis = getFileInputStream(storeFile);
- } else {
-- /* Check system cacerts DB first; /etc/pki/java/cacerts */
-- storeFile = new File(sep + "etc" + sep + "pki" + sep
-- + "java" + sep + "cacerts");
-+ String javaHome = props.get("javaHome");
-+ storeFile = new File(javaHome + sep + "lib" + sep
-+ + "security" + sep +
-+ "jssecacerts");
- if ((fis = getFileInputStream(storeFile)) == null) {
-- String javaHome = props.get("javaHome");
-- storeFile = new File(javaHome + sep + "lib" + sep
-- + "security" + sep +
-- "jssecacerts");
-+ /* Check system cacerts DB first; /etc/pki/java/cacerts */
-+ storeFile = new File(sep + "etc" + sep + "pki" + sep
-+ + "java" + sep + "cacerts");
- if ((fis = getFileInputStream(storeFile)) == null) {
- storeFile = new File(javaHome + sep + "lib" + sep
- + "security" + sep +
diff --git a/pr3591.patch b/pr3591.patch
deleted file mode 100644
index e287590..0000000
--- a/pr3591.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1526489197 -3600
-# Wed May 16 17:46:37 2018 +0100
-# Node ID 64e87a408afd2b56d59dad73dee28d4b99463810
-# Parent 00ccc73498628a51a45301322e64ce2ad06e49be
-PR3591: Fix for bug 3533 doesn't add -mstackrealign to JDK code
-
-diff --git openjdk.orig///common/autoconf/toolchain.m4 openjdk///common/autoconf/toolchain.m4
---- openjdk.orig///common/autoconf/toolchain.m4
-+++ openjdk///common/autoconf/toolchain.m4
-@@ -794,6 +794,8 @@
- TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([$REALIGN_CFLAG -Werror], [],
- AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.])
- )
-+ CFLAGS_JDK="${CFLAGS_JDK} ${REALIGN_CFLAG}"
-+ CXXFLAGS_JDK="${CXXFLAGS_JDK} ${REALIGN_CFLAG}"
- AC_SUBST([REALIGN_CFLAG])
- fi
-
diff --git a/pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_equals_to_int.patch b/pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_equals_to_int.patch
new file mode 100644
index 0000000..2700f3c
--- /dev/null
+++ b/pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_equals_to_int.patch
@@ -0,0 +1,143 @@
+diff --git openjdk.orig/hotspot/src/share/vm/asm/codeBuffer.cpp openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp
+--- openjdk.orig/hotspot/src/share/vm/asm/codeBuffer.cpp
++++ openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp
+@@ -977,7 +977,7 @@
+ for (int n = (int) CodeBuffer::SECT_FIRST; n < (int) CodeBuffer::SECT_LIMIT; n++) {
+ CodeSection* sect = code_section(n);
+ if (!sect->is_allocated() || sect->is_empty()) continue;
+- xtty->print_cr("<sect index='%d' size='" SIZE_FORMAT "' free='" SIZE_FORMAT "'/>",
++ xtty->print_cr("<sect index='%d' size='" INTX_FORMAT "' free='" INTX_FORMAT "'/>",
+ n, sect->limit() - sect->start(), sect->limit() - sect->end());
+ }
+ xtty->print_cr("</blob>");
+diff --git openjdk.orig/hotspot/src/share/vm/code/codeCache.cpp openjdk/hotspot/src/share/vm/code/codeCache.cpp
+--- openjdk.orig/hotspot/src/share/vm/code/codeCache.cpp
++++ openjdk/hotspot/src/share/vm/code/codeCache.cpp
+@@ -192,7 +192,7 @@
+ }
+ if (PrintCodeCacheExtension) {
+ ResourceMark rm;
+- tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" SSIZE_FORMAT " bytes)",
++ tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" INTX_FORMAT " bytes)",
+ (intptr_t)_heap->low_boundary(), (intptr_t)_heap->high(),
+ (address)_heap->high() - (address)_heap->low_boundary());
+ }
+diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
+@@ -598,7 +598,7 @@
+ " [Table]\n"
+ " [Memory Usage: " G1_STRDEDUP_BYTES_FORMAT_NS "]\n"
+ " [Size: " SIZE_FORMAT ", Min: " SIZE_FORMAT ", Max: " SIZE_FORMAT "]\n"
+- " [Entries: " UINTX_FORMAT ", Load: " G1_STRDEDUP_PERCENT_FORMAT_NS ", Cached: " UINTX_FORMAT ", Added: " UINTX_FORMAT ", Removed: " UINTX_FORMAT "]\n"
++ " [Entries: " UINTX_FORMAT ", Load: " G1_STRDEDUP_PERCENT_FORMAT_NS ", Cached: " SIZE_FORMAT ", Added: " UINTX_FORMAT ", Removed: " UINTX_FORMAT "]\n"
+ " [Resize Count: " UINTX_FORMAT ", Shrink Threshold: " UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS "), Grow Threshold: " UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS ")]\n"
+ " [Rehash Count: " UINTX_FORMAT ", Rehash Threshold: " UINTX_FORMAT ", Hash Seed: 0x%x]\n"
+ " [Age Threshold: " UINTX_FORMAT "]",
+diff --git openjdk.orig/hotspot/src/share/vm/memory/blockOffsetTable.cpp openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp
+--- openjdk.orig/hotspot/src/share/vm/memory/blockOffsetTable.cpp
++++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp
+@@ -57,7 +57,7 @@
+ gclog_or_tty->print_cr("BlockOffsetSharedArray::BlockOffsetSharedArray: ");
+ gclog_or_tty->print_cr(" "
+ " rs.base(): " INTPTR_FORMAT
+- " rs.size(): " INTPTR_FORMAT
++ " rs.size(): " SIZE_FORMAT
+ " rs end(): " INTPTR_FORMAT,
+ p2i(rs.base()), rs.size(), p2i(rs.base() + rs.size()));
+ gclog_or_tty->print_cr(" "
+diff --git openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
+--- openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp
++++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
+@@ -1055,7 +1055,8 @@
+ size_t expected = msp.scale_by_NewRatio_aligned(initial_heap_size);
+ assert(msp.initial_gen0_size() == expected, err_msg("%zu != %zu", msp.initial_gen0_size(), expected));
+ assert(FLAG_IS_ERGO(NewSize) && NewSize == expected,
+- err_msg("NewSize should have been set ergonomically to %zu, but was %zu", expected, NewSize));
++ err_msg("NewSize should have been set ergonomically to " SIZE_FORMAT ", but was " UINTX_FORMAT,
++ expected, NewSize));
+ }
+
+ private:
+diff --git openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+@@ -1291,14 +1291,14 @@
+ }
+ if (PrintGCDetails && Verbose) {
+ // Too early to use gclog_or_tty
+- tty->print_cr("CMS ergo set MaxNewSize: " SIZE_FORMAT, MaxNewSize);
++ tty->print_cr("CMS ergo set MaxNewSize: " UINTX_FORMAT, MaxNewSize);
+ }
+
+ // Code along this path potentially sets NewSize and OldSize
+ if (PrintGCDetails && Verbose) {
+ // Too early to use gclog_or_tty
+- tty->print_cr("CMS set min_heap_size: " SIZE_FORMAT
+- " initial_heap_size: " SIZE_FORMAT
++ tty->print_cr("CMS set min_heap_size: " UINTX_FORMAT
++ " initial_heap_size: " UINTX_FORMAT
+ " max_heap: " SIZE_FORMAT,
+ min_heap_size(), InitialHeapSize, max_heap);
+ }
+@@ -1314,7 +1314,7 @@
+ 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);
++ tty->print_cr("CMS ergo set NewSize: " UINTX_FORMAT, NewSize);
+ }
+ }
+ // Unless explicitly requested otherwise, size old gen
+@@ -1324,7 +1324,7 @@
+ FLAG_SET_ERGO(uintx, OldSize, MIN2((size_t)(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);
++ tty->print_cr("CMS ergo set OldSize: " UINTX_FORMAT, OldSize);
+ }
+ }
+ }
+@@ -2043,7 +2043,7 @@
+
+ if (PrintGCDetails && Verbose) {
+ // Cannot use gclog_or_tty yet.
+- tty->print_cr(" Initial heap size " SIZE_FORMAT, (uintx)reasonable_initial);
++ tty->print_cr(" Initial heap size " SIZE_FORMAT, (size_t)reasonable_initial);
+ }
+ FLAG_SET_ERGO(uintx, InitialHeapSize, (uintx)reasonable_initial);
+ }
+@@ -2053,7 +2053,7 @@
+ set_min_heap_size(MIN2((uintx)reasonable_minimum, InitialHeapSize));
+ if (PrintGCDetails && Verbose) {
+ // Cannot use gclog_or_tty yet.
+- tty->print_cr(" Minimum heap size " SIZE_FORMAT, min_heap_size());
++ tty->print_cr(" Minimum heap size " UINTX_FORMAT, min_heap_size());
+ }
+ }
+ }
+diff --git openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp
++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+@@ -1389,12 +1389,21 @@
+
+ #define INTPTR_FORMAT_W(width) "%" #width PRIxPTR
+
++#if defined(S390) && !defined(_LP64)
++#define SSIZE_FORMAT "%z" PRIdPTR
++#define SIZE_FORMAT "%z" PRIuPTR
++#define SIZE_FORMAT_HEX "0x%z" PRIxPTR
++#define SSIZE_FORMAT_W(width) "%" #width "z" PRIdPTR
++#define SIZE_FORMAT_W(width) "%" #width "z" PRIuPTR
++#define SIZE_FORMAT_HEX_W(width) "0x%" #width "z" PRIxPTR
++#else // !S390
+ #define SSIZE_FORMAT "%" PRIdPTR
+ #define SIZE_FORMAT "%" PRIuPTR
+ #define SIZE_FORMAT_HEX "0x%" PRIxPTR
+ #define SSIZE_FORMAT_W(width) "%" #width PRIdPTR
+ #define SIZE_FORMAT_W(width) "%" #width PRIuPTR
+ #define SIZE_FORMAT_HEX_W(width) "0x%" #width PRIxPTR
++#endif // S390
+
+ #define INTX_FORMAT "%" PRIdPTR
+ #define UINTX_FORMAT "%" PRIuPTR
diff --git a/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch b/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
new file mode 100644
index 0000000..d1e9576
--- /dev/null
+++ b/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
@@ -0,0 +1,38 @@
+# HG changeset patch
+# User andrew
+# Date 1529475043 -3600
+# Wed Jun 20 07:10:43 2018 +0100
+# Node ID f6341f4635dacb56678264d29a88cd052b74036b
+# Parent 30520d5018b509b0ae68f5fcc9a5c540e3e5b2de
+PR3601: Fix additional -Wreturn-type issues introduced by 8061651
+
+diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
+--- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
++++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
+@@ -835,7 +835,7 @@
+ JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname))
+ JVMWrapper("JVM_KnownToNotExist");
+ #if INCLUDE_CDS
+- return ClassLoaderExt::known_to_not_exist(env, loader, classname, CHECK_(false));
++ return ClassLoaderExt::known_to_not_exist(env, loader, classname, THREAD);
+ #else
+ return false;
+ #endif
+@@ -845,7 +845,7 @@
+ JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader))
+ JVMWrapper("JVM_GetResourceLookupCacheURLs");
+ #if INCLUDE_CDS
+- return ClassLoaderExt::get_lookup_cache_urls(env, loader, CHECK_NULL);
++ return ClassLoaderExt::get_lookup_cache_urls(env, loader, THREAD);
+ #else
+ return NULL;
+ #endif
+@@ -855,7 +855,7 @@
+ JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name))
+ JVMWrapper("JVM_GetResourceLookupCache");
+ #if INCLUDE_CDS
+- return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, CHECK_NULL);
++ return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, THREAD);
+ #else
+ return NULL;
+ #endif
diff --git a/pr3601.patch b/pr3601.patch
deleted file mode 100644
index d1e9576..0000000
--- a/pr3601.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1529475043 -3600
-# Wed Jun 20 07:10:43 2018 +0100
-# Node ID f6341f4635dacb56678264d29a88cd052b74036b
-# Parent 30520d5018b509b0ae68f5fcc9a5c540e3e5b2de
-PR3601: Fix additional -Wreturn-type issues introduced by 8061651
-
-diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
---- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
-+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
-@@ -835,7 +835,7 @@
- JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname))
- JVMWrapper("JVM_KnownToNotExist");
- #if INCLUDE_CDS
-- return ClassLoaderExt::known_to_not_exist(env, loader, classname, CHECK_(false));
-+ return ClassLoaderExt::known_to_not_exist(env, loader, classname, THREAD);
- #else
- return false;
- #endif
-@@ -845,7 +845,7 @@
- JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader))
- JVMWrapper("JVM_GetResourceLookupCacheURLs");
- #if INCLUDE_CDS
-- return ClassLoaderExt::get_lookup_cache_urls(env, loader, CHECK_NULL);
-+ return ClassLoaderExt::get_lookup_cache_urls(env, loader, THREAD);
- #else
- return NULL;
- #endif
-@@ -855,7 +855,7 @@
- JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name))
- JVMWrapper("JVM_GetResourceLookupCache");
- #if INCLUDE_CDS
-- return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, CHECK_NULL);
-+ return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, THREAD);
- #else
- return NULL;
- #endif
diff --git a/pr3634-fix_shenandoah_for_size_t_on_s390.patch b/pr3634-fix_shenandoah_for_size_t_on_s390.patch
new file mode 100644
index 0000000..20a4625
--- /dev/null
+++ b/pr3634-fix_shenandoah_for_size_t_on_s390.patch
@@ -0,0 +1,14 @@
+diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp
+@@ -524,8 +524,8 @@
+ region_size = max_heap_size / ShenandoahTargetNumRegions;
+
+ // Now make sure that we don't go over or under our limits.
+- region_size = MAX2(ShenandoahMinRegionSize, region_size);
+- region_size = MIN2(ShenandoahMaxRegionSize, region_size);
++ region_size = MAX2<size_t>(ShenandoahMinRegionSize, region_size);
++ region_size = MIN2<size_t>(ShenandoahMaxRegionSize, region_size);
+
+ } else {
+ if (ShenandoahHeapRegionSize > initial_heap_size / MIN_NUM_REGIONS) {
diff --git a/repackReproduciblePolycies.sh b/repackReproduciblePolycies.sh
index 271cb74..f356bd3 100644
--- a/repackReproduciblePolycies.sh
+++ b/repackReproduciblePolycies.sh
@@ -1,13 +1,17 @@
#!/bin/sh
+set -e
# https://bugzilla.redhat.com/show_bug.cgi?id=1142153
M=META-INF/MANIFEST.MF
-#P=/usr/lib/jvm/java/jre/lib/security
-P=$1/lib/security
+#P=/usr/lib/jvm/java/jre/lib/security/policy
+P=$1/lib/security/policy
+ERRORS=0
+ for type in unlimited limited ; do
for f in local_policy.jar US_export_policy.jar ; do
-ORIG=$P/$f
+ORIG=$P/$type/$f
echo "processing $f ($ORIG)"
if [ ! -f $ORIG ]; then
echo "File not found! $ORIG"
+ let ERRORS=$ERRORS+1
continue
fi
d=`mktemp -d`
@@ -35,3 +39,6 @@ NW=$d/$f
touch -t 201401010000 $ORIG
rm -rfv $d
done
+ done
+
+exit $ERRORS
diff --git a/rh1163501-increase_2048_bit_dh_upper_bound_fedora_infrastructure_in_dhparametergenerator.patch b/rh1163501-increase_2048_bit_dh_upper_bound_fedora_infrastructure_in_dhparametergenerator.patch
new file mode 100644
index 0000000..d9cbac4
--- /dev/null
+++ b/rh1163501-increase_2048_bit_dh_upper_bound_fedora_infrastructure_in_dhparametergenerator.patch
@@ -0,0 +1,66 @@
+diff --git a/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java b/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
+--- openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
++++ openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
+@@ -1,5 +1,6 @@
+ /*
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2014 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
+@@ -61,13 +62,13 @@
+
+ private static void checkKeySize(int keysize)
+ throws InvalidParameterException {
+- boolean supported = ((keysize == 2048) || (keysize == 3072) ||
++ boolean supported = ((keysize == 2048) || (keysize == 3072) || (keysize == 4096) ||
+ ((keysize >= 512) && (keysize <= 1024) && ((keysize & 0x3F) == 0)));
+
+ if (!supported) {
+ throw new InvalidParameterException(
+ "DH key size must be multiple of 64 and range " +
+- "from 512 to 1024 (inclusive), or 2048, 3072. " +
++ "from 512 to 1024 (inclusive), or 2048, 3072, 4096. " +
+ "The specific key size " + keysize + " is not supported");
+ }
+ }
+diff --git a/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java b/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
+--- openjdk/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
++++ openjdk/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
+@@ -1,5 +1,6 @@
+ /*
+ * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2014 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
+@@ -58,7 +59,7 @@
+ */
+ private enum Sizes {
+ two56(256), three84(384), five12(512), seven68(768), ten24(1024),
+- twenty48(2048);
++ twenty48(2048), forty96(4096);
+
+ private final int intSize;
+ private final BigInteger bigIntValue;
+@@ -130,6 +131,19 @@
+ kp = kpg.generateKeyPair();
+ checkKeyPair(kp, Sizes.twenty48, Sizes.five12);
+
++ kpg.initialize(Sizes.forty96.getIntSize());
++ kp = kpg.generateKeyPair();
++ checkKeyPair(kp, Sizes.forty96, Sizes.twenty48);
++
++ publicKey = (DHPublicKey)kp.getPublic();
++ p = publicKey.getParams().getP();
++ g = publicKey.getParams().getG();
++
++ // test w/ all values specified
++ kpg.initialize(new DHParameterSpec(p, g, Sizes.ten24.getIntSize()));
++ kp = kpg.generateKeyPair();
++ checkKeyPair(kp, Sizes.forty96, Sizes.ten24);
++
+ System.out.println("OK");
+ }
+
+
diff --git a/rh1163501.patch b/rh1163501.patch
deleted file mode 100644
index d9cbac4..0000000
--- a/rh1163501.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java b/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
---- openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
-+++ openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
-@@ -1,5 +1,6 @@
- /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2014 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
-@@ -61,13 +62,13 @@
-
- private static void checkKeySize(int keysize)
- throws InvalidParameterException {
-- boolean supported = ((keysize == 2048) || (keysize == 3072) ||
-+ boolean supported = ((keysize == 2048) || (keysize == 3072) || (keysize == 4096) ||
- ((keysize >= 512) && (keysize <= 1024) && ((keysize & 0x3F) == 0)));
-
- if (!supported) {
- throw new InvalidParameterException(
- "DH key size must be multiple of 64 and range " +
-- "from 512 to 1024 (inclusive), or 2048, 3072. " +
-+ "from 512 to 1024 (inclusive), or 2048, 3072, 4096. " +
- "The specific key size " + keysize + " is not supported");
- }
- }
-diff --git a/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java b/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
---- openjdk/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
-+++ openjdk/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
-@@ -1,5 +1,6 @@
- /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2014 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
-@@ -58,7 +59,7 @@
- */
- private enum Sizes {
- two56(256), three84(384), five12(512), seven68(768), ten24(1024),
-- twenty48(2048);
-+ twenty48(2048), forty96(4096);
-
- private final int intSize;
- private final BigInteger bigIntValue;
-@@ -130,6 +131,19 @@
- kp = kpg.generateKeyPair();
- checkKeyPair(kp, Sizes.twenty48, Sizes.five12);
-
-+ kpg.initialize(Sizes.forty96.getIntSize());
-+ kp = kpg.generateKeyPair();
-+ checkKeyPair(kp, Sizes.forty96, Sizes.twenty48);
-+
-+ publicKey = (DHPublicKey)kp.getPublic();
-+ p = publicKey.getParams().getP();
-+ g = publicKey.getParams().getG();
-+
-+ // test w/ all values specified
-+ kpg.initialize(new DHParameterSpec(p, g, Sizes.ten24.getIntSize()));
-+ kp = kpg.generateKeyPair();
-+ checkKeyPair(kp, Sizes.forty96, Sizes.ten24);
-+
- System.out.println("OK");
- }
-
-
diff --git a/rh1176206-jdk.patch b/rh1176206-jdk.patch
deleted file mode 100644
index 23b8e52..0000000
--- a/rh1176206-jdk.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- openjdk/jdk/make/lib/Awt2dLibraries.gmk 2016-02-29 17:11:00.497484904 +0100
-+++ openjdk/jdk/make/lib/Awt2dLibraries.gmk 2016-02-29 17:11:00.402486574 +0100
-@@ -618,7 +618,7 @@
- XRSurfaceData.c \
- XRBackendNative.c
-
-- LIBAWT_XAWT_LDFLAGS_SUFFIX := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc
-+ LIBAWT_XAWT_LDFLAGS_SUFFIX := $(LIBM) -lawt -lXext -lX11 -lXrender -lXcomposite $(LIBDL) -lXtst -lXi -ljava -ljvm -lc
-
- ifeq ($(OPENJDK_TARGET_OS), linux)
- # To match old build, add this to LDFLAGS instead of suffix.
---- openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c 2016-02-29 17:11:00.777479982 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c 2016-02-29 17:11:00.677481740 +0100
-@@ -38,6 +38,7 @@
- #include <X11/extensions/XTest.h>
- #include <X11/extensions/XInput.h>
- #include <X11/extensions/XI.h>
-+#include <X11/extensions/Xcomposite.h>
- #include <jni.h>
- #include <sizecalc.h>
- #include "robot_common.h"
-@@ -88,6 +89,32 @@
- return isXTestAvailable;
- }
-
-+static Bool hasXCompositeOverlayExtension(Display *display) {
-+
-+ int xoverlay = False;
-+ int eventBase, errorBase;
-+ if (XCompositeQueryExtension(display, &eventBase, &errorBase)) {
-+ int major = 0;
-+ int minor = 0;
-+
-+ XCompositeQueryVersion(display, &major, &minor);
-+ if (major > 0 || minor >= 3)
-+ xoverlay = True;
-+ }
-+
-+ return xoverlay;
-+}
-+
-+static jboolean isXCompositeDisplay(Display *display, int screenNumber) {
-+
-+ char NET_WM_CM_Sn[25];
-+ snprintf(NET_WM_CM_Sn, sizeof(NET_WM_CM_Sn), "_NET_WM_CM_S%d\0", screenNumber);
-+
-+ Atom managerSelection = XInternAtom(display, NET_WM_CM_Sn, 0);
-+ Window owner = XGetSelectionOwner(display, managerSelection);
-+
-+ return owner != 0;
-+}
-
- static XImage *getWindowImage(Display * display, Window window,
- int32_t x, int32_t y,
-@@ -232,6 +259,12 @@
- DASSERT(adata != NULL);
-
- rootWindow = XRootWindow(awt_display, adata->awt_visInfo.screen);
-+ if (isXCompositeDisplay(awt_display, adata->awt_visInfo.screen) &&
-+ hasXCompositeOverlayExtension(awt_display))
-+ {
-+ rootWindow = XCompositeGetOverlayWindow(awt_display, rootWindow);
-+ }
-+
- image = getWindowImage(awt_display, rootWindow, x, y, width, height);
-
- /* Array to use to crunch around the pixel values */
diff --git a/rh1176206-root.patch b/rh1176206-root.patch
deleted file mode 100644
index db1061c..0000000
--- a/rh1176206-root.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- openjdk/common/autoconf/help.m4 2016-02-29 17:10:45.542747800 +0100
-+++ openjdk/common/autoconf/help.m4 2016-02-29 17:10:45.500748539 +0100
-@@ -112,7 +112,7 @@
- pulse)
- PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
- x11)
-- PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;;
-+ PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev libXcomposite-dev" ;;
- ccache)
- PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
- esac
---- openjdk/common/autoconf/libraries.m4 2016-02-29 17:10:45.716744742 +0100
-+++ openjdk/common/autoconf/libraries.m4 2016-02-29 17:10:45.675745462 +0100
-@@ -153,7 +153,7 @@
- CFLAGS="$CFLAGS $X_CFLAGS"
-
- # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
-- AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h],
-+ AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h X11/extensions/Xcomposite.h],
- [X11_A_OK=yes],
- [X11_A_OK=no; break],
- [
-@@ -167,7 +167,7 @@
-
- if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then
- HELP_MSG_MISSING_DEPENDENCY([x11])
-- AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG])
-+ AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h Xcomposite.h). $HELP_MSG])
- fi
-
- AC_SUBST(X_CFLAGS)
diff --git a/rh1566890_embargoed20180521.patch b/rh1566890_embargoed20180521.patch
deleted file mode 100644
index e29bdb9..0000000
--- a/rh1566890_embargoed20180521.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-# ssbd2.patch
---- ./openjdk/hotspot/src/os/linux/vm/os_linux.cpp~ 2018-05-02 13:02:51.924489199 -0400
-+++ ./openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2018-05-02 13:04:57.274216581 -0400
-@@ -102,6 +102,8 @@
- # include <inttypes.h>
- # include <sys/ioctl.h>
-
-+#include <sys/prctl.h>
-+
- PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
- #ifndef _GNU_SOURCE
-@@ -4892,6 +4894,31 @@
- }
- }
-
-+/* Per task speculation control */
-+#ifndef PR_GET_SPECULATION_CTRL
-+#define PR_GET_SPECULATION_CTRL 52
-+#endif
-+#ifndef PR_SET_SPECULATION_CTRL
-+#define PR_SET_SPECULATION_CTRL 53
-+#endif
-+/* Speculation control variants */
-+# undef PR_SPEC_STORE_BYPASS
-+# define PR_SPEC_STORE_BYPASS 0
-+/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
-+# undef PR_SPEC_NOT_AFFECTED
-+# undef PR_SPEC_PRCTL
-+# undef PR_SPEC_ENABLE
-+# undef PR_SPEC_DISABLE
-+# define PR_SPEC_NOT_AFFECTED 0
-+# define PR_SPEC_PRCTL (1UL << 0)
-+# define PR_SPEC_ENABLE (1UL << 1)
-+# define PR_SPEC_DISABLE (1UL << 2)
-+
-+static void set_speculation() __attribute__((constructor));
-+static void set_speculation() {
-+ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
-+}
-+
- // this is called _before_ the most of global arguments have been parsed
- void os::init(void) {
- char dummy; /* used to get a guess on initial stack address */
diff --git a/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch b/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch
new file mode 100644
index 0000000..d8f3a5a
--- /dev/null
+++ b/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch
@@ -0,0 +1,44 @@
+diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -103,6 +103,8 @@
+ # include <inttypes.h>
+ # include <sys/ioctl.h>
+
++#include <sys/prctl.h>
++
+ PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
+
+ #ifndef _GNU_SOURCE
+@@ -4997,6 +4999,31 @@
+ }
+ }
+
++/* Per task speculation control */
++#ifndef PR_GET_SPECULATION_CTRL
++#define PR_GET_SPECULATION_CTRL 52
++#endif
++#ifndef PR_SET_SPECULATION_CTRL
++#define PR_SET_SPECULATION_CTRL 53
++#endif
++/* Speculation control variants */
++# undef PR_SPEC_STORE_BYPASS
++# define PR_SPEC_STORE_BYPASS 0
++/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
++# undef PR_SPEC_NOT_AFFECTED
++# undef PR_SPEC_PRCTL
++# undef PR_SPEC_ENABLE
++# undef PR_SPEC_DISABLE
++# define PR_SPEC_NOT_AFFECTED 0
++# define PR_SPEC_PRCTL (1UL << 0)
++# define PR_SPEC_ENABLE (1UL << 1)
++# define PR_SPEC_DISABLE (1UL << 2)
++
++static void set_speculation() __attribute__((constructor));
++static void set_speculation() {
++ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
++}
++
+ // this is called _before_ most of the global arguments have been parsed
+ void os::init(void) {
+ char dummy; /* used to get a guess on initial stack address */
diff --git a/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch b/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
new file mode 100644
index 0000000..bddd702
--- /dev/null
+++ b/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
@@ -0,0 +1,16 @@
+diff -uNr openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java jdk8/jdk/src/share/classes/java/awt/Toolkit.java
+--- openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 11:59:47.000000000 -0500
++++ jdk8/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 12:05:20.000000000 -0500
+@@ -883,7 +883,11 @@
+ return null;
+ }
+ });
+- loadAssistiveTechnologies();
++ try {
++ loadAssistiveTechnologies();
++ } catch ( AWTError error) {
++ // ignore silently
++ }
+ }
+ return toolkit;
+ }
diff --git a/rh1648246-always_instruct_vm_to_assume_multiple_processors_are_available.patch b/rh1648246-always_instruct_vm_to_assume_multiple_processors_are_available.patch
new file mode 100644
index 0000000..b0a874d
--- /dev/null
+++ b/rh1648246-always_instruct_vm_to_assume_multiple_processors_are_available.patch
@@ -0,0 +1,12 @@
+diff --git a/src/share/vm/runtime/globals.hpp b/src/share/vm/runtime/globals.hpp
+--- openjdk/hotspot/src/share/vm/runtime/globals.hpp
++++ openjdk/hotspot/src/share/vm/runtime/globals.hpp
+@@ -530,7 +530,7 @@
+ lp64_product(intx, ObjectAlignmentInBytes, 8, \
+ "Default object alignment in bytes, 8 is minimum") \
+ \
+- product(bool, AssumeMP, false, \
++ product(bool, AssumeMP, true, \
+ "Instruct the VM to assume multiple processors are available") \
+ \
+ /* UseMembar is theoretically a temp flag used for memory barrier \
diff --git a/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch b/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
new file mode 100644
index 0000000..febd87e
--- /dev/null
+++ b/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
@@ -0,0 +1,11 @@
+diff -r 5b86f66575b7 src/share/lib/security/java.security-linux
+--- openjdk/jdk/src/share/lib/security/java.security-linux Tue May 16 13:29:05 2017 -0700
++++ openjdk/jdk/src/share/lib/security/java.security-linux Tue Jun 06 14:05:12 2017 +0200
+@@ -74,6 +74,7 @@
+ security.provider.7=com.sun.security.sasl.Provider
+ security.provider.8=org.jcp.xml.dsig.internal.dom.XMLDSigRI
+ security.provider.9=sun.security.smartcardio.SunPCSC
++#security.provider.10=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/nss.cfg
+
+ #
+ # Sun Provider SecureRandom seed source.
diff --git a/rh1648644-java_access_bridge_privileged_security.patch b/rh1648644-java_access_bridge_privileged_security.patch
new file mode 100644
index 0000000..538468a
--- /dev/null
+++ b/rh1648644-java_access_bridge_privileged_security.patch
@@ -0,0 +1,24 @@
+--- jdk8/jdk/src/share/lib/security/java.security-linux.orig
++++ jdk8/jdk/src/share/lib/security/java.security-linux
+@@ -223,7 +223,9 @@
+ jdk.nashorn.internal.,\
+ jdk.nashorn.tools.,\
+ jdk.xml.internal.,\
+- com.sun.activation.registries.
++ com.sun.activation.registries.,\
++ org.GNOME.Accessibility.,\
++ org.GNOME.Bonobo.
+
+ #
+ # List of comma-separated packages that start with or equal this string
+@@ -273,7 +275,9 @@
+ jdk.nashorn.internal.,\
+ jdk.nashorn.tools.,\
+ jdk.xml.internal.,\
+- com.sun.activation.registries.
++ com.sun.activation.registries.,\
++ org.GNOME.Accessibility.,\
++ org.GNOME.Bonobo.
+
+ #
+ # Determines whether this properties file can be appended to
diff --git a/rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch b/rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch
new file mode 100644
index 0000000..e319492
--- /dev/null
+++ b/rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch
@@ -0,0 +1,16 @@
+diff --git openjdk.orig/jdk/make/lib/Awt2dLibraries.gmk openjdk/jdk/make/lib/Awt2dLibraries.gmk
+--- openjdk.orig/jdk/make/lib/Awt2dLibraries.gmk
++++ openjdk/jdk/make/lib/Awt2dLibraries.gmk
+@@ -891,6 +891,12 @@
+ BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
+ endif
+
++# Turn off strict overflow with GCC for IndicRearrangementProcessor.cpp
++ifeq ($(OPENJDK_TARGET_OS), linux)
++ BUILD_LIBFONTMANAGER_IndicRearrangementProcessor.cpp_CXXFLAGS := -fno-strict-overflow
++ BUILD_LIBFONTMANAGER_IndicRearrangementProcessor2.cpp_CXXFLAGS := -fno-strict-overflow
++endif
++
+ # LDFLAGS clarification:
+ # Filter relevant linker flags disallowing unresolved symbols as we cannot
+ # build-time decide to which library to link against (libawt_headless or
diff --git a/s390-size_t_format_flags.patch b/s390-size_t_format_flags.patch
deleted file mode 100644
index 451c806..0000000
--- a/s390-size_t_format_flags.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -r cf43a852f486 src/share/vm/asm/codeBuffer.cpp
---- openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp Wed Jan 13 05:30:26 2016 +0000
-@@ -977,7 +977,7 @@
- for (int n = (int) CodeBuffer::SECT_FIRST; n < (int) CodeBuffer::SECT_LIMIT; n++) {
- CodeSection* sect = code_section(n);
- if (!sect->is_allocated() || sect->is_empty()) continue;
-- xtty->print_cr("<sect index='%d' size='" SIZE_FORMAT "' free='" SIZE_FORMAT "'/>",
-+ xtty->print_cr("<sect index='%d' size='" INTX_FORMAT "' free='" INTX_FORMAT "'/>",
- n, sect->limit() - sect->start(), sect->limit() - sect->end());
- }
- xtty->print_cr("</blob>");
-diff -r cf43a852f486 src/share/vm/code/codeCache.cpp
---- openjdk/hotspot/src/share/vm/code/codeCache.cpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/code/codeCache.cpp Wed Jan 13 05:30:26 2016 +0000
-@@ -191,7 +191,7 @@
- }
- if (PrintCodeCacheExtension) {
- ResourceMark rm;
-- tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" SSIZE_FORMAT " bytes)",
-+ tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" INTX_FORMAT " bytes)",
- (intptr_t)_heap->low_boundary(), (intptr_t)_heap->high(),
- (address)_heap->high() - (address)_heap->low_boundary());
- }
-diff -r cf43a852f486 src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp Wed Jan 13 05:30:26 2016 +0000
-@@ -556,7 +556,7 @@
- " [Table]\n"
- " [Memory Usage: "G1_STRDEDUP_BYTES_FORMAT_NS"]\n"
- " [Size: "SIZE_FORMAT", Min: "SIZE_FORMAT", Max: "SIZE_FORMAT"]\n"
-- " [Entries: "UINTX_FORMAT", Load: "G1_STRDEDUP_PERCENT_FORMAT_NS", Cached: " UINTX_FORMAT ", Added: "UINTX_FORMAT", Removed: "UINTX_FORMAT"]\n"
-+ " [Entries: "UINTX_FORMAT", Load: "G1_STRDEDUP_PERCENT_FORMAT_NS", Cached: " SIZE_FORMAT ", Added: "UINTX_FORMAT", Removed: "UINTX_FORMAT"]\n"
- " [Resize Count: "UINTX_FORMAT", Shrink Threshold: "UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS"), Grow Threshold: "UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS")]\n"
- " [Rehash Count: "UINTX_FORMAT", Rehash Threshold: "UINTX_FORMAT", Hash Seed: 0x%x]\n"
- " [Age Threshold: "UINTX_FORMAT"]",
-diff -r cf43a852f486 src/share/vm/memory/blockOffsetTable.cpp
---- openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp Wed Jan 13 05:30:26 2016 +0000
-@@ -57,7 +57,7 @@
- gclog_or_tty->print_cr("BlockOffsetSharedArray::BlockOffsetSharedArray: ");
- gclog_or_tty->print_cr(" "
- " rs.base(): " INTPTR_FORMAT
-- " rs.size(): " INTPTR_FORMAT
-+ " rs.size(): " SIZE_FORMAT
- " rs end(): " INTPTR_FORMAT,
- p2i(rs.base()), rs.size(), p2i(rs.base() + rs.size()));
- gclog_or_tty->print_cr(" "
-diff -r cf43a852f486 src/share/vm/runtime/arguments.cpp
---- openjdk/hotspot/src/share/vm/runtime/arguments.cpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp Wed Jan 13 05:30:26 2016 +0000
-@@ -1285,14 +1285,14 @@
- }
- if (PrintGCDetails && Verbose) {
- // Too early to use gclog_or_tty
-- tty->print_cr("CMS ergo set MaxNewSize: " SIZE_FORMAT, MaxNewSize);
-+ tty->print_cr("CMS ergo set MaxNewSize: " UINTX_FORMAT, MaxNewSize);
- }
-
- // Code along this path potentially sets NewSize and OldSize
- if (PrintGCDetails && Verbose) {
- // Too early to use gclog_or_tty
-- tty->print_cr("CMS set min_heap_size: " SIZE_FORMAT
-- " initial_heap_size: " SIZE_FORMAT
-+ tty->print_cr("CMS set min_heap_size: " UINTX_FORMAT
-+ " initial_heap_size: " UINTX_FORMAT
- " max_heap: " SIZE_FORMAT,
- min_heap_size(), InitialHeapSize, max_heap);
- }
-@@ -1308,7 +1308,7 @@
- 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);
-+ tty->print_cr("CMS ergo set NewSize: " UINTX_FORMAT, NewSize);
- }
- }
- // Unless explicitly requested otherwise, size old gen
-@@ -1318,7 +1318,7 @@
- FLAG_SET_ERGO(uintx, OldSize, MIN2((size_t)(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);
-+ tty->print_cr("CMS ergo set OldSize: " UINTX_FORMAT, OldSize);
- }
- }
- }
-@@ -1834,7 +1834,7 @@
-
- if (PrintGCDetails && Verbose) {
- // Cannot use gclog_or_tty yet.
-- tty->print_cr(" Initial heap size " SIZE_FORMAT, (uintx)reasonable_initial);
-+ tty->print_cr(" Initial heap size " SIZE_FORMAT, (size_t)reasonable_initial);
- }
- FLAG_SET_ERGO(uintx, InitialHeapSize, (uintx)reasonable_initial);
- }
-@@ -1844,7 +1844,7 @@
- set_min_heap_size(MIN2((uintx)reasonable_minimum, InitialHeapSize));
- if (PrintGCDetails && Verbose) {
- // Cannot use gclog_or_tty yet.
-- tty->print_cr(" Minimum heap size " SIZE_FORMAT, min_heap_size());
-+ tty->print_cr(" Minimum heap size " UINTX_FORMAT, min_heap_size());
- }
- }
- }
-diff -r cf43a852f486 src/share/vm/utilities/globalDefinitions.hpp
---- openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp Wed Jan 13 05:30:26 2016 +0000
-@@ -1382,12 +1382,21 @@
-
- #define INTPTR_FORMAT_W(width) "%" #width PRIxPTR
-
-+#if defined(S390) && !defined(_LP64)
-+#define SSIZE_FORMAT "%z" PRIdPTR
-+#define SIZE_FORMAT "%z" PRIuPTR
-+#define SIZE_FORMAT_HEX "0x%z" PRIxPTR
-+#define SSIZE_FORMAT_W(width) "%" #width "z" PRIdPTR
-+#define SIZE_FORMAT_W(width) "%" #width "z" PRIuPTR
-+#define SIZE_FORMAT_HEX_W(width) "0x%" #width "z" PRIxPTR
-+#else // !S390
- #define SSIZE_FORMAT "%" PRIdPTR
- #define SIZE_FORMAT "%" PRIuPTR
- #define SIZE_FORMAT_HEX "0x%" PRIxPTR
- #define SSIZE_FORMAT_W(width) "%" #width PRIdPTR
- #define SIZE_FORMAT_W(width) "%" #width PRIuPTR
- #define SIZE_FORMAT_HEX_W(width) "0x%" #width PRIxPTR
-+#endif // S390
-
- #define INTX_FORMAT "%" PRIdPTR
- #define UINTX_FORMAT "%" PRIuPTR
diff --git a/soundFontPatch.patch b/soundFontPatch.patch
deleted file mode 100644
index 2009642..0000000
--- a/soundFontPatch.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-# HG changeset patch
-# User omajid
-# Date 1445973555 14400
-# Node ID 3e006ea10d21a7fcf15725c51f2ab7ededce53ab
-# Parent dfeaf40df80032570558c031f37f6630dc729e3f
-8140620: Find and load default.sf2 as the default soundbank on Linux
-Reviewed-by: serb
-
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java
---- openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java
-@@ -671,6 +671,40 @@
- actions.add(new PrivilegedAction<InputStream>() {
- public InputStream run() {
- if (System.getProperties().getProperty("os.name")
-+ .startsWith("Linux")) {
-+
-+ File[] systemSoundFontsDir = new File[] {
-+ /* Arch, Fedora, Mageia */
-+ new File("/usr/share/soundfonts/"),
-+ new File("/usr/local/share/soundfonts/"),
-+ /* Debian, Gentoo, OpenSUSE, Ubuntu */
-+ new File("/usr/share/sounds/sf2/"),
-+ new File("/usr/local/share/sounds/sf2/"),
-+ };
-+
-+ /*
-+ * Look for a default.sf2
-+ */
-+ for (File systemSoundFontDir : systemSoundFontsDir) {
-+ if (systemSoundFontDir.exists()) {
-+ File defaultSoundFont = new File(systemSoundFontDir, "default.sf2");
-+ if (defaultSoundFont.exists()) {
-+ try {
-+ return new FileInputStream(defaultSoundFont);
-+ } catch (IOException e) {
-+ // continue with lookup
-+ }
-+ }
-+ }
-+ }
-+ }
-+ return null;
-+ }
-+ });
-+
-+ actions.add(new PrivilegedAction<InputStream>() {
-+ public InputStream run() {
-+ if (System.getProperties().getProperty("os.name")
- .startsWith("Windows")) {
- File gm_dls = new File(System.getenv("SystemRoot")
- + "\\system32\\drivers\\gm.dls");
-
-
diff --git a/sources b/sources
index 4f77f62..107fb21 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (aarch32-port-jdk8u-jdk8u191-b12-aarch32-181022.tar.xz) = fa2de38295c71c3eddbfdf41983804dd65419ad94deb362a838cda6ea29fb6e6e6c78addd3b877007c875a1ab8d457b02914d4e0b6d078b1e93f497999b3c543
-SHA512 (systemtap-tapset-3.4.0pre01.tar.xz) = 4446fa20f88bbce53b583484bf06cb2b476c9372beb898dc2b7739eaa5c98b9979fbd72e12474fb344833d831a19366b82216ee03b452411745e6cd3527faa4e
+SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = d2a1e463487982fff24c398d51b4549dbf4bb5da89bb145238313185373164a57ce9a05de352624d196d129f5a6d52518fee9d792205298fa7a663827eb5c230
+SHA512 (aarch32-port-jdk8u-jdk8u201-b09-aarch32-190124.tar.xz) = 4cfb62206d0f66f0c579e5512786b07fd0598f5403dad69d6d07e09fc184681880584f629e09f9ef23b86b12d1b3cb64eaa6bd0095c252a5d505e2c3cb840d99
diff --git a/system-lcms.patch b/system-lcms.patch
deleted file mode 100644
index 6f39b57..0000000
--- a/system-lcms.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
---- openjdk/common/autoconf/libraries.m4 2013-11-14 22:04:38.039440136 -0500
-+++ openjdk/common/autoconf/libraries.m4 2013-11-14 22:05:11.474356424 -0500
-@@ -676,6 +676,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
- #
-
-diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.gmk
---- openjdk/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 22:04:38.040440133 -0500
-+++ openjdk/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 22:05:11.475356411 -0500
-@@ -666,18 +666,35 @@
-
- ##########################################################################################
-
-+LIBLCMS_DIR := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms
-+
-+ifeq ($(USE_EXTERNAL_LCMS), true)
-+ # If we're using an external library, we'll just need the wrapper part.
-+ # By including it explicitely, all other files will be excluded.
-+ BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c
-+ BUILD_LIBLCMS_HEADERS :=
-+else
-+ BUILD_LIBLCMS_INCLUDE_FILES :=
-+ # If we're using the bundled library, we'll need to include it in the
-+ # include path explicitly. Otherwise the system headers will be used.
-+ BUILD_LIBLCMS_HEADERS := -I$(LIBLCMS_DIR)
-+endif
-+
- # TODO: Update awt lib path when awt is converted
- $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
- LIBRARY := lcms, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-- SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
-+ SRC := $(LIBLCMS_DIR), \
-+ INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
- LANG := C, \
- OPTIMIZATION := HIGHEST, \
- CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
- -DCMS_DONT_USE_FAST_FLOOR \
- $(SHARED_LIBRARY_FLAGS) \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
-- -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
-+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
-+ $(BUILD_LIBLCMS_HEADERS) \
-+ $(LCMS_CFLAGS), \
- CFLAGS_solaris := -xc99=no_lib, \
- CFLAGS_windows := -DCMS_IS_WINDOWS_, \
- MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
-@@ -685,10 +702,10 @@
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
- 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_aix := -lm -lawt -ljava -ljvm,\
-+ LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc $(LCMS_LIBS), \
-+ LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm $(LCMS_LIBS), \
-+ LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm $(LCMS_LIBS), \
-+ LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm $(LCMS_LIBS),\
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=lcms.dll" \
-diff -r 3d1c3b0b73a3 src/share/native/sun/java2d/cmm/lcms/LCMS.c
---- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Tue Sep 08 22:31:26 2015 +0300
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Thu Oct 15 05:29:28 2015 +0100
-@@ -30,7 +30,7 @@
- #include "jni_util.h"
- #include "Trace.h"
- #include "Disposer.h"
--#include "lcms2.h"
-+#include <lcms2.h>
- #include "jlong.h"
-
-
diff --git a/system-libjpeg.patch b/system-libjpeg.patch
deleted file mode 100644
index fa01115..0000000
--- a/system-libjpeg.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
---- jdk8/common/autoconf/libraries.m4 2013-10-31 19:24:33.000000000 -0400
-+++ jdk8/common/autoconf/libraries.m4 2013-11-14 21:55:20.249903347 -0500
-@@ -601,12 +601,42 @@
- #
-
- 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])
-- ])
-+ AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg],
-+ [use libjpeg from build system or OpenJDK sources (system, bundled) @<:@bundled@:>@])])
-+
-+ AC_CHECK_LIB(jpeg, jpeg_destroy_compress,
-+ [ LIBJPEG_FOUND=yes ],
-+ [ LIBJPEG_FOUND=no ])
-+
-+ 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
-+
-+ if test "x${with_libjpeg}" = "xbundled"; then
-+ USE_EXTERNAL_LIBJPEG=false
-+ AC_MSG_RESULT([bundled])
-+ elif test "x${with_libjpeg}" = "xsystem"; then
-+ if test "x${LIBJPEG_FOUND}" = "xyes"; then
-+ USE_EXTERNAL_LIBJPEG=true
-+ AC_MSG_RESULT([system])
-+ else
-+ AC_MSG_RESULT([system not found])
-+ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])
-+ fi
-+ else
-+ AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled'])
-+ fi
- AC_SUBST(USE_EXTERNAL_LIBJPEG)
-
-+
- ###############################################################################
- #
- # Check for the gif library
-diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.gmk
---- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-10-31 19:44:18.000000000 -0400
-+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 21:56:01.020796703 -0500
-@@ -696,17 +696,17 @@
- ##########################################################################################
-
- 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_LIBJPEG_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
-
-@@ -721,37 +721,37 @@
- # $(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, \
-+$(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \
-+ LIBRARY := javajpeg, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-- SRC := $(BUILD_LIBJPEG_CLOSED_SRC) \
-+ SRC := $(BUILD_LIBJAVAJPEG_CLOSED_SRC) \
- $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
- LANG := C, \
- OPTIMIZATION := HIGHEST, \
- CFLAGS := $(CFLAGS_JDKLIB) \
-- $(BUILD_LIBJPEG_CLOSED_INCLUDES) \
-+ $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
-- MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \
-- LDFLAGS := $(LDFLAGS_JDKLIB) \
-+ MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
-+ LDFLAGS := $(LDFLAGS_JDKLIB) -ljpeg \
- $(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), \
-- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \
-+ REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
-+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavajpeg, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
--$(BUILD_LIBJPEG): $(BUILD_LIBJAVA)
-+$(BUILD_LIBJAVAJPEG): $(BUILD_LIBJAVA)
-
--BUILD_LIBRARIES += $(BUILD_LIBJPEG)
-+BUILD_LIBRARIES += $(BUILD_LIBJAVAJPEG)
-
- ##########################################################################################
-
-@@ -1183,7 +1183,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
-
-@@ -1194,6 +1193,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/jpeg
-+ endif
-+
- ifneq ($(OPENJDK_TARGET_OS), macosx)
- LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
- else
-@@ -1256,11 +1262,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) \
-diff -ruN jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
---- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2013-10-31 19:44:18.000000000 -0400
-+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2013-11-14 21:55:20.250903340 -0500
-@@ -89,7 +89,7 @@
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction<Void>() {
- public Void run() {
-- System.loadLibrary("jpeg");
-+ System.loadLibrary("javajpeg");
- return null;
- }
- });
-diff -ruN jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
---- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2013-10-31 19:44:18.000000000 -0400
-+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2013-11-14 21:55:20.250903340 -0500
-@@ -179,7 +179,7 @@
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction<Void>() {
- public Void run() {
-- System.loadLibrary("jpeg");
-+ System.loadLibrary("javajpeg");
- return null;
- }
- });
-diff -ruN jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java
---- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2013-10-31 19:44:18.000000000 -0400
-+++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2013-11-14 21:55:20.251903376 -0500
-@@ -56,7 +56,7 @@
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction<Void>() {
- public Void run() {
-- System.loadLibrary("jpeg");
-+ System.loadLibrary("javajpeg");
- return null;
- }
- });
-diff -ruN jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
---- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-10-31 19:44:18.000000000 -0400
-+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-11-14 21:55:20.251903376 -0500
-@@ -25,7 +25,6 @@
-
- #include "splashscreen_impl.h"
-
--#include "jinclude.h"
- #include "jpeglib.h"
- #include "jerror.h"
-
-@@ -107,11 +106,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;
diff --git a/system-libpng.patch b/system-libpng.patch
deleted file mode 100644
index 53661d8..0000000
--- a/system-libpng.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
---- jdk8/common/autoconf/libraries.m4 2013-11-14 20:08:01.845065585 -0500
-+++ jdk8/common/autoconf/libraries.m4 2013-11-14 20:10:56.186553066 -0500
-@@ -676,6 +676,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
- #
-
-diff -ruN jdk8/common/autoconf/spec.gmk.in jdk8/common/autoconf/spec.gmk.in
---- jdk8/common/autoconf/spec.gmk.in 2013-10-31 19:24:33.000000000 -0400
-+++ jdk8/common/autoconf/spec.gmk.in 2013-11-14 21:10:56.365976518 -0500
-@@ -548,6 +548,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@
-diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.gmk
---- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 20:08:01.845065585 -0500
-+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 20:14:10.791982343 -0500
-@@ -1183,7 +1183,6 @@
-
- ifndef BUILD_HEADLESS_ONLY
- LIBSPLASHSCREEN_DIRS := \
-- $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
- $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
-
- ifeq ($(USE_EXTERNAL_LIBGIF), true)
-@@ -1200,6 +1199,13 @@
- LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/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
-@@ -1263,12 +1269,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), \
-+ $(LIBZ) $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(LIBPNG_LDFLAGS), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
-diff -ruN jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
---- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2013-10-31 19:44:18.000000000 -0400
-+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2013-11-14 20:14:41.363892797 -0500
-@@ -25,8 +25,7 @@
-
- #include "splashscreen_impl.h"
-
--#include "../libpng/png.h"
--
-+#include <png.h>
- #include <setjmp.h>
-
- #define SIG_BYTES 8
diff --git a/update_main_sources.sh b/update_main_sources.sh
new file mode 100755
index 0000000..5f78b8d
--- /dev/null
+++ b/update_main_sources.sh
@@ -0,0 +1,95 @@
+#!/bin/bash -x
+# Generates the 'source tarball' for JDK 8 projects and update spec infrastructure
+# By default, this script regenerate source as they are currently used.
+# so if the version of sources change, this file changes and is pushed
+#
+# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
+# PROJECT_NAME=jdk8u OR aarch64-port
+# REPO_NAME=jdk8u60 OR jdk8u60
+# VERSION=jdk8u60-b27 OR aarch64-jdk8u65-b17 OR for head, keyword 'tip' should do the job there
+#
+# If you don't, default are used and so already uploaded tarball regenerated
+# They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set)
+#
+# For other useful variables see generate_source_tarball.sh
+#
+# the used values are then substituted to spec and sources
+
+if [ ! "x$PR2126" = "x" ] ; then
+ if [ ! -f "$PR2126" ] ; then
+ echo "You have specified PR2126 as $PR2126 but it does not exists. exiting"
+ exit 1
+ fi
+fi
+
+set -e
+
+if [ "x$PROJECT_NAME" = "x" ] ; then
+ PROJECT_NAME="aarch64-port"
+fi
+if [ "x$REPO_NAME" = "x" ] ; then
+ REPO_NAME="jdk8u-shenandoah"
+fi
+if [ "x$VERSION" = "x" ] ; then
+ VERSION="aarch64-shenandoah-jdk8u181-b15"
+fi
+
+if [ "x$COMPRESSION" = "x" ] ; then
+# rhel 5 needs tar.gz
+ COMPRESSION=xz
+fi
+if [ "x$FILE_NAME_ROOT" = "x" ] ; then
+ FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
+fi
+if [ "x$PKG" = "x" ] ; then
+ URL=`cat .git/config | grep url`
+ PKG=${URL##*/}
+fi
+if [ "x$SPEC" = "x" ] ; then
+ SPEC=${PKG}.spec
+fi
+if [ "x$RELEASE" = "x" ] ; then
+ RELEASE=1
+fi
+
+FILENAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
+
+if [ ! -f ${FILENAME} ] ; then
+echo "Generating ${FILENAME}"
+. ./generate_source_tarball.sh
+else
+echo "${FILENAME} already exists, using"
+fi
+
+
+echo "Touching spec: $SPEC"
+echo sed -i "s/^%global\s\+project.*/%global project ${PROJECT_NAME}/" $SPEC
+echo sed -i "s/^%global\s\+repo.*/%global repo ${REPO_NAME}/" $SPEC
+echo sed -i "s/^%global\s\+revision.*/%global revision ${VERSION}/" $SPEC
+# updated sources, resetting release
+echo sed -i "s/^Release:.*/Release: $RELEASE.%{buildver}%{?dist}/" $SPEC
+
+echo "New sources"
+cat sources
+a_sources=`cat sources | sed "s/.*(//g" | sed "s/).*//g" | sed "s/.*\s\+//g"`
+echo " you can get inspired by following %changelog template:"
+user_name=`whoami`
+user_record=$(getent passwd $user_name)
+user_gecos_field=$(echo "$user_record" | cut -d ':' -f 5)
+user_full_name=$(echo "$user_gecos_field" | cut -d ',' -f 1)
+spec_date=`date +"%a %b %d %Y"`
+# See spec:
+revision_helper=`echo ${MAIN_VERSION%-*}`
+updatever=`echo ${revision_helper##*u}`
+buildver=`echo ${MAIN_VERSION##*-}`
+echo "* $spec_date $user_full_name <$user_name(a)redhat.com> - 1:1.8.0.$updatever-$RELEASE.$buildver"
+echo "- updated to $MAIN_VERSION (from $PROJECT_NAME/$MAIN_REPO_NAME)"
+echo "- updated to $VERSION (from $PROJECT_NAME/$REPO_NAME) of hotspot"
+echo "- used $FILENAME as new sources"
+echo "- used $FILENAME_SH as new sources for hotspot"
+
+echo " execute:"
+echo "fedpkg/rhpkg new-sources "$a_sources
+echo " to upload sources"
+echo "you can verify by fedpkg/rhpkg prep --arch XXXX on all architectures: x86_64 i386 i586 i686 ppc ppc64 ppc64le s390 s390x aarch64 armv7hl"
+
diff --git a/update_systemtap.sh b/update_systemtap.sh
new file mode 100644
index 0000000..1a3e3c8
--- /dev/null
+++ b/update_systemtap.sh
@@ -0,0 +1,32 @@
+#!/bin/bash -x
+# this file contains defaults for currently generated source tarball of systemtap
+
+set -e
+
+# TAPSET
+export PROJECT_NAME="hg"
+export REPO_NAME="icedtea8"
+export VERSION="9d464368e06d"
+export COMPRESSION=xz
+export OPENJDK_URL=http://icedtea.classpath.org
+export FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
+export TO_COMPRESS="*/tapset"
+# warning, filename and filenameroot creation is duplicated here from generate_source_tarball.sh
+CLONED_FILENAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
+TAPSET_VERSION=3.2
+TAPSET=systemtap_"$TAPSET_VERSION"_tapsets_$CLONED_FILENAME
+if [ ! -f ${TAPSET} ] ; then
+ if [ ! -f ${CLONED_FILENAME} ] ; then
+ echo "Generating ${CLONED_FILENAME}"
+ sh ./generate_singlerepo_source_tarball.sh
+ else
+ echo "exists exists exists exists exists exists exists "
+ echo "reusing reusing reusing reusing reusing reusing "
+ echo ${CLONED_FILENAME}
+ fi
+ mv -v $CLONED_FILENAME $TAPSET
+else
+ echo "exists exists exists exists exists exists exists "
+ echo "reusing reusing reusing reusing reusing reusing "
+ echo ${TAPSET}
+fi
commit abbccaeb6f9143378b89e29d455dfe3f0d1251dd
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 1 03:51:39 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/java-1.8.0-openjdk-aarch32.spec b/java-1.8.0-openjdk-aarch32.spec
index 06969c7..14e81e7 100644
--- a/java-1.8.0-openjdk-aarch32.spec
+++ b/java-1.8.0-openjdk-aarch32.spec
@@ -1016,7 +1016,7 @@ OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release
Name: java-%{javaver}-%{origin}-aarch32
Version: %{javaver}.%{updatever}.%{buildver}
-Release: 1%{?dist}
+Release: 2%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -2377,6 +2377,9 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.8.0.191.181022-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Tue Oct 30 2018 Alex Kashchenko <akashche(a)redhat.com> - 1:1.8.0.191-1.181022
- update sources to 8u191
- sync with mainline package
commit 3c39e42f1661d553f9147ff12e53c0419c6e5a88
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Jan 28 20:17:49 2019 +0100
Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
diff --git a/java-1.8.0-openjdk-aarch32.spec b/java-1.8.0-openjdk-aarch32.spec
index cd02842..06969c7 100644
--- a/java-1.8.0-openjdk-aarch32.spec
+++ b/java-1.8.0-openjdk-aarch32.spec
@@ -1029,7 +1029,6 @@ Release: 1%{?dist}
Epoch: 1
Summary: OpenJDK Runtime Environment in a preview of the OpenJDK AArch32 project
-Group: Development/Languages
# HotSpot code is licensed under GPLv2
# JDK library code is licensed under GPLv2 with the Classpath exception
@@ -1349,7 +1348,6 @@ The OpenJDK runtime environment.
%if %{include_debug_build}
%package slowdebug
Summary: %{origin_nice} Runtime Environment %{majorver} %{debug_on}
-Group: Development/Languages
%{java_rpo -- %{debug_suffix_unquoted}}
%description slowdebug
@@ -1360,7 +1358,6 @@ The %{origin_nice} runtime environment %{majorver}.
%if %{include_normal_build}
%package headless
Summary: %{origin_nice} Headless Runtime Environment %{majorver}
-Group: Development/Languages
%{java_headless_rpo %{nil}}
@@ -1371,7 +1368,6 @@ The %{origin_nice} runtime environment %{majorver} without audio and video suppo
%if %{include_debug_build}
%package headless-slowdebug
Summary: %{origin_nice} Runtime Environment %{majorver} %{debug_on}
-Group: Development/Languages
%{java_headless_rpo -- %{debug_suffix_unquoted}}
@@ -1383,7 +1379,6 @@ The %{origin_nice} runtime environment %{majorver} without audio and video suppo
%if %{include_normal_build}
%package devel
Summary: %{origin_nice} Development Environment %{majorver}
-Group: Development/Tools
%{java_devel_rpo %{nil}}
@@ -1394,7 +1389,6 @@ The %{origin_nice} development tools %{majorver}.
%if %{include_debug_build}
%package devel-slowdebug
Summary: %{origin_nice} Development Environment %{majorver} %{debug_on}
-Group: Development/Tools
%{java_devel_rpo -- %{debug_suffix_unquoted}}
@@ -1406,7 +1400,6 @@ The %{origin_nice} development tools %{majorver}.
%if %{include_normal_build}
%package demo
Summary: %{origin_nice} Demos %{majorver}
-Group: Development/Languages
%{java_demo_rpo %{nil}}
@@ -1417,7 +1410,6 @@ The %{origin_nice} demos %{majorver}.
%if %{include_debug_build}
%package demo-slowdebug
Summary: %{origin_nice} Demos %{majorver} %{debug_on}
-Group: Development/Languages
%{java_demo_rpo -- %{debug_suffix_unquoted}}
@@ -1429,7 +1421,6 @@ The %{origin_nice} demos %{majorver}.
%if %{include_normal_build}
%package src
Summary: %{origin_nice} Source Bundle %{majorver}
-Group: Development/Languages
%{java_src_rpo %{nil}}
@@ -1441,7 +1432,6 @@ class library source code for use by IDE indexers and debuggers.
%if %{include_debug_build}
%package src-slowdebug
Summary: %{origin_nice} Source Bundle %{majorver} %{for_debug}
-Group: Development/Languages
%{java_src_rpo -- %{debug_suffix_unquoted}}
@@ -1453,7 +1443,6 @@ The java-%{origin}-src-slowdebug sub-package contains the complete %{origin_nice
%if %{include_normal_build}
%package javadoc
Summary: %{origin_nice} %{majorver} API documentation
-Group: Documentation
Requires: javapackages-filesystem
BuildArch: noarch
@@ -1466,7 +1455,6 @@ The %{origin_nice} %{majorver} API documentation.
%if %{include_normal_build}
%package javadoc-zip
Summary: %{origin_nice} %{majorver} API documentation compressed in single archive
-Group: Documentation
Requires: javapackages-filesystem
BuildArch: noarch
@@ -1479,7 +1467,6 @@ The %{origin_nice} %{majorver} API documentation compressed in single archive.
%if %{include_debug_build}
%package javadoc-slowdebug
Summary: %{origin_nice} %{majorver} API documentation %{for_debug}
-Group: Documentation
Requires: javapackages-filesystem
BuildArch: noarch
@@ -1492,7 +1479,6 @@ The %{origin_nice} %{majorver} API documentation %{for_debug}.
%if %{include_debug_build}
%package javadoc-zip-slowdebug
Summary: %{origin_nice} %{majorver} API documentation compressed in single archive %{for_debug}
-Group: Documentation
Requires: javapackages-filesystem
BuildArch: noarch
5 years, 3 months
Architecture specific change in rpms/java-1.8.0-openjdk-aarch32.git
by githook-noreply@fedoraproject.org
The package rpms/java-1.8.0-openjdk-aarch32.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-1.8.0-openjdk-aarch32.git/co....
Change:
+%ifarch %{ix86}
Thanks.
Full change:
============
commit af80df107c065146ddfaa568284d2398dcc7d215
Author: Alex Kashchenko <akashche(a)redhat.com>
Date: Thu Feb 14 17:05:27 2019 -0500
8u201 update
diff --git a/.gitignore b/.gitignore
index f0901ad..f2590e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@
/aarch32-port-jdk8u-jdk8u171-b11-aarch32-180511.tar.xz
/aarch32-port-jdk8u-jdk8u181-b13-aarch32-180802.tar.xz
/aarch32-port-jdk8u-jdk8u191-b12-aarch32-181022.tar.xz
+/aarch32-port-jdk8u-jdk8u201-b09-aarch32-190124.tar.xz
+/systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
diff --git a/6260348-pr3066.patch b/6260348-pr3066.patch
deleted file mode 100644
index 06be502..0000000
--- a/6260348-pr3066.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-# HG changeset patch
-# User ssadetsky
-# Date 1467220169 -3600
-# Wed Jun 29 18:09:29 2016 +0100
-# Node ID 9fffaa63c49d93bff70b96af9a86b7635bce44be
-# Parent d0462c26152fc8bd5f79db7f1670777e807ef2b3
-6260348, PR3066: GTK+ L&F JTextComponent not respecting desktop caret blink rate
-Reviewed-by: alexsch, azvegint
-
-diff -r d0462c26152f -r 9fffaa63c49d src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java
---- openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java Tue Jun 28 19:44:50 2016 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java Wed Jun 29 18:09:29 2016 +0100
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2005, 2015, 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
-@@ -93,7 +93,9 @@
- */
- static enum Settings {
- GTK_FONT_NAME,
-- GTK_ICON_SIZES
-+ GTK_ICON_SIZES,
-+ GTK_CURSOR_BLINK,
-+ GTK_CURSOR_BLINK_TIME
- }
-
- /* Custom regions are needed for representing regions that don't exist
-diff -r d0462c26152f -r 9fffaa63c49d src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
---- openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Tue Jun 28 19:44:50 2016 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Wed Jun 29 18:09:29 2016 +0100
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2002, 2015, 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
-@@ -371,7 +371,17 @@
- int vProgWidth = 22 - (progXThickness * 2);
- int vProgHeight = 80 - (progYThickness * 2);
-
-- Integer caretBlinkRate = Integer.valueOf(500);
-+ Integer caretBlinkRate;
-+ if (Boolean.FALSE.equals(GTKEngine.INSTANCE.getSetting(
-+ GTKEngine.Settings.GTK_CURSOR_BLINK))) {
-+ caretBlinkRate = Integer.valueOf(0);
-+ } else {
-+ caretBlinkRate = (Integer) GTKEngine.INSTANCE.getSetting(
-+ GTKEngine.Settings.GTK_CURSOR_BLINK_TIME);
-+ if (caretBlinkRate == null) {
-+ caretBlinkRate = Integer.valueOf(500);
-+ }
-+ }
- Insets zeroInsets = new InsetsUIResource(0, 0, 0, 0);
-
- Double defaultCaretAspectRatio = new Double(0.025);
-diff -r d0462c26152f -r 9fffaa63c49d src/solaris/native/sun/awt/gtk2_interface.c
---- openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.c Tue Jun 28 19:44:50 2016 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.c Wed Jun 29 18:09:29 2016 +0100
-@@ -1316,9 +1316,6 @@
- {
- result = gtk2_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE] =
- (*fp_gtk_entry_new)();
--
-- GtkSettings* settings = fp_gtk_widget_get_settings(result);
-- fp_g_object_set(settings, "gtk-cursor-blink", FALSE, NULL);
- }
- result = gtk2_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE];
- break;
-@@ -1363,10 +1360,6 @@
- {
- gtk2_widgets[_GTK_ENTRY_TYPE] =
- (*fp_gtk_entry_new)();
--
-- GtkSettings* settings =
-- fp_gtk_widget_get_settings(gtk2_widgets[_GTK_ENTRY_TYPE]);
-- fp_g_object_set(settings, "gtk-cursor-blink", FALSE, NULL);
- }
- result = gtk2_widgets[_GTK_ENTRY_TYPE];
- break;
-@@ -1558,9 +1551,6 @@
- {
- result = gtk2_widgets[_GTK_SPIN_BUTTON_TYPE] =
- (*fp_gtk_spin_button_new)(NULL, 0, 0);
--
-- GtkSettings* settings = fp_gtk_widget_get_settings(result);
-- fp_g_object_set(settings, "gtk-cursor-blink", FALSE, NULL);
- }
- result = gtk2_widgets[_GTK_SPIN_BUTTON_TYPE];
- break;
-@@ -2510,14 +2500,20 @@
-
- return result;
- }
--/*
-+
- jobject get_integer_property(JNIEnv *env, GtkSettings* settings, const gchar* key)
- {
-- gint intval = NULL;
--
-+ gint intval = NULL;
- (*fp_g_object_get)(settings, key, &intval, NULL);
- return create_Integer(env, intval);
--}*/
-+}
-+
-+jobject get_boolean_property(JNIEnv *env, GtkSettings* settings, const gchar* key)
-+{
-+ gint intval = NULL;
-+ (*fp_g_object_get)(settings, key, &intval, NULL);
-+ return create_Boolean(env, intval);
-+}
-
- jobject gtk2_get_setting(JNIEnv *env, Setting property)
- {
-@@ -2529,6 +2525,10 @@
- return get_string_property(env, settings, "gtk-font-name");
- case GTK_ICON_SIZES:
- return get_string_property(env, settings, "gtk-icon-sizes");
-+ case GTK_CURSOR_BLINK:
-+ return get_boolean_property(env, settings, "gtk-cursor-blink");
-+ case GTK_CURSOR_BLINK_TIME:
-+ return get_integer_property(env, settings, "gtk-cursor-blink-time");
- }
-
- return NULL;
-diff -r d0462c26152f -r 9fffaa63c49d src/solaris/native/sun/awt/gtk2_interface.h
---- openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.h Tue Jun 28 19:44:50 2016 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.h Wed Jun 29 18:09:29 2016 +0100
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2005, 2015, 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
-@@ -140,7 +140,9 @@
- typedef enum _Setting
- {
- GTK_FONT_NAME,
-- GTK_ICON_SIZES
-+ GTK_ICON_SIZES,
-+ GTK_CURSOR_BLINK,
-+ GTK_CURSOR_BLINK_TIME
- } Setting;
-
- /* GTK types, here to eliminate need for GTK headers at compile time */
diff --git a/8031668-pr2842-01.patch b/8031668-pr2842-01.patch
deleted file mode 100644
index faaa309..0000000
--- a/8031668-pr2842-01.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# HG changeset patch
-# User mduigou
-# Date 1389723922 28800
-# Tue Jan 14 10:25:22 2014 -0800
-# Node ID 842cc183c9f6d29270ff002238248978c08f0a66
-# Parent f0635543beb309c4da1bb88c906a76ee4b75e16d
-8031668, PR2842: TOOLCHAIN_FIND_COMPILER unexpectedly resolves symbolic links
-Reviewed-by: erikj, ihse
-
-diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
---- openjdk///common/autoconf/toolchain.m4
-+++ openjdk///common/autoconf/toolchain.m4
-@@ -230,8 +230,8 @@
- $1="$PROPER_COMPILER_$1"
- else
- AC_MSG_RESULT([no, keeping $1])
-- $1="$TEST_COMPILER"
- fi
-+
- TOOLCHAIN_EXTRACT_COMPILER_VERSION([$1], [$COMPILER_NAME])
- ])
-
diff --git a/8036003-add-with-native-debug-symbols-configure-flag.patch b/8036003-add-with-native-debug-symbols-configure-flag.patch
deleted file mode 100644
index b7b8a05..0000000
--- a/8036003-add-with-native-debug-symbols-configure-flag.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-
-# HG changeset patch
-# User sgehwolf
-# Date 1531824954 -7200
-# Node ID 19e8754f5415cdda79904b9f21a4b8981505cb78
-# Parent 1380ce862bbd0b65c619bfcea454d612b240e332
-8036003: Add --with-native-debug-symbols=[none|internal|external|zipped]
-Reviewed-by: erikj
-
-diff -r 1380ce862bbd -r 19e8754f5415 common/autoconf/jdk-options.m4
---- openjdk/common/autoconf/jdk-options.m4 Mon Jul 16 15:37:08 2018 +0100
-+++ openjdk/common/autoconf/jdk-options.m4 Tue Jul 17 12:55:54 2018 +0200
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2011, 2018, 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
-@@ -606,11 +606,88 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
-
- if test "x${enable_zip_debug_info}" = "xno"; then
- ZIP_DEBUGINFO_FILES=false
-+ elif test "x${enable_zip_debug_info}" = "xyes"; then
-+ ZIP_DEBUGINFO_FILES=true
-+ fi
-+
-+ #
-+ # NATIVE_DEBUG_SYMBOLS
-+ # This must be done after the toolchain is setup, since we're looking at objcopy.
-+ # In addition, this must be done after ENABLE_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES
-+ # checking in order to preserve backwards compatibility post JDK-8207234.
-+ #
-+ AC_MSG_CHECKING([what type of native debug symbols to use (this will override previous settings)])
-+ AC_ARG_WITH([native-debug-symbols],
-+ [AS_HELP_STRING([--with-native-debug-symbols],
-+ [set the native debug symbol configuration (none, internal, external, zipped) @<:@varying@:>@])],
-+ [
-+ if test "x$OPENJDK_TARGET_OS" = xaix; then
-+ if test "x$with_native_debug_symbols" = xexternal || test "x$with_native_debug_symbols" = xzipped; then
-+ AC_MSG_ERROR([AIX only supports the parameters 'none' and 'internal' for --with-native-debug-symbols])
-+ fi
-+ fi
-+ ],
-+ [
-+ # Default to unset for backwards compatibility
-+ with_native_debug_symbols=""
-+ ])
-+ NATIVE_DEBUG_SYMBOLS=$with_native_debug_symbols
-+ if test "x$NATIVE_DEBUG_SYMBOLS" = x; then
-+ AC_MSG_RESULT([not specified])
- else
-+ AC_MSG_RESULT([$NATIVE_DEBUG_SYMBOLS])
-+ fi
-+ # Default is empty
-+ DEBUG_BINARIES=
-+ # Default is min_strip. Possible values are min_strip, all_strip, no_strip
-+ STRIP_POLICY=min_strip
-+
-+ if test "x$NATIVE_DEBUG_SYMBOLS" = xzipped; then
-+
-+ if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
-+ if test "x$OBJCOPY" = x; then
-+ # enabling of enable-debug-symbols and can't find objcopy
-+ # this is an error
-+ AC_MSG_ERROR([Unable to find objcopy, cannot enable native debug symbols])
-+ fi
-+ fi
-+
-+ ENABLE_DEBUG_SYMBOLS=true
-+ STRIP_POLICY=min_strip
- ZIP_DEBUGINFO_FILES=true
-+ elif test "x$NATIVE_DEBUG_SYMBOLS" = xnone; then
-+ ENABLE_DEBUG_SYMBOLS=false
-+ STRIP_POLICY=min_strip
-+ ZIP_DEBUGINFO_FILES=false
-+ elif test "x$NATIVE_DEBUG_SYMBOLS" = xinternal; then
-+ ENABLE_DEBUG_SYMBOLS=true
-+ STRIP_POLICY=no_strip
-+ ZIP_DEBUGINFO_FILES=false
-+ POST_STRIP_CMD=
-+ DEBUG_BINARIES=true
-+ elif test "x$NATIVE_DEBUG_SYMBOLS" = xexternal; then
-+
-+ if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
-+ if test "x$OBJCOPY" = x; then
-+ # enabling of enable-debug-symbols and can't find objcopy
-+ # this is an error
-+ AC_MSG_ERROR([Unable to find objcopy, cannot enable native debug symbols])
-+ fi
-+ fi
-+
-+ ENABLE_DEBUG_SYMBOLS=true
-+ STRIP_POLICY=min_strip
-+ ZIP_DEBUGINFO_FILES=false
-+ elif test "x$NATIVE_DEBUG_SYMBOLS" != x; then
-+ AC_MSG_ERROR([Allowed native debug symbols are: none, internal, external, zipped])
-+ else
-+ AC_MSG_NOTICE([--with-native-debug-symbols not specified. Using values from --disable-debug-symbols and --disable-zip-debug-info])
- fi
-
- AC_SUBST(ENABLE_DEBUG_SYMBOLS)
-+ AC_SUBST(STRIP_POLICY)
-+ AC_SUBST(POST_STRIP_CMD)
-+ AC_SUBST(DEBUG_BINARIES)
- AC_SUBST(ZIP_DEBUGINFO_FILES)
- AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
- AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
-diff -r 1380ce862bbd -r 19e8754f5415 common/autoconf/spec.gmk.in
---- openjdk/common/autoconf/spec.gmk.in Mon Jul 16 15:37:08 2018 +0100
-+++ openjdk/common/autoconf/spec.gmk.in Tue Jul 17 12:55:54 2018 +0200
-@@ -416,6 +416,8 @@
- CFLAGS_DEBUG_SYMBOLS:=@CFLAGS_DEBUG_SYMBOLS@
- CXXFLAGS_DEBUG_SYMBOLS:=@CXXFLAGS_DEBUG_SYMBOLS@
- ZIP_DEBUGINFO_FILES:=@ZIP_DEBUGINFO_FILES@
-+STRIP_POLICY:=@STRIP_POLICY@
-+DEBUG_BINARIES:=@DEBUG_BINARIES@
-
- #
- # Compress (or not) jars
-diff -r 1380ce862bbd -r 19e8754f5415 make/common/NativeCompilation.gmk
---- openjdk/make/common/NativeCompilation.gmk Mon Jul 16 15:37:08 2018 +0100
-+++ openjdk/make/common/NativeCompilation.gmk Tue Jul 17 12:55:54 2018 +0200
-@@ -260,6 +260,10 @@
- $1_CC:=$(CC)
- endif
-
-+ ifeq ($$($1_STRIP_POLICY),)
-+ $1_STRIP_POLICY:=$$(STRIP_POLICY)
-+ endif
-+
- # Make sure the dirs exist.
- $$(eval $$(call MakeDir,$$($1_OBJECT_DIR) $$($1_OUTPUT_DIR)))
- $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d)))
-@@ -455,28 +459,34 @@
- ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X
- ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows
- ifeq ($(OPENJDK_TARGET_OS), solaris)
-- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-- # empty section headers until a fixed $(OBJCOPY) is available.
-- # An empty section header has sh_addr == 0 and sh_size == 0.
-- # This problem has only been seen on Solaris X64, but we call this tool
-- # on all Solaris builds just in case.
-- #
-- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-+ # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-+ # empty section headers until a fixed $(OBJCOPY) is available.
-+ # An empty section header has sh_addr == 0 and sh_size == 0.
-+ # This problem has only been seen on Solaris X64, but we call this tool
-+ # on all Solaris builds just in case.
-+ #
-+ # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-+ # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-+ $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
- $(RM) $$@
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
- $(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
-+ endif
- else # not solaris
-- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
- $(RM) $$@
- $(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
-+ endif
- endif # Touch to not retrigger rule on rebuild
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
- $(TOUCH) $$@
-+ endif
- endif # !windows
- endif # !macosx
-
-@@ -500,7 +510,9 @@
- $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \
- $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb
- else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
-- $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
-+ endif
- endif
- endif
- endif
-@@ -539,28 +551,34 @@
- ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X
- ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows
- ifeq ($(OPENJDK_TARGET_OS), solaris)
-- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-- # empty section headers until a fixed $(OBJCOPY) is available.
-- # An empty section header has sh_addr == 0 and sh_size == 0.
-- # This problem has only been seen on Solaris X64, but we call this tool
-- # on all Solaris builds just in case.
-- #
-- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-+ # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-+ # empty section headers until a fixed $(OBJCOPY) is available.
-+ # An empty section header has sh_addr == 0 and sh_size == 0.
-+ # This problem has only been seen on Solaris X64, but we call this tool
-+ # on all Solaris builds just in case.
-+ #
-+ # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-+ # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-+ $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
- $(RM) $$@
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
- $(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
-+ endif
- else # not solaris
-- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
- $(RM) $$@
- $(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
-+ endif
- endif
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
- $(TOUCH) $$@
-+ endif
- endif # !windows
- endif # !macosx
-
-@@ -584,7 +602,9 @@
- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \
- $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb
- else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
-- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo
-+ endif
- endif
- endif
- endif
-
diff --git a/8044235-include-all-srcs.patch b/8044235-include-all-srcs.patch
deleted file mode 100644
index 1beda6d..0000000
--- a/8044235-include-all-srcs.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-# HG changeset patch
-# User omajid
-# Date 1401638044 14400
-# Sun Jun 01 11:54:04 2014 -0400
-# Node ID fd78f7e83f3f1ce7d363b681b97583138218afcb
-# Parent 8d0af21b5b9789f97b05edacc221a63f851d13b8
-8044235: src.zip should include all sources
-Reviewed-by: andrew, dholmes
-
-diff --git a/make/CreateJars.gmk b/make/CreateJars.gmk
---- openjdk/jdk/make/CreateJars.gmk
-+++ openjdk/jdk/make/CreateJars.gmk
-@@ -584,40 +584,53 @@
-
- ##########################################################################################
-
--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 \
-- 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 \
-- #
-+ifdef OPENJDK
-+ SRC_ZIP_INCLUDES = \
-+ com \
-+ java \
-+ javax \
-+ jdk \
-+ org \
-+ sun \
-+ #
-+ SRC_ZIP_EXCLUDES =
-+else
-+ 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 \
-+ 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 \
-+ #
-+ SRC_ZIP_EXCLUDES = javax/swing/beaninfo
-+endif
-
- SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes
- SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc
-@@ -648,7 +661,7 @@
- $(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
- SRC := $(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src, \
- INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \
-- EXCLUDES := javax/swing/beaninfo, \
-+ EXCLUDES := $(SRC_ZIP_EXCLUDES), \
- SUFFIXES := .java .c .h, \
- ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
- EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))
diff --git a/8044762-pr2960.patch b/8044762-pr2960.patch
deleted file mode 100644
index af5b606..0000000
--- a/8044762-pr2960.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-# HG changeset patch
-# User dsamersoff
-# Date 1403087398 25200
-# Wed Jun 18 03:29:58 2014 -0700
-# Node ID 13411144d46b50d0087f35eca2b8e827aae558f1
-# Parent 10c9f8461c297a200ef57970c1f4c32d4081d790
-8044762, PR2960: com/sun/jdi/OptionTest.java test time out
-Summary: gdata could be NULL in debugInit_exit
-Reviewed-by: dcubed
-
-diff -r 10c9f8461c29 -r 13411144d46b src/share/back/debugInit.c
---- openjdk/jdk/src/share/back/debugInit.c Fri May 20 19:42:05 2016 +0100
-+++ openjdk/jdk/src/share/back/debugInit.c Wed Jun 18 03:29:58 2014 -0700
-@@ -1307,22 +1307,26 @@
- if ( error != JVMTI_ERROR_NONE ) {
- exit_code = 1;
- if ( docoredump ) {
-+ LOG_MISC(("Dumping core as requested by command line"));
- finish_logging(exit_code);
- abort();
- }
- }
-+
- if ( msg==NULL ) {
- msg = "";
- }
-
- LOG_MISC(("Exiting with error %s(%d): %s", jvmtiErrorText(error), error, msg));
-
-- gdata->vmDead = JNI_TRUE;
-+ if (gdata != NULL) {
-+ gdata->vmDead = JNI_TRUE;
-
-- /* Let's try and cleanup the JVMTI, if we even have one */
-- if ( gdata->jvmti != NULL ) {
-- /* Dispose of jvmti (gdata->jvmti becomes NULL) */
-- disposeEnvironment(gdata->jvmti);
-+ /* Let's try and cleanup the JVMTI, if we even have one */
-+ if ( gdata->jvmti != NULL ) {
-+ /* Dispose of jvmti (gdata->jvmti becomes NULL) */
-+ disposeEnvironment(gdata->jvmti);
-+ }
- }
-
- /* Finish up logging. We reach here if JDWP is doing the exiting. */
diff --git a/8049226-pr2960.patch b/8049226-pr2960.patch
deleted file mode 100644
index 0f6bdf8..0000000
--- a/8049226-pr2960.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-# HG changeset patch
-# User dsamersoff
-# Date 1409228402 25200
-# Thu Aug 28 05:20:02 2014 -0700
-# Node ID f4c9545cd8a56a5fab74c95de3573623ba2b83c4
-# Parent 13411144d46b50d0087f35eca2b8e827aae558f1
-8049226, PR2960: com/sun/jdi/OptionTest.java test times out again
-Summary: Don't call jni_FatalError if transport initialization fails
-Reviewed-by: sspitsyn, sla
-
-diff -r 13411144d46b -r f4c9545cd8a5 src/share/back/debugInit.c
---- openjdk/jdk/src/share/back/debugInit.c Wed Jun 18 03:29:58 2014 -0700
-+++ openjdk/jdk/src/share/back/debugInit.c Thu Aug 28 05:20:02 2014 -0700
-@@ -1013,7 +1013,7 @@
- atexit_finish_logging(void)
- {
- /* Normal exit(0) (not _exit()) may only reach here */
-- finish_logging(0); /* Only first call matters */
-+ finish_logging(); /* Only first call matters */
- }
-
- static jboolean
-@@ -1301,43 +1301,49 @@
- void
- debugInit_exit(jvmtiError error, const char *msg)
- {
-- int exit_code = 0;
-+ enum exit_codes { EXIT_NO_ERRORS = 0, EXIT_JVMTI_ERROR = 1, EXIT_TRANSPORT_ERROR = 2 };
-
-- /* Pick an error code */
-- if ( error != JVMTI_ERROR_NONE ) {
-- exit_code = 1;
-- if ( docoredump ) {
-- LOG_MISC(("Dumping core as requested by command line"));
-- finish_logging(exit_code);
-- abort();
-- }
-+ // Prepare to exit. Log error and finish logging
-+ LOG_MISC(("Exiting with error %s(%d): %s", jvmtiErrorText(error), error,
-+ ((msg == NULL) ? "" : msg)));
-+
-+ // coredump requested by command line. Keep JVMTI data dirty
-+ if (error != JVMTI_ERROR_NONE && docoredump) {
-+ LOG_MISC(("Dumping core as requested by command line"));
-+ finish_logging();
-+ abort();
- }
-
-- if ( msg==NULL ) {
-- msg = "";
-- }
-+ finish_logging();
-
-- LOG_MISC(("Exiting with error %s(%d): %s", jvmtiErrorText(error), error, msg));
--
-+ // Cleanup the JVMTI if we have one
- if (gdata != NULL) {
- gdata->vmDead = JNI_TRUE;
--
-- /* Let's try and cleanup the JVMTI, if we even have one */
-- if ( gdata->jvmti != NULL ) {
-- /* Dispose of jvmti (gdata->jvmti becomes NULL) */
-+ if (gdata->jvmti != NULL) {
-+ // Dispose of jvmti (gdata->jvmti becomes NULL)
- disposeEnvironment(gdata->jvmti);
- }
- }
-
-- /* Finish up logging. We reach here if JDWP is doing the exiting. */
-- finish_logging(exit_code); /* Only first call matters */
--
-- /* Let's give the JNI a FatalError if non-exit 0, which is historic way */
-- if ( exit_code != 0 ) {
-- JNIEnv *env = NULL;
-- jniFatalError(env, msg, error, exit_code);
-+ // We are here with no errors. Kill entire process and exit with zero exit code
-+ if (error == JVMTI_ERROR_NONE) {
-+ forceExit(EXIT_NO_ERRORS);
-+ return;
- }
-
-- /* Last chance to die, this kills the entire process. */
-- forceExit(exit_code);
-+ // No transport initilized.
-+ // As we don't have any details here exiting with separate exit code
-+ if (error == AGENT_ERROR_TRANSPORT_INIT) {
-+ forceExit(EXIT_TRANSPORT_ERROR);
-+ return;
-+ }
-+
-+ // We have JVMTI error. Call hotspot jni_FatalError handler
-+ jniFatalError(NULL, msg, error, EXIT_JVMTI_ERROR);
-+
-+ // hotspot calls os:abort() so we should never reach code below,
-+ // but guard against possible hotspot changes
-+
-+ // Last chance to die, this kills the entire process.
-+ forceExit(EXIT_JVMTI_ERROR);
- }
-diff -r 13411144d46b -r f4c9545cd8a5 src/share/back/log_messages.c
---- openjdk/jdk/src/share/back/log_messages.c Wed Jun 18 03:29:58 2014 -0700
-+++ openjdk/jdk/src/share/back/log_messages.c Thu Aug 28 05:20:02 2014 -0700
-@@ -230,7 +230,7 @@
-
- /* Finish up logging, flush output to the logfile. */
- void
--finish_logging(int exit_code)
-+finish_logging()
- {
- #ifdef JDWP_LOGGING
- MUTEX_LOCK(my_mutex);
-diff -r 13411144d46b -r f4c9545cd8a5 src/share/back/log_messages.h
---- openjdk/jdk/src/share/back/log_messages.h Wed Jun 18 03:29:58 2014 -0700
-+++ openjdk/jdk/src/share/back/log_messages.h Thu Aug 28 05:20:02 2014 -0700
-@@ -29,7 +29,7 @@
- /* LOG: Must be called like: LOG_category(("anything")) or LOG_category((format,args)) */
-
- void setup_logging(const char *, unsigned);
--void finish_logging(int);
-+void finish_logging();
-
- #define LOG_NULL ((void)0)
-
diff --git a/8061305-pr3335-rh1423421.patch b/8061305-pr3335-rh1423421.patch
deleted file mode 100644
index 384c52a..0000000
--- a/8061305-pr3335-rh1423421.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# HG changeset patch
-# User ksrini
-# Date 1414764176 25200
-# Fri Oct 31 07:02:56 2014 -0700
-# Node ID 9fd9a50e7994a9659c5ef21296d0baee4c2eecff
-# Parent fd59a2d4313440077fce3fbf39174755a15d285a
-8061305: Javadoc crashes when method name ends with "Property"
-Reviewed-by: jjg
-
-diff --git jdk8/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java jdk8/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
---- jdk8/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
-+++ jdk8/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
-@@ -656,6 +656,9 @@
- // properties aren't named setA* or getA*
- private final Pattern pattern = Pattern.compile("[sg]et\\p{Upper}.*");
- private boolean isPropertyMethod(MethodDoc method) {
-+ if (!configuration.javafx) {
-+ return false;
-+ }
- if (!method.name().endsWith("Property")) {
- return false;
- }
-@@ -667,7 +670,9 @@
- if (pattern.matcher(method.name()).matches()) {
- return false;
- }
--
-+ if (method.typeParameters().length > 0) {
-+ return false;
-+ }
- return 0 == method.parameters().length
- && !"void".equals(method.returnType().simpleTypeName());
- }
diff --git a/8062808-pr3548.patch b/8062808-pr3548.patch
deleted file mode 100644
index e91abd3..0000000
--- a/8062808-pr3548.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-# HG changeset patch
-# User stefank
-# Date 1525453613 -3600
-# Fri May 04 18:06:53 2018 +0100
-# Node ID 07a1135a327362f157955d470fad5df07cc35164
-# Parent de79964656fc652f2085dac4fe99bcc128b5a3b1
-8062808, PR3548: Turn on the -Wreturn-type warning
-Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make
-@@ -210,7 +210,7 @@
- WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body
- endif
-
--WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value
-+WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value -Wreturn-type
-
- ifeq ($(USE_CLANG),)
- # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
-diff --git openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
---- openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad
-+++ openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
-@@ -1250,6 +1250,7 @@
-
-
- Unimplemented();
-+ return 0; // Mute compiler
- }
-
- #ifndef PRODUCT
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
-@@ -541,6 +541,7 @@
- err.report_and_die();
-
- ShouldNotReachHere();
-+ return true; // Mute compiler
- }
-
- void os::Linux::init_thread_fpu_state(void) {
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
-@@ -506,7 +506,7 @@
- ss.write((const char*)name->bytes(), name->utf8_length());
- ss.write((const char*)signature->bytes(), signature->utf8_length());
- ss.print(" is abstract");
-- return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
-+ return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
- }
-
- Symbol* MethodFamily::generate_conflicts_message(GrowableArray<Method*>* methods, TRAPS) const {
-@@ -521,7 +521,7 @@
- ss.print(".");
- ss.write((const char*)name->bytes(), name->utf8_length());
- }
-- return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
-+ return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
- }
-
-
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
-@@ -249,7 +249,7 @@
- MutexLocker ml(SymbolTable_lock, THREAD);
-
- // Otherwise, add to symbol to table
-- return the_table()->basic_add(index, (u1*)name, len, hashValue, true, CHECK_NULL);
-+ return the_table()->basic_add(index, (u1*)name, len, hashValue, true, THREAD);
- }
-
- Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) {
-@@ -288,7 +288,7 @@
- // Grab SymbolTable_lock first.
- MutexLocker ml(SymbolTable_lock, THREAD);
-
-- return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, CHECK_NULL);
-+ return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, THREAD);
- }
-
- Symbol* SymbolTable::lookup_only(const char* name, int len,
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
-@@ -229,15 +229,15 @@
- class_name->as_C_string(),
- class_loader.is_null() ? "null" : class_loader->klass()->name()->as_C_string()));
- if (FieldType::is_array(class_name)) {
-- return resolve_array_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
-+ return resolve_array_class_or_null(class_name, class_loader, protection_domain, THREAD);
- } else if (FieldType::is_obj(class_name)) {
- ResourceMark rm(THREAD);
- // Ignore wrapping L and ;.
- TempNewSymbol name = SymbolTable::new_symbol(class_name->as_C_string() + 1,
- class_name->utf8_length() - 2, CHECK_NULL);
-- return resolve_instance_class_or_null(name, class_loader, protection_domain, CHECK_NULL);
-+ return resolve_instance_class_or_null(name, class_loader, protection_domain, THREAD);
- } else {
-- return resolve_instance_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
-+ return resolve_instance_class_or_null(class_name, class_loader, protection_domain, THREAD);
- }
- }
-
-diff --git openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
---- openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp
-+++ openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
-@@ -367,7 +367,7 @@
- _csv_format(csv_format), _print_help(print_help),
- _print_class_stats(print_class_stats), _columns(columns) {}
- void heap_inspection(outputStream* st) NOT_SERVICES_RETURN;
-- size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN;
-+ size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN_(0);
- static void find_instances_at_safepoint(Klass* k, GrowableArray<oop>* result) NOT_SERVICES_RETURN;
- private:
- void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL);
-diff --git openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
---- openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp
-+++ openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
-@@ -93,7 +93,7 @@
- static void preload_and_dump(TRAPS) NOT_CDS_RETURN;
- static int preload_and_dump(const char * class_list_path,
- GrowableArray<Klass*>* class_promote_order,
-- TRAPS) NOT_CDS_RETURN;
-+ TRAPS) NOT_CDS_RETURN_(0);
-
- static ReservedSpace* shared_rs() {
- CDS_ONLY(return _shared_rs);
-diff --git openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp openjdk/hotspot/src/share/vm/oops/constantPool.hpp
---- openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp
-+++ openjdk/hotspot/src/share/vm/oops/constantPool.hpp
-@@ -352,7 +352,7 @@
-
- Klass* klass_at(int which, TRAPS) {
- constantPoolHandle h_this(THREAD, this);
-- return klass_at_impl(h_this, which, CHECK_NULL);
-+ return klass_at_impl(h_this, which, THREAD);
- }
-
- Symbol* klass_name_at(int which); // Returns the name, w/o resolving.
-diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
---- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
-+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
-@@ -4244,7 +4244,7 @@
- JVM_DTraceProvider* providers))
- JVMWrapper("JVM_DTraceActivate");
- return DTraceJSDT::activate(
-- version, module_name, providers_count, providers, CHECK_0);
-+ version, module_name, providers_count, providers, THREAD);
- JVM_END
-
- JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method))
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp openjdk/hotspot/src/share/vm/runtime/reflection.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/reflection.cpp
-@@ -1093,7 +1093,7 @@
- } else {
- if (rtype == T_BOOLEAN || rtype == T_BYTE || rtype == T_CHAR || rtype == T_SHORT)
- narrow((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
-- return box((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
-+ return box((jvalue*) result.get_value_addr(), rtype, THREAD);
- }
- }
-
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
-@@ -1046,7 +1046,7 @@
- // last java frame on stack (which includes native call frames)
- vframeStream vfst(thread, true); // Do not skip and javaCalls
-
-- return find_callee_info_helper(thread, vfst, bc, callinfo, CHECK_(Handle()));
-+ return find_callee_info_helper(thread, vfst, bc, callinfo, THREAD);
- }
-
-
-diff --git openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp openjdk/hotspot/src/share/vm/services/memTracker.hpp
---- openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp
-+++ openjdk/hotspot/src/share/vm/services/memTracker.hpp
-@@ -64,7 +64,7 @@
- const NativeCallStack& stack, MEMFLAGS flag = mtNone) { }
- static inline void record_virtual_memory_commit(void* addr, size_t size, const NativeCallStack& stack) { }
- static inline Tracker get_virtual_memory_uncommit_tracker() { return Tracker(); }
-- static inline Tracker get_virtual_memory_release_tracker() { }
-+ static inline Tracker get_virtual_memory_release_tracker() { return Tracker(); }
- static inline void record_virtual_memory_type(void* addr, MEMFLAGS flag) { }
- static inline void record_thread_stack(void* addr, size_t size) { }
- static inline void release_thread_stack(void* addr, size_t size) { }
diff --git a/8064786-pr3599.patch b/8064786-pr3599.patch
deleted file mode 100644
index 790ee0d..0000000
--- a/8064786-pr3599.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# HG changeset patch
-# User goetz
-# Date 1415873641 -3600
-# Thu Nov 13 11:14:01 2014 +0100
-# Node ID 1878c4c1d04e1f3c6f67a19d36c35863d6b5f906
-# Parent 533473c67de6ff767710594639033c8e83523fe5
-8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning
-Reviewed-by: stefank, tschatzl
-
-diff --git openjdk.orig/hotspot/src/share/vm/prims/jni.cpp openjdk/hotspot/src/share/vm/prims/jni.cpp
---- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp
-+++ openjdk/hotspot/src/share/vm/prims/jni.cpp
-@@ -708,6 +708,7 @@
-
- THROW_OOP_(JNIHandles::resolve(obj), JNI_OK);
- ShouldNotReachHere();
-+ return 0; // Mute compiler.
- JNI_END
-
- #ifndef USDT2
-@@ -734,6 +735,7 @@
- Handle protection_domain (THREAD, k->protection_domain());
- THROW_MSG_LOADER_(name, (char *)message, class_loader, protection_domain, JNI_OK);
- ShouldNotReachHere();
-+ return 0; // Mute compiler.
- JNI_END
-
-
diff --git a/8075942-pr3602-rh1582032.patch b/8075942-pr3602-rh1582032.patch
deleted file mode 100644
index bd2a40e..0000000
--- a/8075942-pr3602-rh1582032.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-# HG changeset patch
-# User prr
-# Date 1429299166 25200
-# Fri Apr 17 12:32:46 2015 -0700
-# Node ID 1f4b038b9550afaf88a70cee4cf9c1422ecd86d6
-# Parent 533117ae5b7587c8d9c0612581682ab984475430
-8075942, PR3602: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo
-Reviewed-by: flar, lbourges
-
-diff --git openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/Dasher.java openjdk/jdk/src/share/classes/sun/java2d/pisces/Dasher.java
---- openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/Dasher.java
-+++ openjdk/jdk/src/share/classes/sun/java2d/pisces/Dasher.java
-@@ -146,7 +146,7 @@
- if (dashOn) {
- if (starting) {
- firstSegmentsBuffer = Helpers.widenArray(firstSegmentsBuffer,
-- firstSegidx, type - 2);
-+ firstSegidx, type - 2 + 1);
- firstSegmentsBuffer[firstSegidx++] = type;
- System.arraycopy(pts, off, firstSegmentsBuffer, firstSegidx, type - 2);
- firstSegidx += type - 2;
-diff --git a/test/javopenjdk.orig/jdk/awt/BasicStroke/DashStrokeTest.java openjdk/jdk/test/java/awt/BasicStroke/DashStrokeTest.java
-new file mode 100644
---- /dev/null
-+++ openjdk/jdk/test/java/awt/BasicStroke/DashStrokeTest.java
-@@ -0,0 +1,69 @@
-+/*
-+ * Copyright (c) 2015, 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.
-+ *
-+ * 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.
-+ *
-+ * @test
-+ * @bug 8075942
-+ * @summary test there is no exception rendering a dashed stroke
-+ * @run DashStrokeTest
-+ * @run -Dsun.java2d.renderer=sun.java2d.pisces.PiscesRenderingEngine
-+ */
-+
-+import java.awt.BasicStroke;
-+import java.awt.Color;
-+import java.awt.Graphics2D;
-+import java.awt.Stroke;
-+import java.awt.geom.GeneralPath;
-+import java.awt.image.BufferedImage;
-+
-+
-+public class DashStrokeTest {
-+
-+ public static void main(String[] args) {
-+
-+ GeneralPath shape = new GeneralPath();
-+ int[] pointTypes = {0, 0, 1, 1, 0, 1, 1, 0};
-+ double[] xpoints = {428, 420, 400, 400, 400, 400, 420, 733};
-+ double[] ypoints = {180, 180, 180, 160, 30, 10, 10, 10};
-+ shape.moveTo(xpoints[0], ypoints[0]);
-+ for (int i = 1; i < pointTypes.length; i++) {
-+ if (pointTypes[i] == 1 && i < pointTypes.length - 1) {
-+ shape.quadTo(xpoints[i], ypoints[i],
-+ xpoints[i + 1], ypoints[i + 1]);
-+ } else {
-+ shape.lineTo(xpoints[i], ypoints[i]);
-+ }
-+ }
-+
-+ BufferedImage image = new
-+ BufferedImage(1000, 1000, BufferedImage.TYPE_INT_ARGB);
-+ Graphics2D g2 = image.createGraphics();
-+
-+ Color color = new Color(124, 0, 124, 255);
-+ g2.setColor(color);
-+ Stroke stroke = new BasicStroke(1.0f,
-+ BasicStroke.CAP_BUTT,
-+ BasicStroke.JOIN_BEVEL,
-+ 10.0f, new float[] {9, 6}, 0.0f);
-+ g2.setStroke(stroke);
-+ g2.draw(shape);
-+ }
-+}
diff --git a/8141570-pr3548.patch b/8141570-pr3548.patch
deleted file mode 100644
index f1e3215..0000000
--- a/8141570-pr3548.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-# HG changeset patch
-# User coleenp
-# Date 1525713256 -3600
-# Mon May 07 18:14:16 2018 +0100
-# Node ID bcbc64dfb629c5f188bbf59b8f986ad95963ed60
-# Parent 07a1135a327362f157955d470fad5df07cc35164
-8141570, PR3548: Fix Zero interpreter build for --disable-precompiled-headers
-Summary: change to include atomic.inline.hpp and allocation.inline.hpp only in .cpp files and some build fixes from Kim to build on ubuntu without devkits
-Reviewed-by: kbarrett, sgehwolf, erikj
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
---- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
-+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- # Copyright 2007, 2008 Red Hat, Inc.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- #
-@@ -25,8 +25,15 @@
-
- # Setup common to Zero (non-Shark) and Shark versions of VM
-
--# override this from the main file because some version of llvm do not like -Wundef
--WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wunused-function -Wunused-value
-+# Some versions of llvm do not like -Wundef
-+ifeq ($(USE_CLANG), true)
-+ WARNING_FLAGS += -Wno-undef
-+endif
-+# Suppress some warning flags that are normally turned on for hotspot,
-+# because some of the zero code has not been updated accordingly.
-+WARNING_FLAGS += -Wno-return-type \
-+ -Wno-format-nonliteral -Wno-format-security \
-+ -Wno-maybe-uninitialized
-
- # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
- OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-@@ -42,5 +49,3 @@
- ifeq ($(ARCH_DATA_MODEL), 64)
- CFLAGS += -D_LP64=1
- endif
--
--OPT_CFLAGS/compactingPermGenGen.o = -O1
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/java.cpp openjdk/hotspot/src/share/vm/runtime/java.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/java.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/java.cpp
-@@ -45,6 +45,7 @@
- #include "runtime/arguments.hpp"
- #include "runtime/biasedLocking.hpp"
- #include "runtime/compilationPolicy.hpp"
-+#include "runtime/deoptimization.hpp"
- #include "runtime/fprofiler.hpp"
- #include "runtime/init.hpp"
- #include "runtime/interfaceSupport.hpp"
diff --git a/8143245-pr3548.patch b/8143245-pr3548.patch
deleted file mode 100644
index eccb110..0000000
--- a/8143245-pr3548.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-# HG changeset patch
-# User sgehwolf
-# Date 1525714161 -3600
-# Mon May 07 18:29:21 2018 +0100
-# Node ID afb31413c73cbc06420fdb447aa90a7a38258904
-# Parent bcbc64dfb629c5f188bbf59b8f986ad95963ed60
-8143245, PR3548: Zero build requires disabled warnings
-Reviewed-by: dholmes, coleenp
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
---- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
-+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
- # Copyright 2007, 2008 Red Hat, Inc.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- #
-@@ -29,11 +29,6 @@
- ifeq ($(USE_CLANG), true)
- WARNING_FLAGS += -Wno-undef
- endif
--# Suppress some warning flags that are normally turned on for hotspot,
--# because some of the zero code has not been updated accordingly.
--WARNING_FLAGS += -Wno-return-type \
-- -Wno-format-nonliteral -Wno-format-security \
-- -Wno-maybe-uninitialized
-
- # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
- OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-diff --git openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
---- openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
-+++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
-@@ -100,7 +100,7 @@
- case T_DOUBLE:
- case T_VOID:
- return result;
-- default : ShouldNotReachHere();
-+ default : ShouldNotReachHere(); return NULL_WORD;
- }
- }
-
-diff --git openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
---- openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
-+++ openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2007, 2008, 2010 Red Hat, Inc.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-@@ -62,7 +62,7 @@
- }
-
- void InterpreterRuntime::SignatureHandlerGeneratorBase::push(BasicType type) {
-- ffi_type *ftype;
-+ ffi_type *ftype = NULL;
- switch (type) {
- case T_VOID:
- ftype = &ffi_type_void;
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-@@ -1,6 +1,6 @@
- /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
-- * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
-+ * Copyright 2016 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
-@@ -61,6 +61,7 @@
-
- frame os::get_sender_for_C_frame(frame* fr) {
- ShouldNotCallThis();
-+ return frame(NULL, NULL); // silence compile warning.
- }
-
- frame os::current_frame() {
-@@ -98,16 +99,19 @@
-
- address os::Linux::ucontext_get_pc(ucontext_t* uc) {
- ShouldNotCallThis();
-+ return NULL; // silence compile warnings
- }
-
- ExtendedPC os::fetch_frame_from_context(void* ucVoid,
- intptr_t** ret_sp,
- intptr_t** ret_fp) {
- ShouldNotCallThis();
-+ return NULL; // silence compile warnings
- }
-
- frame os::fetch_frame_from_context(void* ucVoid) {
- ShouldNotCallThis();
-+ return frame(NULL, NULL); // silence compile warnings
- }
-
- extern "C" JNIEXPORT int
-@@ -247,11 +251,16 @@
- }
- #endif // !PRODUCT
-
-- const char *fmt = "caught unhandled signal %d";
- char buf[64];
-
-- sprintf(buf, fmt, sig);
-+ sprintf(buf, "caught unhandled signal %d", sig);
-+
-+// Silence -Wformat-security warning for fatal()
-+PRAGMA_DIAG_PUSH
-+PRAGMA_FORMAT_NONLITERAL_IGNORED
- fatal(buf);
-+PRAGMA_DIAG_POP
-+ return true; // silence compiler warnings
- }
-
- void os::Linux::init_thread_fpu_state(void) {
-@@ -260,6 +269,7 @@
-
- int os::Linux::get_fpu_control_word() {
- ShouldNotCallThis();
-+ return -1; // silence compile warnings
- }
-
- void os::Linux::set_fpu_control_word(int fpu) {
-@@ -408,6 +418,7 @@
-
- extern "C" {
- int SpinPause() {
-+ return -1; // silence compile warnings
- }
-
-
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-@@ -110,6 +110,7 @@
- void* ucontext,
- bool isInJava) {
- ShouldNotCallThis();
-+ return false; // silence compile warning
- }
-
- // These routines are only used on cpu architectures that
diff --git a/8148351-pr2842-02.patch b/8148351-pr2842-02.patch
deleted file mode 100644
index 1812e19..0000000
--- a/8148351-pr2842-02.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-# HG changeset patch
-# User ihse
-# Date 1454642639 0
-# Fri Feb 05 03:23:59 2016 +0000
-# Node ID 61798573efe5a9efa67e268a52cf61263abb4396
-# Parent 842cc183c9f6d29270ff002238248978c08f0a66
-8148351, PR2842: Only display resolved symlink for compiler, do not change path
-Reviewed-by: erikj
-
-diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
---- openjdk///common/autoconf/toolchain.m4
-+++ openjdk///common/autoconf/toolchain.m4
-@@ -198,38 +198,22 @@
- fi
- BASIC_FIXUP_EXECUTABLE($1)
- TEST_COMPILER="[$]$1"
-- # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links
-- # to 'xlc' but it is crucial that we invoke the compiler with the right name!
-- if test "x$OPENJDK_BUILD_OS" != xaix; then
-- AC_MSG_CHECKING([resolved symbolic links for $1])
-- BASIC_REMOVE_SYMBOLIC_LINKS(TEST_COMPILER)
-- AC_MSG_RESULT([$TEST_COMPILER])
-- fi
-- AC_MSG_CHECKING([if $1 is disguised ccache])
-
-- COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"`
-- if test "x$COMPILER_BASENAME" = "xccache"; then
-- AC_MSG_RESULT([yes, trying to find proper $COMPILER_NAME compiler])
-- # We /usr/lib/ccache in the path, so cc is a symlink to /usr/bin/ccache.
-- # We want to control ccache invocation ourselves, so ignore this cc and try
-- # searching again.
-+ AC_MSG_CHECKING([resolved symbolic links for $1])
-+ SYMLINK_ORIGINAL="$TEST_COMPILER"
-+ BASIC_REMOVE_SYMBOLIC_LINKS(SYMLINK_ORIGINAL)
-+ if test "x$TEST_COMPILER" = "x$SYMLINK_ORIGINAL"; then
-+ AC_MSG_RESULT([no symlink])
-+ else
-+ AC_MSG_RESULT([$SYMLINK_ORIGINAL])
-
-- # Remove the path to the fake ccache cc from the PATH
-- RETRY_COMPILER_SAVED_PATH="$PATH"
-- COMPILER_DIRNAME=`$DIRNAME [$]$1`
-- PATH="`$ECHO $PATH | $SED -e "s,$COMPILER_DIRNAME,,g" -e "s,::,:,g" -e "s,^:,,g"`"
--
-- # Try again looking for our compiler
-- AC_CHECK_TOOLS(PROPER_COMPILER_$1, $3)
-- BASIC_FIXUP_EXECUTABLE(PROPER_COMPILER_$1)
-- PATH="$RETRY_COMPILER_SAVED_PATH"
--
-- AC_MSG_CHECKING([for resolved symbolic links for $1])
-- BASIC_REMOVE_SYMBOLIC_LINKS(PROPER_COMPILER_$1)
-- AC_MSG_RESULT([$PROPER_COMPILER_$1])
-- $1="$PROPER_COMPILER_$1"
-- else
-- AC_MSG_RESULT([no, keeping $1])
-+ # We can't handle ccache by gcc wrappers, since we need to know if we're
-+ # using ccache. Instead ccache usage must be controlled by a configure option.
-+ COMPILER_BASENAME=`$BASENAME "$SYMLINK_ORIGINAL"`
-+ if test "x$COMPILER_BASENAME" = "xccache"; then
-+ AC_MSG_NOTICE([Please use --enable-ccache instead of providing a wrapped compiler.])
-+ AC_MSG_ERROR([$TEST_COMPILER is a symbolic link to ccache. This is not supported.])
-+ fi
- fi
-
- TOOLCHAIN_EXTRACT_COMPILER_VERSION([$1], [$COMPILER_NAME])
diff --git a/8150954-pr2866-rh1176206-screenshot-xcomposite-jdk.patch b/8150954-pr2866-rh1176206-screenshot-xcomposite-jdk.patch
deleted file mode 100644
index 8b62ae6..0000000
--- a/8150954-pr2866-rh1176206-screenshot-xcomposite-jdk.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-
-# HG changeset patch
-# User neugens
-# Date 1532089120 -7200
-# Node ID 7b30bb9b05bd2e8045bc693ea5be353ce6326396
-# Parent 3d8011a1e02179e5658110981e30274c605ceac8
-8150954: Taking screenshots on x11 composite desktop produce wrong result
-Summary: The AWT Robot X11 code that takes screenshots uses the default root window, which may not contain the final composited desktop.
-Reviewed-by: alexsch, ssadetsky, prr, dbuck
-
-diff -r 3d8011a1e021 -r 7b30bb9b05bd make/mapfiles/libawt_xawt/mapfile-vers
---- openjdk/jdk/make/mapfiles/libawt_xawt/mapfile-vers Thu Jul 19 03:31:37 2018 +0100
-+++ openjdk/jdk/make/mapfiles/libawt_xawt/mapfile-vers Fri Jul 20 14:18:40 2018 +0200
-@@ -158,6 +158,7 @@
- Java_sun_awt_X11_XRobotPeer_mouseReleaseImpl;
- Java_sun_awt_X11_XRobotPeer_mouseWheelImpl;
- Java_sun_awt_X11_XRobotPeer_setup;
-+ Java_sun_awt_X11_XRobotPeer_loadNativeLibraries;
- Java_sun_awt_X11_XToolkit_getNumberOfButtonsImpl;
- Java_java_awt_Component_initIDs;
- Java_java_awt_Container_initIDs;
-diff -r 3d8011a1e021 -r 7b30bb9b05bd src/solaris/classes/sun/awt/X11/XRobotPeer.java
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XRobotPeer.java Thu Jul 19 03:31:37 2018 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XRobotPeer.java Fri Jul 20 14:18:40 2018 +0200
-@@ -34,6 +34,10 @@
-
- class XRobotPeer implements RobotPeer {
-
-+ static {
-+ loadNativeLibraries();
-+ }
-+
- private X11GraphicsConfig xgc = null;
- /*
- * native implementation uses some static shared data (pipes, processes)
-@@ -98,4 +102,5 @@
- private static native synchronized void keyReleaseImpl(int keycode);
-
- private static native synchronized void getRGBPixelsImpl(X11GraphicsConfig xgc, int x, int y, int width, int height, int pixelArray[]);
-+ private static native void loadNativeLibraries();
- }
-diff -r 3d8011a1e021 -r 7b30bb9b05bd src/solaris/native/sun/awt/awt_Robot.c
---- openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c Thu Jul 19 03:31:37 2018 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c Fri Jul 20 14:18:40 2018 +0200
-@@ -27,6 +27,9 @@
- #error This file should not be included in headless library
- #endif
-
-+#include "jvm_md.h"
-+#include <dlfcn.h>
-+
- #include "awt_p.h"
- #include "awt_GraphicsEnv.h"
- #define XK_MISCELLANY
-@@ -49,11 +52,46 @@
- #include <sys/socket.h>
- #endif
-
-+static Bool (*compositeQueryExtension) (Display*, int*, int*);
-+static Status (*compositeQueryVersion) (Display*, int*, int*);
-+static Window (*compositeGetOverlayWindow) (Display *, Window);
-+
- extern struct X11GraphicsConfigIDs x11GraphicsConfigIDs;
-
- static jint * masks;
- static jint num_buttons;
-
-+static void *xCompositeHandle;
-+
-+static const char* XCOMPOSITE = JNI_LIB_NAME("Xcomposite");
-+static const char* XCOMPOSITE_VERSIONED = VERSIONED_JNI_LIB_NAME("Xcomposite", "1");
-+
-+static Bool checkXCompositeFunctions(void) {
-+ return (compositeQueryExtension != NULL &&
-+ compositeQueryVersion != NULL &&
-+ compositeGetOverlayWindow != NULL);
-+}
-+
-+static void initXCompositeFunctions(void) {
-+
-+ if (xCompositeHandle == NULL) {
-+ xCompositeHandle = dlopen(XCOMPOSITE, RTLD_LAZY | RTLD_GLOBAL);
-+ if (xCompositeHandle == NULL) {
-+ xCompositeHandle = dlopen(XCOMPOSITE_VERSIONED, RTLD_LAZY | RTLD_GLOBAL);
-+ }
-+ }
-+ //*(void **)(&asyncGetCallTraceFunction)
-+ if (xCompositeHandle != NULL) {
-+ *(void **)(&compositeQueryExtension) = dlsym(xCompositeHandle, "XCompositeQueryExtension");
-+ *(void **)(&compositeQueryVersion) = dlsym(xCompositeHandle, "XCompositeQueryVersion");
-+ *(void **)(&compositeGetOverlayWindow) = dlsym(xCompositeHandle, "XCompositeGetOverlayWindow");
-+ }
-+
-+ if (xCompositeHandle && !checkXCompositeFunctions()) {
-+ dlclose(xCompositeHandle);
-+ }
-+}
-+
- static int32_t isXTestAvailable() {
- int32_t major_opcode, first_event, first_error;
- int32_t event_basep, error_basep, majorp, minorp;
-@@ -88,6 +126,35 @@
- return isXTestAvailable;
- }
-
-+static Bool hasXCompositeOverlayExtension(Display *display) {
-+
-+ int xoverlay = False;
-+ int eventBase, errorBase;
-+ if (checkXCompositeFunctions() &&
-+ compositeQueryExtension(display, &eventBase, &errorBase))
-+ {
-+ int major = 0;
-+ int minor = 0;
-+
-+ compositeQueryVersion(display, &major, &minor);
-+ if (major > 0 || minor >= 3) {
-+ xoverlay = True;
-+ }
-+ }
-+
-+ return xoverlay;
-+}
-+
-+static jboolean isXCompositeDisplay(Display *display, int screenNumber) {
-+
-+ char NET_WM_CM_Sn[25];
-+ snprintf(NET_WM_CM_Sn, sizeof(NET_WM_CM_Sn), "_NET_WM_CM_S%d\0", screenNumber);
-+
-+ Atom managerSelection = XInternAtom(display, NET_WM_CM_Sn, 0);
-+ Window owner = XGetSelectionOwner(display, managerSelection);
-+
-+ return owner != 0;
-+}
-
- static XImage *getWindowImage(Display * display, Window window,
- int32_t x, int32_t y,
-@@ -232,6 +299,12 @@
- DASSERT(adata != NULL);
-
- rootWindow = XRootWindow(awt_display, adata->awt_visInfo.screen);
-+ if (hasXCompositeOverlayExtension(awt_display) &&
-+ isXCompositeDisplay(awt_display, adata->awt_visInfo.screen))
-+ {
-+ rootWindow = compositeGetOverlayWindow(awt_display, rootWindow);
-+ }
-+
- image = getWindowImage(awt_display, rootWindow, x, y, width, height);
-
- /* Array to use to crunch around the pixel values */
-@@ -412,3 +485,8 @@
-
- AWT_UNLOCK();
- }
-+
-+JNIEXPORT void JNICALL
-+Java_sun_awt_X11_XRobotPeer_loadNativeLibraries (JNIEnv *env, jclass cls) {
-+ initXCompositeFunctions();
-+}
-
diff --git a/8154313.patch b/8154313.patch
deleted file mode 100644
index 3a43c5f..0000000
--- a/8154313.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- jdk8/make/Javadoc.gmk 2016-04-01 16:53:41.069477682 +0200
-+++ jdk8/make/Javadoc.gmk 2016-04-01 16:53:41.014477059 +0200
-@@ -220,6 +220,12 @@
- JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
- PLATFORM_DOCSDIR = $(DOCSDIR)/platform
-
-+
-+JAVADOC_ARCHIVE_NAME := jdk-$(FULL_VERSION)-docs.zip
-+JAVADOC_ARCHIVE_ASSEMBLY_DIR := $(DOCSTMPDIR)/zip-docs
-+JAVADOC_ARCHIVE_DIR := $(OUTPUT_ROOT)/bundles
-+JAVADOC_ARCHIVE := $(JAVADOC_ARCHIVE_DIR)/$(JAVADOC_ARCHIVE_NAME)
-+
- # The non-core api javadocs need to be able to access the root of the core
- # api directory, so for jdk/api or jre/api to get to the core api/
- # directory we would use this:
-@@ -319,6 +325,37 @@
- all: docs
- docs: coredocs otherdocs
-
-+#
-+# Optional target which bundles all generated javadocs into a zip
-+# archive. The dependency on docs is handled in Main.gmk. Incremental
-+# building of docs is currently broken so if you invoke zip-docs after
-+# docs, the docs are always rebuilt.
-+#
-+
-+zip-docs: $(JAVADOC_ARCHIVE)
-+
-+#
-+# Add the core docs as prerequisite to the archive to trigger a rebuild
-+# if the core docs were rebuilt. Ideally any doc rebuild should trigger
-+# this, but the way prerequisites are currently setup in this file, that
-+# is hard to achieve.
-+#
-+
-+$(JAVADOC_ARCHIVE): $(COREAPI_INDEX_FILE)
-+ @$(ECHO) "Compressing javadoc to single $(JAVADOC_ARCHIVE_NAME)" ;
-+ $(MKDIR) -p $(JAVADOC_ARCHIVE_DIR) ;
-+ $(RM) -r $(JAVADOC_ARCHIVE_ASSEMBLY_DIR) ;
-+ $(MKDIR) -p $(JAVADOC_ARCHIVE_ASSEMBLY_DIR);
-+ all_roots=`$(FIND) $(DOCSDIR) | $(GREP) index.html `; \
-+ pushd $(JAVADOC_ARCHIVE_ASSEMBLY_DIR); \
-+ for index_file in $${all_roots} ; do \
-+ target_dir=`dirname $${index_file}`; \
-+ name=`$(ECHO) $${target_dir} | $(SED) "s;/spec;;" | $(SED) "s;.*/;;"`; \
-+ $(LN) -s $${target_dir} $${name}; \
-+ done; \
-+ $(ZIP) -q -r $(JAVADOC_ARCHIVE) * ; \
-+ popd ;
-+
- #################################################################
- # Production Targets -- USE THESE TARGETS WHEN:
- # a) You're generating docs outside of release engineering's
---- jdk8/make/Main.gmk 2016-04-01 16:53:41.311480424 +0200
-+++ jdk8/make/Main.gmk 2016-04-01 16:53:41.266479914 +0200
-@@ -165,6 +165,12 @@
- @($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
- @$(call TargetExit)
-
-+zip-docs: docs zip-docs-only
-+zip-docs-only: start-make
-+ @$(call TargetEnter)
-+ @($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk zip-docs)
-+ @$(call TargetExit)
-+
- sign-jars: jdk sign-jars-only
- sign-jars-only: start-make
- @$(call TargetEnter)
diff --git a/8164293-pr3412-rh1459641.patch b/8164293-pr3412-rh1459641.patch
deleted file mode 100644
index 3b08f8b..0000000
--- a/8164293-pr3412-rh1459641.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-# HG changeset patch
-# User jcm
-# Date 1484137609 28800
-# Wed Jan 11 04:26:49 2017 -0800
-# Node ID 1faf7c17089922f6f72b580253725f2ecb6ba2f8
-# Parent 3d07e14d65bc223dbfe94be9224e4aa8c6e63762
-8164293, PR3412, RH1459641: HotSpot leaking memory in long-running requests
-Summary: Applied RMs in sweep_code_cache and related codes.
-Reviewed-by: kvn, thartmann
-
-diff --git a/src/share/vm/code/nmethod.cpp b/src/share/vm/code/nmethod.cpp
---- openjdk/hotspot/src/share/vm/code/nmethod.cpp
-+++ openjdk/hotspot/src/share/vm/code/nmethod.cpp
-@@ -1172,6 +1172,7 @@
- // Clear ICStubs of all compiled ICs
- void nmethod::clear_ic_stubs() {
- assert_locked_or_safepoint(CompiledIC_lock);
-+ ResourceMark rm;
- RelocIterator iter(this);
- while(iter.next()) {
- if (iter.type() == relocInfo::virtual_call_type) {
-diff --git a/src/share/vm/runtime/sweeper.cpp b/src/share/vm/runtime/sweeper.cpp
---- openjdk/hotspot/src/share/vm/runtime/sweeper.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/sweeper.cpp
-@@ -319,6 +319,7 @@
- }
-
- void NMethodSweeper::sweep_code_cache() {
-+ ResourceMark rm;
- Ticks sweep_start_counter = Ticks::now();
-
- _flushed_count = 0;
-@@ -626,6 +627,7 @@
- // state of the code cache if it's requested.
- void NMethodSweeper::log_sweep(const char* msg, const char* format, ...) {
- if (PrintMethodFlushing) {
-+ ResourceMark rm;
- stringStream s;
- // Dump code cache state into a buffer before locking the tty,
- // because log_state() will use locks causing lock conflicts.
-@@ -643,6 +645,7 @@
- }
-
- if (LogCompilation && (xtty != NULL)) {
-+ ResourceMark rm;
- stringStream s;
- // Dump code cache state into a buffer before locking the tty,
- // because log_state() will use locks causing lock conflicts.
diff --git a/8165852-pr3468.patch b/8165852-pr3468.patch
deleted file mode 100644
index 6a9f643..0000000
--- a/8165852-pr3468.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java 2017-08-23 11:40:26.690809603 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java 2017-08-23 11:44:28.314815334 +0200
-@@ -74,8 +74,16 @@
- } catch (UnixException x) {
- x.rethrowAsIOException(parent);
- }
-- if (attrs.dev() != dev())
-- break;
-+ if (attrs.dev() != dev()) {
-+
-+ // step 3: lookup mounted file systems (use /proc/mounts to ensure we
-+ // find the file system even when not in /etc/mtab)
-+ byte[] dir = path.asByteArray();
-+ for (UnixMountEntry entry: fs.getMountEntries("/proc/mounts")) {
-+ if (Arrays.equals(dir, entry.dir()))
-+ return entry;
-+ }
-+ }
- path = parent;
- parent = parent.getParent();
- }
diff --git a/8171000-pr3542-rh1402819.patch b/8171000-pr3542-rh1402819.patch
deleted file mode 100644
index d831aa9..0000000
--- a/8171000-pr3542-rh1402819.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-# HG changeset patch
-# User kaddepalli
-# Date 1517818481 -19800
-# Mon Feb 05 13:44:41 2018 +0530
-# Node ID b77308735540644d4710244e3c88865067f2905a
-# Parent 39bfc94b1f4265b645c2970a58389acc779dafe9
-8171000, PR3542, RH1402819: Robot.createScreenCapture() crashes in wayland mode
-Reviewed-by: serb, mhalder
-
-diff --git openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
---- openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c
-+++ openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
-@@ -394,77 +394,48 @@
- XRectangle bbox; /* bounding box of grabbed area */
- list_ptr regions;/* list of regions to read from */
- {
-- image_region_type *reg;
-- int32_t dst_x, dst_y; /* where in pixmap to write (UL) */
-- int32_t diff;
--
-- XImage *reg_image,*ximage ;
-- int32_t srcRect_x,srcRect_y,srcRect_width,srcRect_height ;
-- int32_t rem ;
-- int32_t bytes_per_line;
-- int32_t bitmap_unit;
--
-- bitmap_unit = sizeof (long);
-- if (format == ZPixmap)
-- bytes_per_line = width*depth/8;
-- else
-- bytes_per_line = width/8;
--
--
-- /* Find out how many more bytes are required for padding so that
-- ** bytes per scan line will be multiples of bitmap_unit bits */
-- if (format == ZPixmap) {
-- rem = (bytes_per_line*8)%bitmap_unit;
-- if (rem)
-- bytes_per_line += (rem/8 + 1);
-- }
-+ XImage *ximage ;
-
- ximage = XCreateImage(disp,fakeVis,(uint32_t) depth,format,0,NULL,
- (uint32_t)width,(uint32_t)height,8,0);
-
-- bytes_per_line = ximage->bytes_per_line;
--
-- if (format == ZPixmap)
-- ximage->data = malloc(height*bytes_per_line);
-- else
-- ximage->data = malloc(height*bytes_per_line*depth);
--
-+ ximage->data = calloc(ximage->bytes_per_line*height*((format==ZPixmap)? 1 : depth), sizeof(char));
- ximage->bits_per_pixel = depth; /** Valid only if format is ZPixmap ***/
-
-- for (reg = (image_region_type *) first_in_list( regions); reg;
-+ for (image_region_type* reg = (image_region_type *) first_in_list( regions); reg;
- reg = (image_region_type *) next_in_list( regions))
- {
-- int32_t rect;
-- struct my_XRegion *vis_reg;
-- vis_reg = (struct my_XRegion *)(reg->visible_region);
-- for (rect = 0;
-- rect < vis_reg->numRects;
-- rect++)
-+ struct my_XRegion *vis_reg = (struct my_XRegion *)(reg->visible_region);
-+ for (int32_t rect = 0; rect < vis_reg->numRects; rect++)
- {
-- /** ------------------------------------------------------------------------
-- Intersect bbox with visible part of region giving src rect & output
-- location. Width is the min right side minus the max left side.
-- Similar for height. Offset src rect so x,y are relative to
-- origin of win, not the root-relative visible rect of win.
-- ------------------------------------------------------------------------ **/
-- srcRect_width = MIN( vis_reg->rects[rect].x2, bbox.width + bbox.x)
-- - MAX( vis_reg->rects[rect].x1, bbox.x);
-+ /** ------------------------------------------------------------------------
-+ Intersect bbox with visible part of region giving src rect & output
-+ location. Width is the min right side minus the max left side.
-+ Similar for height. Offset src rect so x,y are relative to
-+ origin of win, not the root-relative visible rect of win.
-+ ------------------------------------------------------------------------ **/
-+ int32_t srcRect_width = MIN( vis_reg->rects[rect].x2, bbox.width + bbox.x)
-+ - MAX( vis_reg->rects[rect].x1, bbox.x);
-+
-+ int32_t srcRect_height = MIN( vis_reg->rects[rect].y2, bbox.height + bbox.y)
-+ - MAX( vis_reg->rects[rect].y1, bbox.y);
-
-- srcRect_height = MIN( vis_reg->rects[rect].y2, bbox.height + bbox.y)
-- - MAX( vis_reg->rects[rect].y1, bbox.y);
-+ int32_t diff = bbox.x - vis_reg->rects[rect].x1;
-+ int32_t srcRect_x = MAX( 0, diff) + (vis_reg->rects[rect].x1 - reg->x_rootrel - reg->border);
-+ int32_t dst_x = MAX( 0, -diff) ;
-
-- diff = bbox.x - vis_reg->rects[rect].x1;
-- srcRect_x = MAX( 0, diff) + (vis_reg->rects[rect].x1 - reg->x_rootrel - reg->border);
-- dst_x = MAX( 0, -diff) ;
-- diff = bbox.y - vis_reg->rects[rect].y1;
-- srcRect_y = MAX( 0, diff) + (vis_reg->rects[rect].y1 - reg->y_rootrel - reg->border);
-- dst_y = MAX( 0, -diff) ;
-- reg_image = XGetImage(disp,reg->win,srcRect_x,srcRect_y,
-- (uint32_t) srcRect_width, (uint32_t) srcRect_height,AllPlanes,format) ;
-- TransferImage(disp,reg_image,srcRect_width,
-- srcRect_height,reg,ximage,dst_x,dst_y) ;
-- XDestroyImage(reg_image);
-- }
-+ diff = bbox.y - vis_reg->rects[rect].y1;
-+ int32_t srcRect_y = MAX( 0, diff) + (vis_reg->rects[rect].y1 - reg->y_rootrel - reg->border);
-+ int32_t dst_y = MAX( 0, -diff) ;
-+ XImage* reg_image = XGetImage(disp,reg->win,srcRect_x,srcRect_y,
-+ (uint32_t) srcRect_width, (uint32_t) srcRect_height,AllPlanes,format) ;
-+
-+ if (reg_image) {
-+ TransferImage(disp,reg_image,srcRect_width,
-+ srcRect_height,reg,ximage,dst_x,dst_y) ;
-+ XDestroyImage(reg_image);
-+ }
-+ }
- }
- return ximage ;
- }
diff --git a/8184309-pr3596.patch b/8184309-pr3596.patch
deleted file mode 100644
index 00b6125..0000000
--- a/8184309-pr3596.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User ysuenaga
-# Date 1527498573 -3600
-# Mon May 28 10:09:33 2018 +0100
-# Node ID ef176cb429c49d1c330d9575938f66b04e3fb730
-# Parent 6915dc9ae18cce5625d3a3fc74b37da70a5b4215
-8184309, PR3596: Build warnings from GCC 7.1 on Fedora 26
-Reviewed-by: kbarrett, vlivanov
-
-diff --git openjdk.orig/hotspot/src/share/vm/code/dependencies.cpp openjdk/hotspot/src/share/vm/code/dependencies.cpp
---- openjdk.orig/hotspot/src/share/vm/code/dependencies.cpp
-+++ openjdk/hotspot/src/share/vm/code/dependencies.cpp
-@@ -525,7 +525,7 @@
- xtty->object("x", arg.metadata_value());
- }
- } else {
-- char xn[10]; sprintf(xn, "x%d", j);
-+ char xn[12]; sprintf(xn, "x%d", j);
- if (arg.is_oop()) {
- xtty->object(xn, arg.oop_value());
- } else {
diff --git a/8185723-pr3553.patch b/8185723-pr3553.patch
deleted file mode 100644
index f8ee50a..0000000
--- a/8185723-pr3553.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# HG changeset patch
-# User aph
-# Date 1501690960 -3600
-# Wed Aug 02 17:22:40 2017 +0100
-# Node ID 91ab2eac9856ec86c16c0bedd32e0b87974ead6f
-# Parent 4e2adbc3d2b512f6b2bf318d2db60f4d1903f8c7
-8185723, PR3553: Zero: segfaults on Power PC 32-bit
-Reviewed-by: roland
-
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-@@ -38,10 +38,10 @@
- static void atomic_copy64(volatile void *src, volatile void *dst) {
- #if defined(PPC32)
- double tmp;
-- asm volatile ("lfd %0, 0(%1)\n"
-- "stfd %0, 0(%2)\n"
-- : "=f"(tmp)
-- : "b"(src), "b"(dst));
-+ asm volatile ("lfd %0, %2\n"
-+ "stfd %0, %1\n"
-+ : "=&f"(tmp), "=Q"(*(volatile double*)dst)
-+ : "Q"(*(volatile double*)src));
- #elif defined(S390) && !defined(_LP64)
- double tmp;
- asm volatile ("ld %0, 0(%1)\n"
diff --git a/8186461-pr3557.patch b/8186461-pr3557.patch
deleted file mode 100644
index cc8020c..0000000
--- a/8186461-pr3557.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User glaubitz
-# Date 1524889690 -3600
-# Sat Apr 28 05:28:10 2018 +0100
-# Node ID be1379a186ba527b32c93a83e04c9600735fe44b
-# Parent 91ab2eac9856ec86c16c0bedd32e0b87974ead6f
-8186461, PR3557: Zero's atomic_copy64() should use SPE instructions on linux-powerpcspe
-Reviewed-by: aph
-
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-@@ -36,12 +36,18 @@
-
- // Atomically copy 64 bits of data
- static void atomic_copy64(volatile void *src, volatile void *dst) {
--#if defined(PPC32)
-+#if defined(PPC32) && !defined(__SPE__)
- double tmp;
- asm volatile ("lfd %0, %2\n"
- "stfd %0, %1\n"
- : "=&f"(tmp), "=Q"(*(volatile double*)dst)
- : "Q"(*(volatile double*)src));
-+#elif defined(PPC32) && defined(__SPE__)
-+ long tmp;
-+ asm volatile ("evldd %0, %2\n"
-+ "evstdd %0, %1\n"
-+ : "=&r"(tmp), "=Q"(*(volatile long*)dst)
-+ : "Q"(*(volatile long*)src));
- #elif defined(S390) && !defined(_LP64)
- double tmp;
- asm volatile ("ld %0, 0(%1)\n"
diff --git a/8188030-pr3459-rh1484079.patch b/8188030-pr3459-rh1484079.patch
deleted file mode 100644
index 8564c81..0000000
--- a/8188030-pr3459-rh1484079.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User neugens
-# Date 1507735508 -3600
-# Wed Oct 11 16:25:08 2017 +0100
-# Node ID 5b91bf11d0f41a6124ffb0fcd8870507b50bd734
-# Parent 7b1a2f967cd8e950fe7dc47d716af13d36239a38
-8188030, PR3459, RH1484079: AWT java apps fail to start when some minimal fonts are present
-Summary: Handle CFF fonts
-Reviewed-by: andrew, prr
-
-diff --git a/src/solaris/native/sun/awt/fontpath.c b/src/solaris/native/sun/awt/fontpath.c
---- openjdk/jdk/src/solaris/native/sun/awt/fontpath.c
-+++ openjdk/jdk/src/solaris/native/sun/awt/fontpath.c
-@@ -1233,6 +1233,7 @@
- && (strcmp((char*)fontformat, "TrueType") != 0)
- #if defined(__linux__) || defined(_AIX)
- && (strcmp((char*)fontformat, "Type 1") != 0)
-+ && (strcmp((char*)fontformat, "CFF") != 0)
- #endif
- ) {
- continue;
diff --git a/8197429-pr3546-rh1536622.patch b/8197429-pr3546-rh1536622.patch
deleted file mode 100644
index fc60cd3..0000000
--- a/8197429-pr3546-rh1536622.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -r eecfc14e66ee src/os/linux/vm/os_linux.cpp
---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp Mon Jan 22 16:25:24 2018 +0000
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Wed Feb 21 13:52:31 2018 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 2018, 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
-@@ -674,6 +674,10 @@
- }
- }
-
-+void os::Linux::expand_stack_to(address bottom) {
-+ _expand_stack_to(bottom);
-+}
-+
- bool os::Linux::manually_expand_stack(JavaThread * t, address addr) {
- assert(t!=NULL, "just checking");
- assert(t->osthread()->expanding_stack(), "expand should be set");
-diff -r eecfc14e66ee src/os/linux/vm/os_linux.hpp
---- openjdk/hotspot/src/os/linux/vm/os_linux.hpp Mon Jan 22 16:25:24 2018 +0000
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.hpp Wed Feb 21 13:52:31 2018 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 2018, 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
-@@ -245,6 +245,8 @@
- static int safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime);
-
- private:
-+ static void expand_stack_to(address bottom);
-+
- typedef int (*sched_getcpu_func_t)(void);
- typedef int (*numa_node_to_cpus_func_t)(int node, unsigned long *buffer, int bufferlen);
- typedef int (*numa_max_node_func_t)(void);
-diff -r eecfc14e66ee src/os_cpu/linux_x86/vm/os_linux_x86.cpp
---- openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Mon Jan 22 16:25:24 2018 +0000
-+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Wed Feb 21 13:52:31 2018 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 2018, 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
-@@ -892,6 +892,25 @@
- void os::workaround_expand_exec_shield_cs_limit() {
- #if defined(IA32)
- size_t page_size = os::vm_page_size();
-+
-+ /*
-+ * JDK-8197429
-+ *
-+ * Expand the stack mapping to the end of the initial stack before
-+ * attempting to install the codebuf. This is needed because newer
-+ * Linux kernels impose a distance of a megabyte between stack
-+ * memory and other memory regions. If we try to install the
-+ * codebuf before expanding the stack the installation will appear
-+ * to succeed but we'll get a segfault later if we expand the stack
-+ * in Java code.
-+ *
-+ */
-+ if (os::Linux::is_initial_thread()) {
-+ address limit = Linux::initial_thread_stack_bottom();
-+ limit += (StackYellowPages + StackRedPages) * page_size;
-+ os::Linux::expand_stack_to(limit);
-+ }
-+
- /*
- * Take the highest VA the OS will give us and exec
- *
-@@ -910,6 +929,16 @@
- char* hint = (char*) (Linux::initial_thread_stack_bottom() -
- ((StackYellowPages + StackRedPages + 1) * page_size));
- char* codebuf = os::attempt_reserve_memory_at(page_size, hint);
-+
-+ if (codebuf == NULL) {
-+ // JDK-8197429: There may be a stack gap of one megabyte between
-+ // the limit of the stack and the nearest memory region: this is a
-+ // Linux kernel workaround for CVE-2017-1000364. If we failed to
-+ // map our codebuf, try again at an address one megabyte lower.
-+ hint -= 1 * M;
-+ codebuf = os::attempt_reserve_memory_at(page_size, hint);
-+ }
-+
- if ( (codebuf == NULL) || (!os::commit_memory(codebuf, page_size, true)) ) {
- return; // No matter, we tried, best effort.
- }
diff --git a/8197546-pr3542-rh1402819.patch b/8197546-pr3542-rh1402819.patch
deleted file mode 100644
index ba712ad..0000000
--- a/8197546-pr3542-rh1402819.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# HG changeset patch
-# User prr
-# Date 1518454604 28800
-# Mon Feb 12 08:56:44 2018 -0800
-# Node ID 556adf3a76aa81bf3918d7d46554dae7cc1d5c5c
-# Parent b77308735540644d4710244e3c88865067f2905a
-8197546: Fix for 8171000 breaks Solaris + Linux builds
-Reviewed-by: serb, jdv
-
-diff --git openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
---- openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c
-+++ openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
-@@ -395,6 +395,8 @@
- list_ptr regions;/* list of regions to read from */
- {
- XImage *ximage ;
-+ image_region_type* reg;
-+ int32_t rect;
-
- ximage = XCreateImage(disp,fakeVis,(uint32_t) depth,format,0,NULL,
- (uint32_t)width,(uint32_t)height,8,0);
-@@ -402,11 +404,11 @@
- ximage->data = calloc(ximage->bytes_per_line*height*((format==ZPixmap)? 1 : depth), sizeof(char));
- ximage->bits_per_pixel = depth; /** Valid only if format is ZPixmap ***/
-
-- for (image_region_type* reg = (image_region_type *) first_in_list( regions); reg;
-+ for (reg = (image_region_type *) first_in_list( regions); reg;
- reg = (image_region_type *) next_in_list( regions))
- {
- struct my_XRegion *vis_reg = (struct my_XRegion *)(reg->visible_region);
-- for (int32_t rect = 0; rect < vis_reg->numRects; rect++)
-+ for (rect = 0; rect < vis_reg->numRects; rect++)
- {
- /** ------------------------------------------------------------------------
- Intersect bbox with visible part of region giving src rect & output
diff --git a/8197981-pr3548.patch b/8197981-pr3548.patch
deleted file mode 100644
index 5f6d9ce..0000000
--- a/8197981-pr3548.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1518667645 0
-# Thu Feb 15 04:07:25 2018 +0000
-# Node ID 1d35411eb7bdf16191e220ffe3b1dc4d5d0c6041
-# Parent 999983606f5c61b093c6f6316a7b26c4cd4ca79e
-8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
-Summary: Fix issue discovered by -Wreturn-type on systems without LP64.
-Reviewed-by: aph
-
-diff --git openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-@@ -457,6 +457,7 @@
- long long unsigned int oldval,
- long long unsigned int newval) {
- ShouldNotCallThis();
-+ return 0;
- }
- };
- #endif // !_LP64
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-@@ -498,6 +498,7 @@
- long long unsigned int oldval,
- long long unsigned int newval) {
- ShouldNotCallThis();
-+ return 0;
- }
- };
- #endif // !_LP64
diff --git a/8199936-pr3533-workaround.patch b/8199936-pr3533-workaround.patch
deleted file mode 100644
index 900e0c3..0000000
--- a/8199936-pr3533-workaround.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1526122977 -3600
-# Sat May 12 12:02:57 2018 +0100
-# Node ID 00ccc73498628a51a45301322e64ce2ad06e49be
-# Parent aecf9f48f7b5c6148b62713a6b746301435b57cc
-PR3533: HotSpot generates code with unaligned stack, crashes on SSE operations
-Summary: Enable -mstackrealign on x86 Linux as well as x86 Mac OS X
-
-diff --git openjdk.orig///common/autoconf/hotspot-spec.gmk.in openjdk///common/autoconf/hotspot-spec.gmk.in
---- openjdk.orig///common/autoconf/hotspot-spec.gmk.in
-+++ openjdk///common/autoconf/hotspot-spec.gmk.in
-@@ -110,7 +110,8 @@
- RC:=@HOTSPOT_RC@
-
- EXTRA_CFLAGS=@LEGACY_EXTRA_CFLAGS@ $(NO_DELETE_NULL_POINTER_CHECKS_CFLAG) \
-- $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG)
-+ $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG) \
-+ $(REALIGN_CFLAG)
- EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@
- EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@
-
-diff --git openjdk.orig///common/autoconf/spec.gmk.in openjdk///common/autoconf/spec.gmk.in
---- openjdk.orig///common/autoconf/spec.gmk.in
-+++ openjdk///common/autoconf/spec.gmk.in
-@@ -333,6 +333,7 @@
-
- NO_DELETE_NULL_POINTER_CHECKS_CFLAG=@NO_DELETE_NULL_POINTER_CHECKS_CFLAG@
- NO_LIFETIME_DSE_CFLAG=@NO_LIFETIME_DSE_CFLAG@
-+REALIGN_CFLAG=@REALIGN_CFLAG@
- CXXSTD_CXXFLAG=@CXXSTD_CXXFLAG@
-
- CXX:=@FIXPATH@ @CCACHE@ @CXX@
-diff --git openjdk.orig///common/autoconf/toolchain.m4 openjdk///common/autoconf/toolchain.m4
---- openjdk.orig///common/autoconf/toolchain.m4
-+++ openjdk///common/autoconf/toolchain.m4
-@@ -796,20 +796,16 @@
- #
- # NOTE: check for -mstackrealign needs to be below potential addition of -m32
- #
-- if test "x$OPENJDK_TARGET_CPU_BITS" = x32 && test "x$OPENJDK_TARGET_OS" = xmacosx; then
-+ if test "x$OPENJDK_TARGET_CPU" = xx86 && test "x$OPENJDK_TARGET_OS" = xmacosx -o \
-+ "x$OPENJDK_TARGET_OS" = xlinux; then
- # On 32-bit MacOSX the OS requires C-entry points to be 16 byte aligned.
-- # While waiting for a better solution, the current workaround is to use -mstackrealign.
-- CFLAGS="$CFLAGS -mstackrealign"
-- AC_MSG_CHECKING([if 32-bit compiler supports -mstackrealign])
-- AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],
-- [
-- AC_MSG_RESULT([yes])
-- ],
-- [
-- AC_MSG_RESULT([no])
-- AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.])
-- ]
-+ # While waiting for a better solution, the current workaround is to use -mstackrealign
-+ # This is also required on Linux systems which use libraries compiled with SSE instructions
-+ REALIGN_CFLAG="-mstackrealign"
-+ TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([$REALIGN_CFLAG -Werror], [],
-+ AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.])
- )
-+ AC_SUBST([REALIGN_CFLAG])
- fi
-
- C_FLAG_DEPS="-MMD -MF"
diff --git a/8201509-pr3579.patch b/8201509-pr3579.patch
deleted file mode 100644
index 132c225..0000000
--- a/8201509-pr3579.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-# HG changeset patch
-# User mbalao
-# Date 1525317412 -3600
-# Thu May 03 04:16:52 2018 +0100
-# Node ID de79964656fc652f2085dac4fe99bcc128b5a3b1
-# Parent ffd5260fe5adcb26f87a14f1aaaf3e1a075d712a
-8201509, PR3579: Zero: S390 31bit atomic_copy64 inline assembler is wrong
-Summary: The inline assembler for the S390 (S390 and not _LP64) has src and dst reversed thereby corrupting data
-Reviewed-by: shade
-
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-@@ -1,6 +1,6 @@
- /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-- * Copyright 2007, 2008, 2010 Red Hat, Inc.
-+ * Copyright 2007, 2008, 2010, 2018, 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
-@@ -50,10 +50,10 @@
- : "Q"(*(volatile long*)src));
- #elif defined(S390) && !defined(_LP64)
- double tmp;
-- asm volatile ("ld %0, 0(%1)\n"
-- "std %0, 0(%2)\n"
-- : "=r"(tmp)
-- : "a"(src), "a"(dst));
-+ asm volatile ("ld %0, %2\n"
-+ "std %0, %1\n"
-+ : "=&f"(tmp), "=Q"(*(volatile double*)dst)
-+ : "Q"(*(volatile double*)src));
- #elif defined(__ARM_ARCH_7A__)
- jlong tmp;
- asm volatile ("ldrexd %0, [%1]\n"
diff --git a/8203182-pr3603-rh1568033.patch b/8203182-pr3603-rh1568033.patch
deleted file mode 100644
index 031a60c..0000000
--- a/8203182-pr3603-rh1568033.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-# HG changeset patch
-# User igerasim
-# Date 1528992969 25200
-# Thu Jun 14 09:16:09 2018 -0700
-# Node ID d9b0b4bd2526818afa73b60da77403245554caa8
-# Parent 1f4b038b9550afaf88a70cee4cf9c1422ecd86d6
-8203182, PR3603: Release session if initialization of SunPKCS11 Signature fails
-Summary: Ensure session is properly released in P11Signature class
-Reviewed-by: valeriep
-Contributed-by: Martin Balao <mbalao(a)redhat.com>
-
-diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java
---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java
-+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java
-@@ -309,47 +309,51 @@
- session = token.killSession(session);
- return;
- }
-- // "cancel" operation by finishing it
-- // XXX make sure all this always works correctly
-- if (mode == M_SIGN) {
-- try {
-- if (type == T_UPDATE) {
-- token.p11.C_SignFinal(session.id(), 0);
-- } else {
-- byte[] digest;
-- if (type == T_DIGEST) {
-- digest = md.digest();
-- } else { // T_RAW
-- digest = buffer;
-+ try {
-+ // "cancel" operation by finishing it
-+ // XXX make sure all this always works correctly
-+ if (mode == M_SIGN) {
-+ try {
-+ if (type == T_UPDATE) {
-+ token.p11.C_SignFinal(session.id(), 0);
-+ } else {
-+ byte[] digest;
-+ if (type == T_DIGEST) {
-+ digest = md.digest();
-+ } else { // T_RAW
-+ digest = buffer;
-+ }
-+ token.p11.C_Sign(session.id(), digest);
- }
-- token.p11.C_Sign(session.id(), digest);
-+ } catch (PKCS11Exception e) {
-+ throw new ProviderException("cancel failed", e);
- }
-- } catch (PKCS11Exception e) {
-- throw new ProviderException("cancel failed", e);
-+ } else { // M_VERIFY
-+ try {
-+ byte[] signature;
-+ if (keyAlgorithm.equals("DSA")) {
-+ signature = new byte[40];
-+ } else {
-+ signature = new byte[(p11Key.length() + 7) >> 3];
-+ }
-+ if (type == T_UPDATE) {
-+ token.p11.C_VerifyFinal(session.id(), signature);
-+ } else {
-+ byte[] digest;
-+ if (type == T_DIGEST) {
-+ digest = md.digest();
-+ } else { // T_RAW
-+ digest = buffer;
-+ }
-+ token.p11.C_Verify(session.id(), digest, signature);
-+ }
-+ } catch (PKCS11Exception e) {
-+ // will fail since the signature is incorrect
-+ // XXX check error code
-+ }
- }
-- } else { // M_VERIFY
-- try {
-- byte[] signature;
-- if (keyAlgorithm.equals("DSA")) {
-- signature = new byte[40];
-- } else {
-- signature = new byte[(p11Key.length() + 7) >> 3];
-- }
-- if (type == T_UPDATE) {
-- token.p11.C_VerifyFinal(session.id(), signature);
-- } else {
-- byte[] digest;
-- if (type == T_DIGEST) {
-- digest = md.digest();
-- } else { // T_RAW
-- digest = buffer;
-- }
-- token.p11.C_Verify(session.id(), digest, signature);
-- }
-- } catch (PKCS11Exception e) {
-- // will fail since the signature is incorrect
-- // XXX check error code
-- }
-+ } finally {
-+ session = token.releaseSession(session);
- }
- }
-
-@@ -368,6 +372,8 @@
- }
- initialized = true;
- } catch (PKCS11Exception e) {
-+ // release session when initialization failed
-+ session = token.releaseSession(session);
- throw new ProviderException("Initialization failed", e);
- }
- if (bytesProcessed != 0) {
-@@ -529,6 +535,8 @@
- }
- bytesProcessed += len;
- } catch (PKCS11Exception e) {
-+ initialized = false;
-+ session = token.releaseSession(session);
- throw new ProviderException(e);
- }
- break;
-@@ -576,6 +584,8 @@
- bytesProcessed += len;
- byteBuffer.position(ofs + len);
- } catch (PKCS11Exception e) {
-+ initialized = false;
-+ session = token.releaseSession(session);
- throw new ProviderException("Update failed", e);
- }
- break;
diff --git a/8205104-pr3539-rh1548475.patch b/8205104-pr3539-rh1548475.patch
deleted file mode 100644
index 9b40a7f..0000000
--- a/8205104-pr3539-rh1548475.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1526065930 -3600
-# Fri May 11 20:12:10 2018 +0100
-# Node ID b8fc1e640c4c7f38ca94131279cb67c4d3de6961
-# Parent afb31413c73cbc06420fdb447aa90a7a38258904
-PR3539, RH1548475: Pass EXTRA_LDFLAGS to HotSpot build
-
-diff --git openjdk.orig/hotspot/make/aix/makefiles/jsig.make openjdk/hotspot/make/aix/makefiles/jsig.make
---- openjdk.orig/hotspot/make/aix/makefiles/jsig.make
-+++ openjdk/hotspot/make/aix/makefiles/jsig.make
-@@ -45,7 +45,7 @@
- # cause problems with interposing. See CR: 6466665
- # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
-
--LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE)
-+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
-
- LFLAGS_JSIG += $(BIN_UTILS)
-
-diff --git openjdk.orig/hotspot/make/aix/makefiles/saproc.make openjdk/hotspot/make/aix/makefiles/saproc.make
---- openjdk.orig/hotspot/make/aix/makefiles/saproc.make
-+++ openjdk/hotspot/make/aix/makefiles/saproc.make
-@@ -66,7 +66,7 @@
- endif
-
-
--SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
-+SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
-
- $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
- $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
-diff --git openjdk.orig/hotspot/make/aix/makefiles/vm.make openjdk/hotspot/make/aix/makefiles/vm.make
---- openjdk.orig/hotspot/make/aix/makefiles/vm.make
-+++ openjdk/hotspot/make/aix/makefiles/vm.make
-@@ -117,7 +117,7 @@
-
- # Extra flags from gnumake's invocation or environment
- CFLAGS += $(EXTRA_CFLAGS)
--LFLAGS += $(EXTRA_CFLAGS)
-+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
-
- # Don't set excutable bit on stack segment
- # the same could be done by separate execstack command
-diff --git openjdk.orig/hotspot/make/bsd/makefiles/jsig.make openjdk/hotspot/make/bsd/makefiles/jsig.make
---- openjdk.orig/hotspot/make/bsd/makefiles/jsig.make
-+++ openjdk/hotspot/make/bsd/makefiles/jsig.make
-@@ -52,7 +52,7 @@
- # cause problems with interposing. See CR: 6466665
- # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
-
--LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE)
-+LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
-
- # DEBUG_BINARIES overrides everything, use full -g debug information
- ifeq ($(DEBUG_BINARIES), true)
-diff --git openjdk.orig/hotspot/make/bsd/makefiles/saproc.make openjdk/hotspot/make/bsd/makefiles/saproc.make
---- openjdk.orig/hotspot/make/bsd/makefiles/saproc.make
-+++ openjdk/hotspot/make/bsd/makefiles/saproc.make
-@@ -114,7 +114,7 @@
- # bring in minimum version argument or we'll fail on OSX 10.10
- SA_LFLAGS = $(LFLAGS)
- endif
--SA_LFLAGS += $(LDFLAGS_HASH_STYLE)
-+SA_LFLAGS += $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
-
- BOOT_JAVA_INCLUDES = -I$(BOOT_JAVA_HOME)/include \
- -I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]" "[:lower:]")
-diff --git openjdk.orig/hotspot/make/bsd/makefiles/vm.make openjdk/hotspot/make/bsd/makefiles/vm.make
---- openjdk.orig/hotspot/make/bsd/makefiles/vm.make
-+++ openjdk/hotspot/make/bsd/makefiles/vm.make
-@@ -119,7 +119,7 @@
-
- # Extra flags from gnumake's invocation or environment
- CFLAGS += $(EXTRA_CFLAGS)
--LFLAGS += $(EXTRA_CFLAGS)
-+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
-
- # Don't set excutable bit on stack segment
- # the same could be done by separate execstack command
-diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
---- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
-+++ openjdk/hotspot/make/linux/makefiles/jsig.make
-@@ -44,7 +44,7 @@
- # cause problems with interposing. See CR: 6466665
- # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
-
--LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK)
-+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK) $(EXTRA_LDFLAGS)
-
- # DEBUG_BINARIES overrides everything, use full -g debug information
- ifeq ($(DEBUG_BINARIES), true)
-diff --git openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
---- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
-+++ openjdk/hotspot/make/linux/makefiles/saproc.make
-@@ -73,7 +73,7 @@
- else
- ALT_SAINCDIR=
- endif
--SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
-+SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
-
- SAARCH ?= $(BUILDARCH)
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
---- openjdk.orig/hotspot/make/linux/makefiles/vm.make
-+++ openjdk/hotspot/make/linux/makefiles/vm.make
-@@ -122,7 +122,7 @@
-
- # Extra flags from gnumake's invocation or environment
- CFLAGS += $(EXTRA_CFLAGS)
--LFLAGS += $(EXTRA_CFLAGS)
-+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
-
- # Don't set excutable bit on stack segment
- # the same could be done by separate execstack command
diff --git a/8206406-pr3610-rh1597825.patch b/8206406-pr3610-rh1597825.patch
deleted file mode 100644
index 0f38126..0000000
--- a/8206406-pr3610-rh1597825.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-# HG changeset patch
-# User aph
-# Date 1531146945 -3600
-# Mon Jul 09 15:35:45 2018 +0100
-# Node ID 95b72537801cc9946c27ad27f07e3f0790a21b08
-# Parent f6341f4635dacb56678264d29a88cd052b74036b
-8206406, PR3610, RH1597825: StubCodeDesc constructor publishes partially-constructed objects on StubCodeDesc::_list
-Reviewed-by: dholmes
-
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp
-@@ -34,12 +34,12 @@
-
- // Implementation of StubCodeDesc
-
--StubCodeDesc* StubCodeDesc::_list = NULL;
--int StubCodeDesc::_count = 0;
-+StubCodeDesc* volatile StubCodeDesc::_list = NULL;
-+int StubCodeDesc::_count = 0;
-
-
- StubCodeDesc* StubCodeDesc::desc_for(address pc) {
-- StubCodeDesc* p = _list;
-+ StubCodeDesc* p = (StubCodeDesc*)OrderAccess::load_ptr_acquire(&_list);
- while (p != NULL && !p->contains(pc)) p = p->_next;
- // p == NULL || p->contains(pc)
- return p;
-@@ -47,7 +47,7 @@
-
-
- StubCodeDesc* StubCodeDesc::desc_for_index(int index) {
-- StubCodeDesc* p = _list;
-+ StubCodeDesc* p = (StubCodeDesc*)OrderAccess::load_ptr_acquire(&_list);
- while (p != NULL && p->index() != index) p = p->_next;
- return p;
- }
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp
---- openjdk.orig/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp
-+++ openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp
-@@ -38,7 +38,7 @@
-
- class StubCodeDesc: public CHeapObj<mtCode> {
- protected:
-- static StubCodeDesc* _list; // the list of all descriptors
-+ static StubCodeDesc* volatile _list; // the list of all descriptors
- static int _count; // length of list
-
- StubCodeDesc* _next; // the next element in the linked list
-@@ -69,13 +69,13 @@
-
- StubCodeDesc(const char* group, const char* name, address begin) {
- assert(name != NULL, "no name specified");
-- _next = _list;
-+ _next = (StubCodeDesc*)OrderAccess::load_ptr_acquire(&_list);
- _group = group;
- _name = name;
- _index = ++_count; // (never zero)
- _begin = begin;
- _end = NULL;
-- _list = this;
-+ OrderAccess::release_store_ptr(&_list, this);
- };
-
- const char* group() const { return _group; }
diff --git a/8206425-hotspot-remove-debuglink.patch b/8206425-hotspot-remove-debuglink.patch
deleted file mode 100644
index adbf1f0..0000000
--- a/8206425-hotspot-remove-debuglink.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-# HG changeset patch
-# User sgehwolf
-# Date 1530808022 -7200
-# Thu Jul 05 18:27:02 2018 +0200
-# Node ID 5ba59d58d976db456c4455640111e8107b8d80e8
-# Parent ad057f2e3211cd18bc56550d8a2c400d92ec35b1
-8206425: .gnu_debuglink sections added unconditionally when no debuginfo is stripped
-Summary: Only add .gnu_debuglink sections when there is some stripping done.
-Reviewed-by: erikj, dholmes
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
---- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
-+++ openjdk/hotspot/make/linux/makefiles/jsig.make
-@@ -57,14 +57,15 @@
- $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
-+ ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
-- ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(STRIP) $@
- else
- ifeq ($(STRIP_POLICY),min_strip)
-+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
- $(QUIETLY) $(STRIP) -g $@
-+ endif
- # implied else here is no stripping at all
-- endif
- endif
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- $(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO)
-diff --git openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
---- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
-+++ openjdk/hotspot/make/linux/makefiles/saproc.make
-@@ -100,14 +100,15 @@
- -lthread_db
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
-+ ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
-- ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(STRIP) $@
- else
- ifeq ($(STRIP_POLICY),min_strip)
-+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
- $(QUIETLY) $(STRIP) -g $@
-+ endif
- # implied else here is no stripping at all
-- endif
- endif
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- $(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO)
-diff --git openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
---- openjdk.orig/hotspot/make/linux/makefiles/vm.make
-+++ openjdk/hotspot/make/linux/makefiles/vm.make
-@@ -358,14 +358,15 @@
-
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
-+ ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
-- ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(STRIP) $@
- else
- ifeq ($(STRIP_POLICY),min_strip)
-+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
- $(QUIETLY) $(STRIP) -g $@
-+ endif
- # implied else here is no stripping at all
-- endif
- endif
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
diff --git a/8207057-pr3613-assembler-debuginfo-hotspot.patch b/8207057-pr3613-assembler-debuginfo-hotspot.patch
deleted file mode 100644
index c61d972..0000000
--- a/8207057-pr3613-assembler-debuginfo-hotspot.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- openjdk/hotspot/make/linux/makefiles/gcc.make 2018-09-17 15:40:56.933127667 +0200
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2018-09-17 15:40:56.831127850 +0200
-@@ -184,6 +184,10 @@
- LFLAGS += $(ARCHFLAG)
- ASFLAGS += $(ARCHFLAG)
-
-+ifeq ($(DEBUG_BINARIES), true)
-+ ASFLAGS += $(ASFLAGS_DEBUG_SYMBOLS)
-+endif
-+
- # Use C++ Interpreter
- ifdef CC_INTERP
- CFLAGS += -DCC_INTERP
diff --git a/8207057-pr3613-assembler-debuginfo-root.patch b/8207057-pr3613-assembler-debuginfo-root.patch
deleted file mode 100644
index 7f57c0a..0000000
--- a/8207057-pr3613-assembler-debuginfo-root.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- openjdk/common/autoconf/toolchain.m4 2018-09-17 15:35:40.783695320 +0200
-+++ openjdk/common/autoconf/toolchain.m4 2018-09-17 15:35:40.608695635 +0200
-@@ -814,6 +814,10 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION],
-
- C_FLAG_DEPS="-MMD -MF"
- CXX_FLAG_DEPS="-MMD -MF"
-+ # By default don't set any specific assembler debug
-+ # info flags for toolchains unless we know they work.
-+ # See JDK-8207057.
-+ ASFLAGS_DEBUG_SYMBOLS=""
-
- case $COMPILER_TYPE in
- CC )
-@@ -842,6 +846,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION],
- CFLAGS_DEBUG_SYMBOLS="-g1"
- CXXFLAGS_DEBUG_SYMBOLS="-g1"
- fi
-+ ASFLAGS_DEBUG_SYMBOLS="-g"
- ;;
- ossc )
- #
-@@ -969,6 +974,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION],
- AC_SUBST(CXX_O_FLAG_NONE)
- AC_SUBST(C_FLAG_DEPS)
- AC_SUBST(CXX_FLAG_DEPS)
-+ AC_SUBST(ASFLAGS_DEBUG_SYMBOLS)
- ])
-
- AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_JDK],
---- openjdk/common/autoconf/spec.gmk.in 2018-09-17 15:35:43.324690758 +0200
-+++ openjdk/common/autoconf/spec.gmk.in 2018-09-17 15:35:43.169691036 +0200
-@@ -414,6 +414,7 @@
- # Options for generating debug symbols
- ENABLE_DEBUG_SYMBOLS:=@ENABLE_DEBUG_SYMBOLS@
- CFLAGS_DEBUG_SYMBOLS:=@CFLAGS_DEBUG_SYMBOLS@
-+ASFLAGS_DEBUG_SYMBOLS:=@ASFLAGS_DEBUG_SYMBOLS@
- CXXFLAGS_DEBUG_SYMBOLS:=@CXXFLAGS_DEBUG_SYMBOLS@
- ZIP_DEBUGINFO_FILES:=@ZIP_DEBUGINFO_FILES@
- STRIP_POLICY:=@STRIP_POLICY@
diff --git a/8210425-01-rh1630426-hotspot-opt-fix.patch b/8210425-01-rh1630426-hotspot-opt-fix.patch
deleted file mode 100644
index 0b05ba6..0000000
--- a/8210425-01-rh1630426-hotspot-opt-fix.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git openjdk.orig/hotspot/make/linux/makefiles/amd64.make openjdk/hotspot/make/linux/makefiles/amd64.make
---- openjdk.orig/hotspot/make/linux/makefiles/amd64.make
-+++ openjdk/hotspot/make/linux/makefiles/amd64.make
-@@ -22,10 +22,13 @@
- #
- #
-
--# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
--# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+ifeq ($(OPT_CFLAGS_NO_FMA),)
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+else
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+endif
- # Must also specify if CPU is little endian
- CFLAGS += -DVM_LITTLE_ENDIAN
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make
-@@ -225,6 +225,16 @@
- OPT_CFLAGS/SIZE=-Os
- OPT_CFLAGS/SPEED=-O3
-
-+ifeq ($(USE_CLANG),)
-+ # Only GCC 4.6 and better have machine independent -ffp-contract=off.
-+ # For other versions we need to explicitly set arch specific machine
-+ # flags or keep optimization off for them.
-+ ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 6 \) \))" "1"
-+ OPT_CFLAGS_NO_FMA = -ffp-contract=off
-+ endif
-+endif
-+
-+
- # Hotspot uses very unstrict aliasing turn this optimization off
- # This option is added to CFLAGS rather than OPT_CFLAGS
- # so that OPT_CFLAGS overrides get this option too.
-diff --git openjdk.orig/hotspot/make/linux/makefiles/i486.make openjdk/hotspot/make/linux/makefiles/i486.make
---- openjdk.orig/hotspot/make/linux/makefiles/i486.make
-+++ openjdk/hotspot/make/linux/makefiles/i486.make
-@@ -24,10 +24,13 @@
-
- # TLS helper, assembled from .s file
-
--# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
--# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+ifeq ($(OPT_CFLAGS_NO_FMA),)
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+else
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+endif
- # Must also specify if CPU is little endian
- CFLAGS += -DVM_LITTLE_ENDIAN
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/ppc64.make openjdk/hotspot/make/linux/makefiles/ppc64.make
---- openjdk.orig/hotspot/make/linux/makefiles/ppc64.make
-+++ openjdk/hotspot/make/linux/makefiles/ppc64.make
-@@ -49,3 +49,17 @@
- # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
- CFLAGS += -mcpu=power7 -mtune=power8 -minsert-sched-nops=regroup_exact -mno-multiple -mno-string
- endif
-+
-+ifeq ($(OPT_CFLAGS_NO_FMA),)
-+ ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),big)
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) -mno-fused-madd -fno-strict-aliasing
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) -mno-fused-madd -fno-strict-aliasing
-+ else
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+ endif
-+else
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+endif
-+
diff --git a/8210647-rh1630426-saproc-opt-fix.patch b/8210647-rh1630426-saproc-opt-fix.patch
deleted file mode 100644
index 0ab09e4..0000000
--- a/8210647-rh1630426-saproc-opt-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
---- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
-+++ openjdk/hotspot/make/linux/makefiles/saproc.make
-@@ -59,6 +59,11 @@
- SA_DEBUG_CFLAGS = -g
- endif
-
-+# Optimize saproc lib at level -O3 unless it's a slowdebug build
-+ifneq ($(DEBUG_LEVEL), slowdebug)
-+ SA_OPT_FLAGS = $(OPT_CFLAGS)
-+endif
-+
- # if $(AGENT_DIR) does not exist, we don't build SA
- # also, we don't build SA on Itanium or zero.
-
-@@ -95,6 +100,7 @@
- $(SASRCFILES) \
- $(SA_LFLAGS) \
- $(SA_DEBUG_CFLAGS) \
-+ $(SA_OPT_FLAGS) \
- $(EXTRA_CFLAGS) \
- -o $@ \
- -lthread_db
diff --git a/8210761-rh1630426-jsig-opt-fix.patch b/8210761-rh1630426-jsig-opt-fix.patch
deleted file mode 100644
index 5f30e59..0000000
--- a/8210761-rh1630426-jsig-opt-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
---- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
-+++ openjdk/hotspot/make/linux/makefiles/jsig.make
-@@ -51,10 +51,15 @@ ifeq ($(DEBUG_BINARIES), true)
- JSIG_DEBUG_CFLAGS = -g
- endif
-
-+# Optimize jsig lib at level -O3 unless it's a slowdebug build
-+ifneq ($(DEBUG_LEVEL), slowdebug)
-+ JSIG_OPT_FLAGS = $(OPT_CFLAGS)
-+endif
-+
- $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
- @echo Making signal interposition lib...
- $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
-- $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
-+ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(JSIG_OPT_FLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
- ifeq ($(STRIP_POLICY),all_strip)
diff --git a/README.src b/README.src
deleted file mode 100644
index b5f06d1..0000000
--- a/README.src
+++ /dev/null
@@ -1,2 +0,0 @@
-The java-1.8.0-openjdk-src subpackage contains the complete OpenJDK 8
-class library source code for use by IDE indexers and debuggers.
diff --git a/enableCommentedOutSystemNss.patch b/enableCommentedOutSystemNss.patch
deleted file mode 100644
index febd87e..0000000
--- a/enableCommentedOutSystemNss.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -r 5b86f66575b7 src/share/lib/security/java.security-linux
---- openjdk/jdk/src/share/lib/security/java.security-linux Tue May 16 13:29:05 2017 -0700
-+++ openjdk/jdk/src/share/lib/security/java.security-linux Tue Jun 06 14:05:12 2017 +0200
-@@ -74,6 +74,7 @@
- security.provider.7=com.sun.security.sasl.Provider
- security.provider.8=org.jcp.xml.dsig.internal.dom.XMLDSigRI
- security.provider.9=sun.security.smartcardio.SunPCSC
-+#security.provider.10=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/nss.cfg
-
- #
- # Sun Provider SecureRandom seed source.
diff --git a/generate_singlerepo_source_tarball.sh b/generate_singlerepo_source_tarball.sh
new file mode 100644
index 0000000..62218ba
--- /dev/null
+++ b/generate_singlerepo_source_tarball.sh
@@ -0,0 +1,145 @@
+#!/bin/bash
+# Generates the 'source tarball' for JDK projects.
+#
+# Example:
+# When used from local repo set REPO_ROOT pointing to file:// with your repo
+# if your local repo follows upstream forests conventions, you may be enough by setting OPENJDK_URL
+# if you wont to use local copy of patch PR2126 set path to it to PR2126 variable
+#
+# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
+# PROJECT_NAME=jdk
+# REPO_NAME=jdk
+# VERSION=tip
+# or to eg prepare systemtap:
+# icedtea7's jstack and other tapsets
+# VERSION=6327cf1cea9e
+# REPO_NAME=icedtea7-2.6
+# PROJECT_NAME=release
+# OPENJDK_URL=http://icedtea.classpath.org/hg/
+# TO_COMPRESS="*/tapset"
+#
+# They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set)
+
+# This script creates a single source tarball out of the repository
+# based on the given tag and removes code not allowed in fedora/rhel. For
+# consistency, the source tarball will always contain 'openjdk' as the top
+# level folder, name is created, based on parameter
+#
+
+if [ ! "x$PR2126" = "x" ] ; then
+ if [ ! -f "$PR2126" ] ; then
+ echo "You have specified PR2126 as $PR2126 but it does not exists. exiting"
+ exit 1
+ fi
+fi
+
+set -e
+
+OPENJDK_URL_DEFAULT=http://hg.openjdk.java.net
+COMPRESSION_DEFAULT=xz
+
+if [ "x$1" = "xhelp" ] ; then
+ echo -e "Behaviour may be specified by setting the following variables:\n"
+ echo "VERSION - the version of the specified OpenJDK project"
+ echo "PROJECT_NAME -- the name of the OpenJDK project being archived (optional; only needed by defaults)"
+ echo "REPO_NAME - the name of the OpenJDK repository (optional; only needed by defaults)"
+ echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
+ echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
+ echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
+ echo "REPO_ROOT - the location of the Mercurial repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
+ echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
+ echo "PR2126 - the path to the PR2126 patch to apply (optional; downloaded if unavailable)"
+ exit 1;
+fi
+
+
+if [ "x$VERSION" = "x" ] ; then
+ echo "No VERSION specified"
+ exit -2
+fi
+echo "Version: ${VERSION}"
+
+# REPO_NAME is only needed when we default on REPO_ROOT and FILE_NAME_ROOT
+if [ "x$FILE_NAME_ROOT" = "x" -o "x$REPO_ROOT" = "x" ] ; then
+ if [ "x$PROJECT_NAME" = "x" ] ; then
+ echo "No PROJECT_NAME specified"
+ exit -1
+ fi
+ echo "Project name: ${PROJECT_NAME}"
+ if [ "x$REPO_NAME" = "x" ] ; then
+ echo "No REPO_NAME specified"
+ exit -3
+ fi
+ echo "Repository name: ${REPO_NAME}"
+fi
+
+if [ "x$OPENJDK_URL" = "x" ] ; then
+ OPENJDK_URL=${OPENJDK_URL_DEFAULT}
+ echo "No OpenJDK URL specified; defaulting to ${OPENJDK_URL}"
+else
+ echo "OpenJDK URL: ${OPENJDK_URL}"
+fi
+
+if [ "x$COMPRESSION" = "x" ] ; then
+ # rhel 5 needs tar.gz
+ COMPRESSION=${COMPRESSION_DEFAULT}
+fi
+echo "Creating a tar.${COMPRESSION} archive"
+
+if [ "x$FILE_NAME_ROOT" = "x" ] ; then
+ FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
+ echo "No file name root specified; default to ${FILE_NAME_ROOT}"
+fi
+if [ "x$REPO_ROOT" = "x" ] ; then
+ REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}"
+ echo "No repository root specified; default to ${REPO_ROOT}"
+fi;
+
+if [ "x$TO_COMPRESS" = "x" ] ; then
+ TO_COMPRESS="openjdk"
+ echo "No to be compressed targets specified, ; default to ${TO_COMPRESS}"
+fi;
+
+if [ -d ${FILE_NAME_ROOT} ] ; then
+ echo "exists exists exists exists exists exists exists "
+ echo "reusing reusing reusing reusing reusing reusing "
+ echo ${FILE_NAME_ROOT}
+else
+ mkdir "${FILE_NAME_ROOT}"
+ pushd "${FILE_NAME_ROOT}"
+ echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
+ hg clone ${REPO_ROOT} openjdk -r ${VERSION}
+ popd
+fi
+pushd "${FILE_NAME_ROOT}"
+ if [ -d openjdk/src ]; then
+ pushd openjdk
+ echo "Removing EC source code we don't build"
+ CRYPTO_PATH=src/jdk.crypto.ec/share/native/libsunec/impl
+ rm -vrf $CRYPTO_PATH
+ echo "Syncing EC list with NSS"
+ if [ "x$PR2126" = "x" ] ; then
+ # orriginally for 8:
+ # get pr2126.patch (from http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8d2c9a898f50) from most correct tag
+ # Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2126)
+ # there is currnetly no "upstram version of this patch, hardcoding custom version
+ PR2126="../../pr2126-11.patch"
+ fi;
+ echo "Applying ${PR2126}"
+ patch -Np1 < $PR2126
+ find . -name '*.orig' -exec rm -vf '{}' ';'
+ popd
+ fi
+
+ echo "Compressing remaining forest"
+ if [ "X$COMPRESSION" = "Xxz" ] ; then
+ SWITCH=cJf
+ else
+ SWITCH=czf
+ fi
+ tar --exclude-vcs -$SWITCH ${FILE_NAME_ROOT}.tar.${COMPRESSION} $TO_COMPRESS
+ mv ${FILE_NAME_ROOT}.tar.${COMPRESSION} ..
+popd
+echo "Done. You may want to remove the uncompressed version - $FILE_NAME_ROOT."
+
+
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
new file mode 100755
index 0000000..ecbc982
--- /dev/null
+++ b/generate_source_tarball.sh
@@ -0,0 +1,152 @@
+#!/bin/bash
+# Generates the 'source tarball' for JDK 8 projects.
+#
+# Example:
+# When used from local repo set REPO_ROOT pointing to file:// with your repo
+# If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL
+# If you want to use a local copy of patch PR3667, set the path to it in the PR3667 variable
+#
+# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
+# PROJECT_NAME=jdk8u OR aarch64-port
+# REPO_NAME=jdk8u60 OR jdk8u60
+# VERSION=jdk8u60-b27 OR aarch64-jdk8u65-b17 OR for head, keyword 'tip' should do the job there
+#
+# They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set)
+
+# This script creates a single source tarball out of the repository
+# based on the given tag and removes code not allowed in fedora/rhel. For
+# consistency, the source tarball will always contain 'openjdk' as the top
+# level folder, name is created, based on parameter
+#
+
+if [ ! "x$PR3667" = "x" ] ; then
+ if [ ! -f "$PR3667" ] ; then
+ echo "You have specified PR3667 as $PR3667 but it does not exists. exiting"
+ exit 1
+ fi
+fi
+set -e
+
+OPENJDK_URL_DEFAULT=http://hg.openjdk.java.net
+COMPRESSION_DEFAULT=xz
+# jdk is last for its size
+REPOS_DEFAULT="hotspot corba jaxws jaxp langtools nashorn jdk"
+
+if [ "x$1" = "xhelp" ] ; then
+ echo -e "Behaviour may be specified by setting the following variables:\n"
+ echo "VERSION - the version of the specified OpenJDK project"
+ echo "PROJECT_NAME -- the name of the OpenJDK project being archived (optional; only needed by defaults)"
+ echo "REPO_NAME - the name of the OpenJDK repository (optional; only needed by defaults)"
+ echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
+ echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
+ echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
+ echo "REPO_ROOT - the location of the Mercurial repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
+ echo "PR3667 - the path to the PR3667 patch to apply (optional; downloaded if unavailable)"
+ echo "REPOS - specify the repositories to use (optional; defaults to ${REPOS_DEFAULT})"
+ exit 1;
+fi
+
+
+if [ "x$VERSION" = "x" ] ; then
+ echo "No VERSION specified"
+ exit -2
+fi
+echo "Version: ${VERSION}"
+
+# REPO_NAME is only needed when we default on REPO_ROOT and FILE_NAME_ROOT
+if [ "x$FILE_NAME_ROOT" = "x" -o "x$REPO_ROOT" = "x" ] ; then
+ if [ "x$PROJECT_NAME" = "x" ] ; then
+ echo "No PROJECT_NAME specified"
+ exit -1
+ fi
+ echo "Project name: ${PROJECT_NAME}"
+ if [ "x$REPO_NAME" = "x" ] ; then
+ echo "No REPO_NAME specified"
+ exit -3
+ fi
+ echo "Repository name: ${REPO_NAME}"
+fi
+
+if [ "x$OPENJDK_URL" = "x" ] ; then
+ OPENJDK_URL=${OPENJDK_URL_DEFAULT}
+ echo "No OpenJDK URL specified; defaulting to ${OPENJDK_URL}"
+else
+ echo "OpenJDK URL: ${OPENJDK_URL}"
+fi
+
+if [ "x$COMPRESSION" = "x" ] ; then
+# rhel 5 needs tar.gz
+ COMPRESSION=${COMPRESSION_DEFAULT}
+fi
+echo "Creating a tar.${COMPRESSION} archive"
+
+if [ "x$FILE_NAME_ROOT" = "x" ] ; then
+ FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
+ echo "No file name root specified; default to ${FILE_NAME_ROOT}"
+fi
+if [ "x$REPO_ROOT" = "x" ] ; then
+ REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}"
+ echo "No repository root specified; default to ${REPO_ROOT}"
+fi;
+
+mkdir "${FILE_NAME_ROOT}"
+pushd "${FILE_NAME_ROOT}"
+
+echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
+hg clone ${REPO_ROOT} openjdk -r ${VERSION}
+pushd openjdk
+
+
+if [ "x$REPOS" = "x" ] ; then
+ repos=${REPOS_DEFAULT}
+ echo "No repositories specified; defaulting to ${repos}"
+else
+ repos=$REPOS
+ echo "Repositories: ${repos}"
+fi;
+
+for subrepo in $repos
+do
+ echo "Cloning ${VERSION} ${subrepo} repository from ${REPO_ROOT}"
+ hg clone ${REPO_ROOT}/${subrepo} -r ${VERSION}
+done
+
+if [ -d jdk ]; then
+echo "Removing EC source code we don't build"
+rm -vf jdk/src/share/native/sun/security/ec/impl/ec2.h
+rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_163.c
+rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_193.c
+rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_233.c
+rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_aff.c
+rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_mont.c
+rm -vf jdk/src/share/native/sun/security/ec/impl/ecp_192.c
+rm -vf jdk/src/share/native/sun/security/ec/impl/ecp_224.c
+
+echo "Syncing EC list with NSS"
+
+if [ "x$PR3667" = "x" ] ; then
+# get pr3667.patch (from http://icedtea.classpath.org/hg/icedtea8) from most correct tag
+# Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3667)
+ wget http://icedtea.classpath.org/hg/icedtea8/raw-file/tip/patches/pr3667.patch
+ patch -Np1 < pr3667.patch
+ rm pr3667.patch
+else
+ echo "Applying ${PR3667}"
+ patch -Np1 < $PR3667
+fi;
+fi
+find . -name '*.orig' -exec rm -vf '{}' ';'
+
+popd
+echo "Compressing remaining forest"
+if [ "X$COMPRESSION" = "Xxz" ] ; then
+ tar --exclude-vcs -cJf ${FILE_NAME_ROOT}.tar.${COMPRESSION} openjdk
+else
+ tar --exclude-vcs -czf ${FILE_NAME_ROOT}.tar.${COMPRESSION} openjdk
+fi
+
+mv ${FILE_NAME_ROOT}.tar.${COMPRESSION} ..
+popd
+echo "Done. You may want to remove the uncompressed version."
+
+
diff --git a/java-1.8.0-openjdk-aarch32.spec b/java-1.8.0-openjdk-aarch32.spec
index 14e81e7..d8287df 100644
--- a/java-1.8.0-openjdk-aarch32.spec
+++ b/java-1.8.0-openjdk-aarch32.spec
@@ -21,7 +21,11 @@
# Enable release builds by default on relevant arches.
%bcond_without release
-%define _find_debuginfo_opts -g
+# The -g flag says to use strip -g instead of full strip on DSOs or EXEs.
+# This fixes detailed NMT and other tools which need minimal debug info.
+# See: https://bugzilla.redhat.com/show_bug.cgi?id=1520879
+%global _find_debuginfo_opts -g
+
# note: parametrized macros are order-sensitive (unlike not-parametrized) even with normal macros
# also necessary when passing it as parameter to other macros. If not macro, then it is considered a switch
# see the difference between global and define:
@@ -55,6 +59,7 @@
%global ppc64be ppc64 ppc64p7
%global multilib_arches %{power64} sparc64 x86_64
%global jit_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm}
+%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64}
# By default, we build a debug build during main build on JIT architectures
%if %{with slowdebug}
@@ -212,7 +217,7 @@
# links src files
# maybe depend on jfx and generate the lists in build time? Yes, bad idea to inlcude cyclic depndenci, but this list is aweful
%global jfx_jre_libs jfxswt.jar javafx.properties
-%global jfx_jre_native libprism_es2.so libprism_common.so libjavafx_font.so libdecora_sse.so libjavafx_font_freetype.so libprism_sw.so libjavafx_font_pango.so libglass.so libjavafx_iio.so
+%global jfx_jre_native libprism_es2.so libprism_common.so libjavafx_font.so libdecora_sse.so libjavafx_font_freetype.so libprism_sw.so libjavafx_font_pango.so libglass.so libjavafx_iio.so libglassgtk2.so libglassgtk3.so
%global jfx_sdk_libs javafx-mx.jar packager.jar ant-javafx.jar
%global jfx_sdk_bins javafxpackager javapackager
%global jfx_jre_exts jfxrt.jar
@@ -227,11 +232,11 @@
# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
%global shenandoah_project aarch64-port
%global shenandoah_repo jdk8u-shenandoah
-%global shenandoah_revision aarch64-shenandoah-jdk8u191-b12
+%global shenandoah_revision aarch64-shenandoah-jdk8u201-b09
# Define old aarch64/jdk8u tree variables for compatibility
%global project aarch32-port
%global repo jdk8u
-%global revision jdk8u191-b12-aarch32-181022
+%global revision jdk8u201-b09-aarch32-190124
# eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60 (dont forget spec escape % by %%)
%global whole_update %(VERSION=%{revision}; echo ${VERSION%%-*})
@@ -296,7 +301,7 @@ exit 0
# MetaspaceShared::generate_vtable_methods not implemented for PPC JIT
%ifnarch %{power64}
%ifnarch %{arm}
-#see https://bugzilla.redhat.com/show_bug.cgi?id=513605
+# see https://bugzilla.redhat.com/show_bug.cgi?id=513605
%{jrebindir -- %{?1}}/java -Xshare:dump >/dev/null 2>/dev/null
%endif
%endif
@@ -795,7 +800,7 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/ir.idl
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jconsole.jar
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/orb.idl
-%ifarch x86_64 %{ix86}
+%ifarch %{sa_arches}
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/sa-jdi.jar
%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/dt.jar
@@ -881,7 +886,6 @@ Requires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
# for java-X-openjdk package's desktop binding
Recommends: gtk2%{?_isa}
-Suggests: cups
#Provides: java-%{javaver}-%{origin} = %{epoch}:%{version}-%{release}
@@ -912,6 +916,8 @@ Requires: nss-softokn%{?_isa} %{NSSSOFTOKN_BUILDTIME_VERSION}
# considered as regression
Requires: copy-jdk-configs >= 3.3
OrderWithRequires: copy-jdk-configs
+# for printing support
+Requires: cups-libs
# Post requires alternatives to install tool alternatives
Requires(post): %{_sbindir}/alternatives
# in version 1.7 and higher for --family switch
@@ -1011,12 +1017,12 @@ OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release
}
-# Prevent brp-java-repack-jars from being run.
+# Prevent brp-java-repack-jars from being run
%global __jar_repack 0
Name: java-%{javaver}-%{origin}-aarch32
Version: %{javaver}.%{updatever}.%{buildver}
-Release: 2%{?dist}
+Release: 1%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -1052,7 +1058,6 @@ URL: http://openjdk.java.net/
# REPO_ROOT=<path to checked-out repository> generate_source_tarball.sh
# where the source is obtained from http://hg.openjdk.java.net/%%{project}/%%{repo}
Source0: %{project}-%{repo}-%{revision}.tar.xz
-#Source1: {shenandoah_project}-{shenandoah_repo}-{shenandoah_revision}.tar.xz
# Custom README for -src subpackage
Source2: README.md
@@ -1060,7 +1065,7 @@ Source2: README.md
# run update_systemtap.sh to regenerate or update systemtap sources
# update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
-Source8: systemtap-tapset-3.4.0pre01.tar.xz
+Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
# Desktop files. Adapted from IcedTea
Source9: jconsole.desktop.in
@@ -1088,202 +1093,225 @@ Source101: config.sub
#
# RPM/distribution specific patches
#
+# This section includes patches specific to
+# Fedora/RHEL which can not be upstreamed
+# either in their current form or at all.
############################################
# Accessibility patches
# Ignore AWTError when assistive technologies are loaded
-Patch1: java-1.8.0-openjdk-accessible-toolkit.patch
+Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
# Restrict access to java-atk-wrapper classes
-Patch3: java-atk-wrapper-security.patch
-# Support for building the SunEC provider with the system NSS installation
-# PR1983: Support using the system installation of NSS with the SunEC provider
-# PR2127: SunEC provider crashes when built using system NSS
-# PR2815: Race condition in SunEC provider with system NSS
-# PR2899: Don't use WithSeed versions of NSS functions as they don't fully process the seed
-# PR2934: SunEC provider throwing KeyException with current NSS
-# PR3479, RH1486025: ECC and NSS JVM crash
-Patch513: pr1983-jdk.patch
-Patch514: pr1983-root.patch
-Patch515: pr2127.patch
-Patch516: pr2815.patch
-Patch517: pr2899.patch
-Patch518: pr2934.patch
-Patch519: pr3479-rh1486025.patch
-# PR3183, RH1340845: Support Fedora/RHEL8 system crypto policy
-Patch300: pr3183-rh1340845-system-crypto-policy.patch
+Patch3: rh1648644-java_access_bridge_privileged_security.patch
+# PR1834, RH1022017: Reduce curves reported by SSL to those in NSS
+# Not currently suitable to go upstream as it disables curves
+# for all providers unconditionally
+Patch525: pr1834-rh1022017-reduce_ellipticcurvesextension_to_provide_only_three_nss_supported_nist_curves_23_24_25.patch
+# Turn on AssumeMP by default on RHEL systems
+Patch534: rh1648246-always_instruct_vm_to_assume_multiple_processors_are_available.patch
#############################################
#
# Upstreamable patches
#
+# This section includes patches which need to
+# be reviewed & pushed to the current development
+# tree of OpenJDK.
#############################################
# PR2737: Allow multiple initialization of PKCS11 libraries
-Patch5: multiple-pkcs11-library-init.patch
+Patch5: pr2737-allow_multiple_pkcs11_library_initialisation_to_be_a_non_critical_error.patch
# PR2095, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure (sync with IcedTea 2.x)
-Patch504: rh1163501.patch
+Patch504: rh1163501-increase_2048_bit_dh_upper_bound_fedora_infrastructure_in_dhparametergenerator.patch
# Turn off strict overflow on IndicRearrangementProcessor{,2}.cpp following 8140543: Arrange font actions
-Patch512: no_strict_overflow.patch
+Patch512: rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch
# RH1337583, PR2974: PKCS#10 certificate requests now use CRLF line endings rather than system line endings
-Patch523: pr2974-rh1337583.patch
+Patch523: pr2974-rh1337583-add_systemlineendings_option_to_keytool_and_use_line_separator_instead_of_crlf_in_pkcs10.patch
# PR3083, RH1346460: Regression in SSL debug output without an ECC provider
-Patch528: pr3083-rh1346460.patch
+Patch528: pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch
# RH1566890: CVE-2018-3639
-Patch529: rh1566890_embargoed20180521.patch
+Patch529: rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch
# PR3601: Fix additional -Wreturn-type issues introduced by 8061651
-Patch530: pr3601.patch
+Patch530: pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
+# Support for building the SunEC provider with the system NSS installation
+# PR1983: Support using the system installation of NSS with the SunEC provider
+# PR2127: SunEC provider crashes when built using system NSS
+# PR2815: Race condition in SunEC provider with system NSS
+# PR2899: Don't use WithSeed versions of NSS functions as they don't fully process the seed
+# PR2934: SunEC provider throwing KeyException with current NSS
+# PR3479, RH1486025: ECC and NSS JVM crash
+Patch513: pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_jdk8.patch
+Patch514: pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_root8.patch
+Patch515: pr2127-sunec_provider_crashes_when_built_using_system_nss_thus_use_of_nss_memory_management_functions.patch
+Patch516: pr2815-race_condition_in_sunec_provider_with_system_nss_fix.patch
+Patch517: pr2899-dont_use_withseed_versions_of_nss_functions_as_they_dont_fully_process_the_seed.patch
+Patch518: pr2934-sunec_provider_throwing_keyexception_withine.separator_current_nss_thus_initialise_the_random_number_generator_and_feed_the_seed_to_it.patch
+Patch519: pr3479-rh1486025-sunec_provider_can_have_multiple_instances_leading_to_premature_nss_shutdown.patch
+# PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
+Patch539: pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch
+# PR3575, RH1567204: System cacerts database handling should not affect jssecacerts
+Patch540: pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch
+# PR3183, RH1340845: Support Fedora/RHEL8 system crypto policy
+Patch300: pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch
+#############################################
+#
# Arch-specific upstreamable patches
-
+#
+# This section includes patches which need to
+# be reviewed & pushed upstream and are specific
+# to certain architectures. This usually means the
+# current OpenJDK development branch, but may also
+# include other trees e.g. for the AArch64 port for
+# OpenJDK 8u.
+#############################################
# s390: PR3593: Use "%z" for size_t on s390 as size_t != intptr_t
-#Patch103: pr3593-s390-size_t_format_flags.patch
+Patch103: pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_equals_to_int.patch
# x86: S8199936, PR3533: HotSpot generates code with unaligned stack, crashes on SSE operations (-mstackrealign workaround)
-Patch105: 8199936-pr3533-workaround.patch
+Patch105: jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch
# AArch64: PR3519: Fix further functions with a missing return value (AArch64)
-#Patch106: pr3519.patch
+Patch106: pr3519-fix_further_functions_with_a_missing_return_value.patch
+# AArch64: JDK-8160748: [AArch64] Inconsistent types for ideal_reg
+Patch107: jdk8160748-aarch64_ideal_reg.patch
+# AArch64: JDK-8189170: [AArch64] Add option to disable stack overflow checking in primordial thread for use with JNI_CreateJavaJVM
+Patch108: jdk8189170-aarch64_primordial_thread.patch
#############################################
#
# Patches which need backporting to 8u
#
+# This section includes patches which have
+# been pushed upstream to the latest OpenJDK
+# development tree, but need to be backported
+# to OpenJDK 8u.
#############################################
# S8074839, PR2462: Resolve disabled warnings for libunpack and the unpack200 binary
# This fixes printf warnings that lead to build failure with -Werror=format-security from optflags
-Patch502: pr2462.patch
+Patch502: pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binary.patch
# S8154313: Generated javadoc scattered all over the place
-Patch400: 8154313.patch
+Patch400: jdk8154313-generated_javadoc_scattered_all_over_the_place.patch
# 8197429, PR3546, RH153662{2,3}: 32 bit java app started via JNI crashes with larger stack sizes
-Patch561: 8197429-pr3546-rh1536622.patch
+Patch561: jdk8197429-pr3546-rh1536622-increased_stack_guard_causes_segfaults_on_x86_32.patch
# 8171000, PR3542, RH1402819: Robot.createScreenCapture() crashes in wayland mode
-Patch563: 8171000-pr3542-rh1402819.patch
+Patch563: jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch
# 8197546, PR3542, RH1402819: Fix for 8171000 breaks Solaris + Linux builds
-Patch564: 8197546-pr3542-rh1402819.patch
+Patch564: jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch
# PR3559: Use ldrexd for atomic reads on ARMv7.
-Patch567: pr3559.patch
+Patch567: pr3559-use_ldrexd_for_atomic_reads_on_armv7_zero.patch
# PR3591: Fix for bug 3533 doesn't add -mstackrealign to JDK code
-Patch571: pr3591.patch
+Patch571: jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch
# 8184309, PR3596: Build warnings from GCC 7.1 on Fedora 26
-Patch572: 8184309-pr3596.patch
+Patch572: jdk8184309-pr3596-build_warnings_from_gcc_7_1_on_fedora_26.patch
# 8141570, PR3548: Fix Zero interpreter build for --disable-precompiled-headers
-Patch573: 8141570-pr3548.patch
+Patch573: jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch
# 8143245, PR3548: Zero build requires disabled warnings
-Patch574: 8143245-pr3548.patch
+Patch574: jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
# 8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
-Patch575: 8197981-pr3548.patch
+Patch575: jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
# 8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning
-Patch576: 8064786-pr3599.patch
+Patch576: jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch
# 8062808, PR3548: Turn on the -Wreturn-type warning
-Patch577: 8062808-pr3548.patch
+Patch577: jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
# s390: JDK-8203030, Type fixing for s390
-#Patch102: 8203030-size_t-fixes.patch
+Patch102: jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch
+# 8035341: Allow using a system installed libpng
+Patch202: jdk8035341-allow_using_system_installed_libpng.patch
+# 8042159: Allow using a system-installed lcms2
+Patch203: jdk8042159-allow_using_system_installed_lcms2.patch
# 8210761: libjsig is being compiled without optimization
-Patch620: 8210761-rh1630426-jsig-opt-fix.patch
+Patch620: jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch
# 8210647: libsaproc is being compiled without optimization
-Patch621: 8210647-rh1630426-saproc-opt-fix.patch
+Patch621: jdk8210647-rh1632174-libsaproc_is_being_compiled_without_optimization.patch
# 8210416: [linux] Poor StrictMath performance due to non-optimized compilation
-#Patch622: 8210416-rh1630426-strict-math-opt.patch
+Patch622: jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch
# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
# Upstream 8u part.
-Patch623: 8210425-01-rh1630426-hotspot-opt-fix.patch
+Patch623: jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch
# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
# Aarch64-port 8u local part
-#Patch624: 8210425-02-rh1630426-hotspot-opt-fix-aarch64.patch
+Patch624: jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch
# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
# Zero part of the fix for (arm/s390 arches)
-#Patch625: 8210425-03-rh1630426-hotspot-opt-fix-zero.patch
-
-#############################################
-#
-# Patches appearing in 8u192
-#
-#############################################
-# S8031668, PR2842: TOOLCHAIN_FIND_COMPILER unexpectedly resolves symbolic links
-Patch506: 8031668-pr2842-01.patch
-# S8148351, PR2842: Only display resolved symlink for compiler, do not change path
-Patch507: 8148351-pr2842-02.patch
-# S6260348, PR3066: GTK+ L&F JTextComponent not respecting desktop caret blink rate
-Patch526: 6260348-pr3066.patch
-# 8061305, PR3335, RH1423421: Javadoc crashes when method name ends with "Property"
-Patch538: 8061305-pr3335-rh1423421.patch
-# 8188030, PR3459, RH1484079: AWT java apps fail to start when some minimal fonts are present
-Patch560: 8188030-pr3459-rh1484079.patch
-# 8205104, PR3539, RH1548475: Pass EXTRA_LDFLAGS to HotSpot build
-Patch562: 8205104-pr3539-rh1548475.patch
-# 8185723, PR3553: Zero: segfaults on Power PC 32-bit
-Patch565: 8185723-pr3553.patch
-# 8186461, PR3557: Zero's atomic_copy64() should use SPE instructions on linux-powerpcspe
-Patch566: 8186461-pr3557.patch
-# 8201509, PR3579: Zero: S390 31bit atomic_copy64 inline assembler is wrong
-Patch569: 8201509-pr3579.patch
-# 8075942, PR3602: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo
-Patch578: 8075942-pr3602-rh1582032.patch
-# 8203182, PR3603: Release session if initialization of SunPKCS11 Signature fails
-Patch579: 8203182-pr3603-rh1568033.patch
-# 8206406, PR3610, RH1597825: StubCodeDesc constructor publishes partially-constructed objects on StubCodeDesc::_list
-Patch580: 8206406-pr3610-rh1597825.patch
-# Patches 204 and 205 stop the build adding .gnu_debuglink sections to unstripped files
-# 8206425: .gnu_debuglink sections added unconditionally when no debuginfo is stripped
-Patch204: 8206425-hotspot-remove-debuglink.patch
-# 8036003: Add --with-native-debug-symbols=[none|internal|external|zipped]
-Patch205: 8036003-add-with-native-debug-symbols-configure-flag.patch
-# s390: JDK-8201495, PR2415: JVM -Xmx requirement is too high on s390
-#Patch100: 8201495-s390-java-opts.patch
+Patch625: jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch
#############################################
#
# Patches appearing in 8u202
#
+# This section includes patches which are present
+# in the listed OpenJDK 8u release and should be
+# able to be removed once that release is out
+# and used by this RPM.
#############################################
-# S8150954, RH1176206, PR2866: Taking screenshots on x11 composite desktop produces wrong result
-Patch508: 8150954-pr2866-rh1176206-screenshot-xcomposite-jdk.patch
# 8207057, PR3613: Enable debug information for assembly code files
-Patch206: 8207057-pr3613-assembler-debuginfo-hotspot.patch
-Patch207: 8207057-pr3613-assembler-debuginfo-root.patch
+Patch206: jdk8207057-pr3613-no_debug_info_for_assembler_files_hotspot.patch
+Patch207: jdk8207057-pr3613-no_debug_info_for_assembler_files_root.patch
# 8165852, PR3468: (fs) Mount point not found for a file which is present in overlayfs
-Patch210: 8165852-pr3468.patch
+Patch210: jdk8165852-pr3468-mount_point_not_found_for_a_file_which_is_present_in_overlayfs.patch
# S8073139, RH1191652; fix name of ppc64le architecture
-#Patch601: 8073139-rh1191652-root.patch
-#Patch602: 8073139-rh1191652-jdk.patch
-#Patch603: 8073139-rh1191652-hotspot-aarch64.patch
+Patch601: jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch
+Patch602: jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_jdk.patch
+Patch603: jdk8073139-pr2236-rh1191652--use_ppc64le_as_the_arch_directory_on_that_platform_and_report_it_in_os_arch_aarch64_forest.patch
# 8044235: src.zip should include all sources
-Patch7: 8044235-include-all-srcs.patch
+Patch7: jdk8044235-src_zip_should_include_all_sources.patch
+# JDK-8172850, RH1640127: Anti-dependency on membar causes crash in register allocator due to invalid instruction scheduling
+Patch583: jdk8172850-rh1640127-01-register_allocator_crash.patch
+# JDK-8209639, RH1640127: assert failure in coalesce.cpp: attempted to spill a non-spillable item
+Patch584: jdk8209639-rh1640127-02-coalesce_attempted_spill_non_spillable.patch
+# JDK-8131048, PR3574, RH1498936: ppc implement CRC32 intrinsic
+Patch586: jdk8131048-pr3574-rh1498936-ppc_crc32.patch
+# JDK-8164920, PR3574, RH1498936: ppc: enhancement of CRC32 intrinsic
+Patch587: jdk8164920-pr3574-rh1498936-ppc_crc32_enhancement.patch
#############################################
#
-# Patches ineligible for 8u
+# Patches appearing in 8u211
#
+# This section includes patches which are present
+# in the listed OpenJDK 8u release and should be
+# able to be removed once that release is out
+# and used by this RPM.
#############################################
-# 8043805: Allow using a system-installed libjpeg
-Patch201: system-libjpeg.patch
-# 8035341: Allow using a system installed libpng
-Patch202: system-libpng.patch
-# 8042159: Allow using a system-installed lcms2
-Patch203: system-lcms.patch
+# JDK-8029661, PR3642, RH1477159: Support TLS v1.2 algorithm in SunPKCS11 provider
+Patch585: jdk8029661-pr3642-rh1477159-add_tlsv1_2_support_to_pkcs11_provider.patch
+# JDK-8145096, PR3693: Undefined behaviour in HotSpot
+Patch588: jdk8145096-pr3693-undefined_behaviour.patch
#############################################
#
-# Local fixes
+# Patches ineligible for 8u
#
+# This section includes patches which are present
+# upstream, but ineligible for upstream 8u backport.
#############################################
-# PR1834, RH1022017: Reduce curves reported by SSL to those in NSS
-Patch525: pr1834-rh1022017.patch
-# Turn on AssumeMP by default on RHEL systems
-#Patch534: always_assumemp.patch
-# PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
-Patch539: pr2888.patch
-# PR3575, RH1567204: System cacerts database handling should not affect jssecacerts
-Patch540: pr3575-rh1567204.patch
+# 8043805: Allow using a system-installed libjpeg
+Patch201: jdk8043805-allow_using_system_installed_libjpeg.patch
+#############################################
+#
# Shenandoah fixes
+#
+# This section includes patches which are
+# specific to the Shenandoah garbage collector
+# and should be upstreamed to the appropriate
+# trees.
+#############################################
# PR3634: Shenandoah still broken on s390 with aarch64-shenandoah-jdk8u181-b16
-#Patch582: pr3634.patch
+Patch582: pr3634-fix_shenandoah_for_size_t_on_s390.patch
#############################################
#
# Non-OpenJDK fixes
#
+# This section includes patches to code other
+# that from OpenJDK.
#############################################
-Patch1000: enableCommentedOutSystemNss.patch
+Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
+#############################################
+#
+# Dependencies
+#
+#############################################
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: alsa-lib-devel
@@ -1600,8 +1628,6 @@ sh %{SOURCE12}
%patch203
# Debugging fixes
-%patch204
-%patch205
%patch206
%patch207
%patch210
@@ -1614,12 +1640,13 @@ sh %{SOURCE12}
%patch7
# s390 build fixes
-#%patch100
-#%patch102
-#%patch103
+%patch102
+%patch103
# AArch64 fixes
#%patch106
+#%patch107
+#%patch108
# x86 fixes
%patch105
@@ -1632,9 +1659,6 @@ sh %{SOURCE12}
# Upstreamable fixes
%patch502
%patch504
-%patch506
-%patch507
-%patch508
%patch512
%patch513
%patch514
@@ -1645,20 +1669,13 @@ sh %{SOURCE12}
%patch519
%patch400
%patch523
-%patch526
%patch528
%patch529
%patch530
-%patch538
-%patch560
%patch561
-%patch562
%patch563
%patch564
-%patch565
-%patch566
%patch567
-%patch569
%patch571
%patch572
%patch573
@@ -1666,15 +1683,18 @@ sh %{SOURCE12}
%patch575
%patch576
%patch577
-%patch578
-%patch579
-%patch580
%patch620
%patch621
#%patch622
%patch623
#%patch624
-#%patch625
+%patch625
+%patch583
+%patch584
+%patch585
+%patch586
+%patch587
+%patch588
# RPM-only fixes
%patch525
@@ -1800,8 +1820,13 @@ bash ../../configure \
--with-libpng=system \
--with-lcms=system \
--with-stdc++lib=dynamic \
+%ifarch %{ix86}
+ --with-extra-cxxflags="-mstackrealign $EXTRA_CPP_FLAGS" \
+ --with-extra-cflags="-mstackrealign $EXTRA_CFLAGS" \
+%else
--with-extra-cxxflags="$EXTRA_CPP_FLAGS" \
--with-extra-cflags="$EXTRA_CFLAGS" \
+%endif
--with-extra-ldflags="%{ourldflags}" \
--with-num-cores="$NUM_PROC"
@@ -2062,6 +2087,7 @@ find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/demo \
pushd $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/lib/aarch32
ln -s %{_libdir}/java-atk-wrapper/libatk-wrapper.so.0 libatk-wrapper.so
popd
+
pushd $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/lib/ext
ln -s %{_libdir}/java-atk-wrapper/java-atk-wrapper.jar java-atk-wrapper.jar
popd
@@ -2377,8 +2403,9 @@ require "copy_jdk_configs.lua"
%endif
%changelog
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.8.0.191.181022-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+* Tue Feb 12 2019 Alex Kashchenko <akashche(a)redhat.com> - 1:1.8.0.201-1.190124
+- update sources to 8u201
+- sync with mainline package
* Tue Oct 30 2018 Alex Kashchenko <akashche(a)redhat.com> - 1:1.8.0.191-1.181022
- update sources to 8u191
diff --git a/java-1.8.0-openjdk-accessible-toolkit.patch b/java-1.8.0-openjdk-accessible-toolkit.patch
deleted file mode 100644
index bddd702..0000000
--- a/java-1.8.0-openjdk-accessible-toolkit.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -uNr openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java jdk8/jdk/src/share/classes/java/awt/Toolkit.java
---- openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 11:59:47.000000000 -0500
-+++ jdk8/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 12:05:20.000000000 -0500
-@@ -883,7 +883,11 @@
- return null;
- }
- });
-- loadAssistiveTechnologies();
-+ try {
-+ loadAssistiveTechnologies();
-+ } catch ( AWTError error) {
-+ // ignore silently
-+ }
- }
- return toolkit;
- }
diff --git a/java-1.8.0-openjdk-remove-intree-libraries.sh b/java-1.8.0-openjdk-remove-intree-libraries.sh
index 879d462..b52d016 100644
--- a/java-1.8.0-openjdk-remove-intree-libraries.sh
+++ b/java-1.8.0-openjdk-remove-intree-libraries.sh
@@ -99,6 +99,7 @@ if [ ! -d ${LCMS_SRC} ]; then
fi
# temporary change to move bundled LCMS
if [ ! true ]; then
+rm -vf ${LCMS_SRC}/cmsalpha.c
rm -vf ${LCMS_SRC}/cmscam02.c
rm -vf ${LCMS_SRC}/cmscgats.c
rm -vf ${LCMS_SRC}/cmscnvrt.c
@@ -128,3 +129,10 @@ rm -vf ${LCMS_SRC}/lcms2.h
rm -vf ${LCMS_SRC}/lcms2_internal.h
rm -vf ${LCMS_SRC}/lcms2_plugin.h
fi
+
+# Get rid of in-tree SunEC until RH1656676 is implemented
+echo "Removing SunEC native code"
+mv -v openjdk/jdk/src/share/native/sun/security/ec/impl/ecc_impl.h .
+rm -vrf openjdk/jdk/src/share/native/sun/security/ec/impl
+mkdir openjdk/jdk/src/share/native/sun/security/ec/impl
+mv -v ecc_impl.h openjdk/jdk/src/share/native/sun/security/ec/impl
diff --git a/java-atk-wrapper-security.patch b/java-atk-wrapper-security.patch
deleted file mode 100644
index 538468a..0000000
--- a/java-atk-wrapper-security.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- jdk8/jdk/src/share/lib/security/java.security-linux.orig
-+++ jdk8/jdk/src/share/lib/security/java.security-linux
-@@ -223,7 +223,9 @@
- jdk.nashorn.internal.,\
- jdk.nashorn.tools.,\
- jdk.xml.internal.,\
-- com.sun.activation.registries.
-+ com.sun.activation.registries.,\
-+ org.GNOME.Accessibility.,\
-+ org.GNOME.Bonobo.
-
- #
- # List of comma-separated packages that start with or equal this string
-@@ -273,7 +275,9 @@
- jdk.nashorn.internal.,\
- jdk.nashorn.tools.,\
- jdk.xml.internal.,\
-- com.sun.activation.registries.
-+ com.sun.activation.registries.,\
-+ org.GNOME.Accessibility.,\
-+ org.GNOME.Bonobo.
-
- #
- # Determines whether this properties file can be appended to
diff --git a/jdk8029661-pr3642-rh1477159-add_tlsv1_2_support_to_pkcs11_provider.patch b/jdk8029661-pr3642-rh1477159-add_tlsv1_2_support_to_pkcs11_provider.patch
new file mode 100644
index 0000000..f7a816a
--- /dev/null
+++ b/jdk8029661-pr3642-rh1477159-add_tlsv1_2_support_to_pkcs11_provider.patch
@@ -0,0 +1,2269 @@
+# HG changeset patch
+# User mbalao
+# Date 1541016287 10800
+# Wed Oct 31 17:04:47 2018 -0300
+# Node ID fa06cdb4c6f7b5ca148f26d345090d48014fecff
+# Parent 478a4add975beb90696a4ead5f8fcd9c17fc1a83
+8029661, PR3642, RH1477159: Support TLS v1.2 algorithm in SunPKCS11 provider
+Summary: TLS v1.2 algorithms for key and MAC derivation added to SunPKCS11 crypto provider. 8210912 fix is included as part of this changeset.
+Reviewed-by: valeriep
+
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 2018, 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
+@@ -95,9 +95,9 @@
+ throw new InvalidAlgorithmParameterException("init() failed", e);
+ }
+ version = (spec.getMajorVersion() << 8) | spec.getMinorVersion();
+- if ((version < 0x0300) && (version > 0x0302)) {
+- throw new InvalidAlgorithmParameterException
+- ("Only SSL 3.0, TLS 1.0, and TLS 1.1 are supported");
++ if ((version < 0x0300) && (version > 0x0303)) {
++ throw new InvalidAlgorithmParameterException("Only SSL 3.0," +
++ " TLS 1.0, TLS 1.1, and TLS 1.2 are supported");
+ }
+ // we assume the token supports both the CKM_SSL3_* and the CKM_TLS_*
+ // mechanisms
+@@ -112,8 +112,11 @@
+ throw new IllegalStateException
+ ("TlsKeyMaterialGenerator must be initialized");
+ }
+- mechanism = (version == 0x0300) ? CKM_SSL3_KEY_AND_MAC_DERIVE
+- : CKM_TLS_KEY_AND_MAC_DERIVE;
++ if (version == 0x0300) {
++ mechanism = CKM_SSL3_KEY_AND_MAC_DERIVE;
++ } else if (version == 0x0301 || version == 0x0302) {
++ mechanism = CKM_TLS_KEY_AND_MAC_DERIVE;
++ }
+ int macBits = spec.getMacKeyLength() << 3;
+ int ivBits = spec.getIvLength() << 3;
+
+@@ -129,8 +132,18 @@
+
+ CK_SSL3_RANDOM_DATA random = new CK_SSL3_RANDOM_DATA
+ (spec.getClientRandom(), spec.getServerRandom());
+- CK_SSL3_KEY_MAT_PARAMS params = new CK_SSL3_KEY_MAT_PARAMS
+- (macBits, keyBits, ivBits, isExportable, random);
++ Object params = null;
++ CK_MECHANISM ckMechanism = null;
++ if (version < 0x0303) {
++ params = new CK_SSL3_KEY_MAT_PARAMS
++ (macBits, keyBits, ivBits, isExportable, random);
++ ckMechanism = new CK_MECHANISM(mechanism, (CK_SSL3_KEY_MAT_PARAMS)params);
++ } else if (version == 0x0303) {
++ params = new CK_TLS12_KEY_MAT_PARAMS
++ (macBits, keyBits, ivBits, isExportable, random,
++ Functions.getHashMechId(spec.getPRFHashAlg()));
++ ckMechanism = new CK_MECHANISM(mechanism, (CK_TLS12_KEY_MAT_PARAMS)params);
++ }
+
+ String cipherAlgorithm = spec.getCipherAlgorithm();
+ long keyType = P11SecretKeyFactory.getKeyType(cipherAlgorithm);
+@@ -162,9 +175,14 @@
+ (O_GENERATE, CKO_SECRET_KEY, keyType, attributes);
+ // the returned keyID is a dummy, ignore
+ long keyID = token.p11.C_DeriveKey(session.id(),
+- new CK_MECHANISM(mechanism, params), p11Key.keyID, attributes);
++ ckMechanism, p11Key.keyID, attributes);
+
+- CK_SSL3_KEY_MAT_OUT out = params.pReturnedKeyMaterial;
++ CK_SSL3_KEY_MAT_OUT out = null;
++ if (params instanceof CK_SSL3_KEY_MAT_PARAMS) {
++ out = ((CK_SSL3_KEY_MAT_PARAMS)params).pReturnedKeyMaterial;
++ } else if (params instanceof CK_TLS12_KEY_MAT_PARAMS) {
++ out = ((CK_TLS12_KEY_MAT_PARAMS)params).pReturnedKeyMaterial;
++ }
+ // Note that the MAC keys do not inherit all attributes from the
+ // template, but they do inherit the sensitive/extractable/token
+ // flags, which is all P11Key cares about.
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 2018, 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
+@@ -89,9 +89,9 @@
+ throw new InvalidAlgorithmParameterException("init() failed", e);
+ }
+ version = (spec.getMajorVersion() << 8) | spec.getMinorVersion();
+- if ((version < 0x0300) || (version > 0x0302)) {
+- throw new InvalidAlgorithmParameterException
+- ("Only SSL 3.0, TLS 1.0, and TLS 1.1 supported");
++ if ((version < 0x0300) && (version > 0x0303)) {
++ throw new InvalidAlgorithmParameterException("Only SSL 3.0," +
++ " TLS 1.0, TLS 1.1, and TLS 1.2 are supported");
+ }
+ // We assume the token supports the required mechanism. If it does not,
+ // generateKey() will fail and the failover should take care of us.
+@@ -106,10 +106,20 @@
+ throw new IllegalStateException
+ ("TlsMasterSecretGenerator must be initialized");
+ }
++ final boolean isTlsRsaPremasterSecret =
++ p11Key.getAlgorithm().equals("TlsRsaPremasterSecret");
++ if (version == 0x0300) {
++ mechanism = isTlsRsaPremasterSecret ?
++ CKM_SSL3_MASTER_KEY_DERIVE : CKM_SSL3_MASTER_KEY_DERIVE_DH;
++ } else if (version == 0x0301 || version == 0x0302) {
++ mechanism = isTlsRsaPremasterSecret ?
++ CKM_TLS_MASTER_KEY_DERIVE : CKM_TLS_MASTER_KEY_DERIVE_DH;
++ } else if (version == 0x0303) {
++ mechanism = isTlsRsaPremasterSecret ?
++ CKM_TLS12_MASTER_KEY_DERIVE : CKM_TLS12_MASTER_KEY_DERIVE_DH;
++ }
+ CK_VERSION ckVersion;
+- if (p11Key.getAlgorithm().equals("TlsRsaPremasterSecret")) {
+- mechanism = (version == 0x0300) ? CKM_SSL3_MASTER_KEY_DERIVE
+- : CKM_TLS_MASTER_KEY_DERIVE;
++ if (isTlsRsaPremasterSecret) {
+ ckVersion = new CK_VERSION(0, 0);
+ } else {
+ // Note: we use DH for all non-RSA premaster secrets. That includes
+@@ -118,16 +128,23 @@
+ // TLS PRF (or the SSL equivalent).
+ // The only thing special about RSA master secret calculation is
+ // that it extracts the version numbers from the premaster secret.
+- mechanism = (version == 0x0300) ? CKM_SSL3_MASTER_KEY_DERIVE_DH
+- : CKM_TLS_MASTER_KEY_DERIVE_DH;
+ ckVersion = null;
+ }
+ byte[] clientRandom = spec.getClientRandom();
+ byte[] serverRandom = spec.getServerRandom();
+ CK_SSL3_RANDOM_DATA random =
+ new CK_SSL3_RANDOM_DATA(clientRandom, serverRandom);
+- CK_SSL3_MASTER_KEY_DERIVE_PARAMS params =
+- new CK_SSL3_MASTER_KEY_DERIVE_PARAMS(random, ckVersion);
++ CK_MECHANISM ckMechanism = null;
++ if (version < 0x0303) {
++ CK_SSL3_MASTER_KEY_DERIVE_PARAMS params =
++ new CK_SSL3_MASTER_KEY_DERIVE_PARAMS(random, ckVersion);
++ ckMechanism = new CK_MECHANISM(mechanism, params);
++ } else if (version == 0x0303) {
++ CK_TLS12_MASTER_KEY_DERIVE_PARAMS params =
++ new CK_TLS12_MASTER_KEY_DERIVE_PARAMS(random, ckVersion,
++ Functions.getHashMechId(spec.getPRFHashAlg()));
++ ckMechanism = new CK_MECHANISM(mechanism, params);
++ }
+
+ Session session = null;
+ try {
+@@ -135,9 +152,8 @@
+ CK_ATTRIBUTE[] attributes = token.getAttributes(O_GENERATE,
+ CKO_SECRET_KEY, CKK_GENERIC_SECRET, new CK_ATTRIBUTE[0]);
+ long keyID = token.p11.C_DeriveKey(session.id(),
+- new CK_MECHANISM(mechanism, params), p11Key.keyID, attributes);
++ ckMechanism, p11Key.keyID, attributes);
+ int major, minor;
+- ckVersion = params.pVersion;
+ if (ckVersion == null) {
+ major = -1;
+ minor = -1;
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 2018, 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
+@@ -124,8 +124,46 @@
+ if (spec == null) {
+ throw new IllegalStateException("TlsPrfGenerator must be initialized");
+ }
++ byte[] seed = spec.getSeed();
++
++ // TLS 1.2
++ if (mechanism == CKM_TLS_MAC) {
++ SecretKey k = null;
++ int ulServerOrClient = 0;
++ if (spec.getLabel().equals("server finished")) {
++ ulServerOrClient = 1;
++ }
++ if (spec.getLabel().equals("client finished")) {
++ ulServerOrClient = 2;
++ }
++
++ if (ulServerOrClient != 0) {
++ // Finished message
++ CK_TLS_MAC_PARAMS params = new CK_TLS_MAC_PARAMS(
++ Functions.getHashMechId(spec.getPRFHashAlg()),
++ spec.getOutputLength(), ulServerOrClient);
++ Session session = null;
++ try {
++ session = token.getOpSession();
++ token.p11.C_SignInit(session.id(),
++ new CK_MECHANISM(mechanism, params), p11Key.keyID);
++ token.p11.C_SignUpdate(session.id(), 0, seed, 0, seed.length);
++ byte[] out = token.p11.C_SignFinal
++ (session.id(), spec.getOutputLength());
++ k = new SecretKeySpec(out, "TlsPrf");
++ } catch (PKCS11Exception e) {
++ throw new ProviderException("Could not calculate PRF", e);
++ } finally {
++ token.releaseSession(session);
++ }
++ } else {
++ throw new ProviderException("Only Finished message authentication code"+
++ " generation supported for TLS 1.2.");
++ }
++ return k;
++ }
++
+ byte[] label = P11Util.getBytesUTF8(spec.getLabel());
+- byte[] seed = spec.getSeed();
+
+ if (mechanism == CKM_NSS_TLS_PRF_GENERAL) {
+ Session session = null;
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 2018, 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
+@@ -57,6 +57,8 @@
+ // mechanism id
+ private long mechanism;
+
++ private int version;
++
+ private TlsRsaPremasterSecretParameterSpec spec;
+
+ P11TlsRsaPremasterSecretGenerator(Token token, String algorithm, long mechanism)
+@@ -77,6 +79,11 @@
+ throw new InvalidAlgorithmParameterException(MSG);
+ }
+ this.spec = (TlsRsaPremasterSecretParameterSpec)params;
++ version = (spec.getMajorVersion() << 8) | spec.getMinorVersion();
++ if ((version < 0x0300) && (version > 0x0303)) {
++ throw new InvalidAlgorithmParameterException
++ ("Only SSL 3.0, TLS 1.0, TLS 1.1, and TLS 1.2 are supported");
++ }
+ }
+
+ protected void engineInit(int keysize, SecureRandom random) {
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java openjdk/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, 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
+@@ -720,38 +720,28 @@
+ s("1.2.840.113549.1.1.13", "OID.1.2.840.113549.1.1.13"),
+ m(CKM_SHA512_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
+
+- /*
+- * TLS 1.2 uses a different hash algorithm than 1.0/1.1 for the
+- * PRF calculations. As of 2010, there is no PKCS11-level
+- * support for TLS 1.2 PRF calculations, and no known OS's have
+- * an internal variant we could use. Therefore for TLS 1.2, we
+- * are updating JSSE to request different provider algorithms
+- * (e.g. "SunTls12Prf"), and currently only SunJCE has these
+- * TLS 1.2 algorithms.
+- *
+- * If we reused the names such as "SunTlsPrf", the PKCS11
+- * providers would need be updated to fail correctly when
+- * presented with the wrong version number (via
+- * Provider.Service.supportsParameters()), and we would also
+- * need to add the appropriate supportsParamters() checks into
+- * KeyGenerators (not currently there).
+- *
+- * In the future, if PKCS11 support is added, we will restructure
+- * this.
+- */
+ d(KG, "SunTlsRsaPremasterSecret",
+ "sun.security.pkcs11.P11TlsRsaPremasterSecretGenerator",
++ s("SunTls12RsaPremasterSecret"),
+ m(CKM_SSL3_PRE_MASTER_KEY_GEN, CKM_TLS_PRE_MASTER_KEY_GEN));
+ d(KG, "SunTlsMasterSecret",
+ "sun.security.pkcs11.P11TlsMasterSecretGenerator",
+ m(CKM_SSL3_MASTER_KEY_DERIVE, CKM_TLS_MASTER_KEY_DERIVE,
+ CKM_SSL3_MASTER_KEY_DERIVE_DH,
+ CKM_TLS_MASTER_KEY_DERIVE_DH));
++ d(KG, "SunTls12MasterSecret",
++ "sun.security.pkcs11.P11TlsMasterSecretGenerator",
++ m(CKM_TLS12_MASTER_KEY_DERIVE, CKM_TLS12_MASTER_KEY_DERIVE_DH));
+ d(KG, "SunTlsKeyMaterial",
+ "sun.security.pkcs11.P11TlsKeyMaterialGenerator",
+ m(CKM_SSL3_KEY_AND_MAC_DERIVE, CKM_TLS_KEY_AND_MAC_DERIVE));
++ d(KG, "SunTls12KeyMaterial",
++ "sun.security.pkcs11.P11TlsKeyMaterialGenerator",
++ m(CKM_TLS12_KEY_AND_MAC_DERIVE));
+ d(KG, "SunTlsPrf", "sun.security.pkcs11.P11TlsPrfGenerator",
+ m(CKM_TLS_PRF, CKM_NSS_TLS_PRF_GENERAL));
++ d(KG, "SunTls12Prf", "sun.security.pkcs11.P11TlsPrfGenerator",
++ m(CKM_TLS_MAC));
+ }
+
+ // background thread that periodically checks for token insertion
+@@ -1016,13 +1006,16 @@
+ if (algorithm == "SunTlsRsaPremasterSecret") {
+ return new P11TlsRsaPremasterSecretGenerator(
+ token, algorithm, mechanism);
+- } else if (algorithm == "SunTlsMasterSecret") {
++ } else if (algorithm == "SunTlsMasterSecret"
++ || algorithm == "SunTls12MasterSecret") {
+ return new P11TlsMasterSecretGenerator(
+ token, algorithm, mechanism);
+- } else if (algorithm == "SunTlsKeyMaterial") {
++ } else if (algorithm == "SunTlsKeyMaterial"
++ || algorithm == "SunTls12KeyMaterial") {
+ return new P11TlsKeyMaterialGenerator(
+ token, algorithm, mechanism);
+- } else if (algorithm == "SunTlsPrf") {
++ } else if (algorithm == "SunTlsPrf"
++ || algorithm == "SunTls12Prf") {
+ return new P11TlsPrfGenerator(token, algorithm, mechanism);
+ } else {
+ return new P11KeyGenerator(token, algorithm, mechanism);
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+
+ /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
+@@ -112,14 +112,26 @@
+ init(mechanism, params);
+ }
+
++ public CK_MECHANISM(long mechanism, CK_TLS12_MASTER_KEY_DERIVE_PARAMS params) {
++ init(mechanism, params);
++ }
++
+ public CK_MECHANISM(long mechanism, CK_SSL3_KEY_MAT_PARAMS params) {
+ init(mechanism, params);
+ }
+
++ public CK_MECHANISM(long mechanism, CK_TLS12_KEY_MAT_PARAMS params) {
++ init(mechanism, params);
++ }
++
+ public CK_MECHANISM(long mechanism, CK_TLS_PRF_PARAMS params) {
+ init(mechanism, params);
+ }
+
++ public CK_MECHANISM(long mechanism, CK_TLS_MAC_PARAMS params) {
++ init(mechanism, params);
++ }
++
+ public CK_MECHANISM(long mechanism, CK_ECDH1_DERIVE_PARAMS params) {
+ init(mechanism, params);
+ }
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS12_KEY_MAT_PARAMS.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS12_KEY_MAT_PARAMS.java
+new file mode 100644
+--- /dev/null
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS12_KEY_MAT_PARAMS.java
+@@ -0,0 +1,151 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ */
++
++package sun.security.pkcs11.wrapper;
++
++/**
++ * CK_TLS12_KEY_MAT_PARAMS from PKCS#11 v2.40.
++ */
++public class CK_TLS12_KEY_MAT_PARAMS {
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_ULONG ulMacSizeInBits;
++ * </PRE>
++ */
++ public long ulMacSizeInBits;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_ULONG ulKeySizeInBits;
++ * </PRE>
++ */
++ public long ulKeySizeInBits;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_ULONG ulIVSizeInBits;
++ * </PRE>
++ */
++ public long ulIVSizeInBits;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_BBOOL bIsExport;
++ * </PRE>
++ */
++ public boolean bIsExport;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_SSL3_RANDOM_DATA RandomInfo;
++ * </PRE>
++ */
++ public CK_SSL3_RANDOM_DATA RandomInfo;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_SSL3_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
++ * </PRE>
++ */
++ public CK_SSL3_KEY_MAT_OUT pReturnedKeyMaterial;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_MECHANISM_TYPE prfHashMechanism;
++ * </PRE>
++ */
++ public long prfHashMechanism;
++
++ public CK_TLS12_KEY_MAT_PARAMS(
++ int macSize, int keySize, int ivSize, boolean export,
++ CK_SSL3_RANDOM_DATA random, long prfHashMechanism) {
++ ulMacSizeInBits = macSize;
++ ulKeySizeInBits = keySize;
++ ulIVSizeInBits = ivSize;
++ bIsExport = export;
++ RandomInfo = random;
++ pReturnedKeyMaterial = new CK_SSL3_KEY_MAT_OUT();
++ if (ivSize != 0) {
++ int n = ivSize >> 3;
++ pReturnedKeyMaterial.pIVClient = new byte[n];
++ pReturnedKeyMaterial.pIVServer = new byte[n];
++ }
++ this.prfHashMechanism = prfHashMechanism;
++ }
++
++ /**
++ * Returns the string representation of CK_TLS12_KEY_MAT_PARAMS.
++ *
++ * @return the string representation of CK_TLS12_KEY_MAT_PARAMS
++ */
++ public String toString() {
++ StringBuilder buffer = new StringBuilder();
++
++ buffer.append(Constants.INDENT);
++ buffer.append("ulMacSizeInBits: ");
++ buffer.append(ulMacSizeInBits);
++ buffer.append(Constants.NEWLINE);
++
++ buffer.append(Constants.INDENT);
++ buffer.append("ulKeySizeInBits: ");
++ buffer.append(ulKeySizeInBits);
++ buffer.append(Constants.NEWLINE);
++
++ buffer.append(Constants.INDENT);
++ buffer.append("ulIVSizeInBits: ");
++ buffer.append(ulIVSizeInBits);
++ buffer.append(Constants.NEWLINE);
++
++ buffer.append(Constants.INDENT);
++ buffer.append("bIsExport: ");
++ buffer.append(bIsExport);
++ buffer.append(Constants.NEWLINE);
++
++ buffer.append(Constants.INDENT);
++ buffer.append("RandomInfo: ");
++ buffer.append(RandomInfo);
++ buffer.append(Constants.NEWLINE);
++
++ buffer.append(Constants.INDENT);
++ buffer.append("pReturnedKeyMaterial: ");
++ buffer.append(pReturnedKeyMaterial);
++ buffer.append(Constants.NEWLINE);
++
++ buffer.append(Constants.INDENT);
++ buffer.append("prfHashMechanism: ");
++ buffer.append(prfHashMechanism);
++
++ return buffer.toString();
++ }
++
++}
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS12_MASTER_KEY_DERIVE_PARAMS.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS12_MASTER_KEY_DERIVE_PARAMS.java
+new file mode 100644
+--- /dev/null
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS12_MASTER_KEY_DERIVE_PARAMS.java
+@@ -0,0 +1,65 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ */
++
++package sun.security.pkcs11.wrapper;
++
++/**
++ * CK_TLS12_MASTER_KEY_DERIVE_PARAMS from PKCS#11 v2.40.
++ */
++public class CK_TLS12_MASTER_KEY_DERIVE_PARAMS {
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_SSL3_RANDOM_DATA RandomInfo;
++ * </PRE>
++ */
++ public CK_SSL3_RANDOM_DATA RandomInfo;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_VERSION_PTR pVersion;
++ * </PRE>
++ */
++ public CK_VERSION pVersion;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_MECHANISM_TYPE prfHashMechanism;
++ * </PRE>
++ */
++ public long prfHashMechanism;
++
++ public CK_TLS12_MASTER_KEY_DERIVE_PARAMS(
++ CK_SSL3_RANDOM_DATA random, CK_VERSION version,
++ long prfHashMechanism) {
++ RandomInfo = random;
++ pVersion = version;
++ this.prfHashMechanism = prfHashMechanism;
++ }
++
++}
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS_MAC_PARAMS.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS_MAC_PARAMS.java
+new file mode 100644
+--- /dev/null
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS_MAC_PARAMS.java
+@@ -0,0 +1,64 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ */
++
++package sun.security.pkcs11.wrapper;
++
++/**
++ * CK_TLS_MAC_PARAMS from PKCS#11 v2.40.
++ */
++public class CK_TLS_MAC_PARAMS {
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_MECHANISM_TYPE prfMechanism;
++ * </PRE>
++ */
++ public long prfMechanism;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_ULONG ulMacLength;
++ * </PRE>
++ */
++ public long ulMacLength;
++
++ /**
++ * <B>PKCS#11:</B>
++ * <PRE>
++ * CK_ULONG ulServerOrClient;
++ * </PRE>
++ */
++ public long ulServerOrClient;
++
++ public CK_TLS_MAC_PARAMS(long prfMechanism,
++ long ulMacLength, long ulServerOrClient) {
++ this.prfMechanism = prfMechanism;
++ this.ulMacLength = ulMacLength;
++ this.ulServerOrClient = ulServerOrClient;
++ }
++
++}
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/Functions.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/Functions.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/Functions.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/Functions.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+
+ /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
+@@ -73,6 +73,9 @@
+ private static final Map<String,Integer> mechIds =
+ new HashMap<String,Integer>();
+
++ private static final Map<String, Long> hashMechIds =
++ new HashMap<String, Long>();
++
+ // key types (CKK_*)
+ private static final Map<Integer,String> keyNames =
+ new HashMap<Integer,String>();
+@@ -94,7 +97,6 @@
+ private static final Map<String,Integer> objectClassIds =
+ new HashMap<String,Integer>();
+
+-
+ /**
+ * For converting numbers to their hex presentation.
+ */
+@@ -444,6 +446,10 @@
+ return getId(objectClassIds, name);
+ }
+
++ public static long getHashMechId(String name) {
++ return hashMechIds.get(name);
++ }
++
+ /**
+ * Check the given arrays for equalitiy. This method considers both arrays as
+ * equal, if both are <code>null</code> or both have the same length and
+@@ -589,6 +595,10 @@
+ addMapping(objectClassNames, objectClassIds, id, name);
+ }
+
++ private static void addHashMech(long id, String name) {
++ hashMechIds.put(name, id);
++ }
++
+ static {
+ addMech(CKM_RSA_PKCS_KEY_PAIR_GEN, "CKM_RSA_PKCS_KEY_PAIR_GEN");
+ addMech(CKM_RSA_PKCS, "CKM_RSA_PKCS");
+@@ -719,6 +729,10 @@
+ addMech(CKM_TLS_PRF, "CKM_TLS_PRF");
+ addMech(CKM_SSL3_MD5_MAC, "CKM_SSL3_MD5_MAC");
+ addMech(CKM_SSL3_SHA1_MAC, "CKM_SSL3_SHA1_MAC");
++ addMech(CKM_TLS12_MASTER_KEY_DERIVE, "CKM_TLS12_MASTER_KEY_DERIVE");
++ addMech(CKM_TLS12_KEY_AND_MAC_DERIVE, "CKM_TLS12_KEY_AND_MAC_DERIVE");
++ addMech(CKM_TLS12_MASTER_KEY_DERIVE_DH, "CKM_TLS12_MASTER_KEY_DERIVE_DH");
++ addMech(CKM_TLS_MAC, "CKM_TLS_MAC");
+ addMech(CKM_MD5_KEY_DERIVATION, "CKM_MD5_KEY_DERIVATION");
+ addMech(CKM_MD2_KEY_DERIVATION, "CKM_MD2_KEY_DERIVATION");
+ addMech(CKM_SHA1_KEY_DERIVATION, "CKM_SHA1_KEY_DERIVATION");
+@@ -794,6 +808,12 @@
+ addMech(PCKM_SECURERANDOM, "SecureRandom");
+ addMech(PCKM_KEYSTORE, "KeyStore");
+
++ addHashMech(CKM_SHA_1, "SHA-1");
++ addHashMech(CKM_SHA224, "SHA-224");
++ addHashMech(CKM_SHA256, "SHA-256");
++ addHashMech(CKM_SHA384, "SHA-384");
++ addHashMech(CKM_SHA512, "SHA-512");
++
+ addKeyType(CKK_RSA, "CKK_RSA");
+ addKeyType(CKK_DSA, "CKK_DSA");
+ addKeyType(CKK_DH, "CKK_DH");
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+
+ /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
+@@ -625,6 +625,14 @@
+ public static final long CKM_PKCS5_PBKD2 = 0x000003B0L;
+
+ public static final long CKM_PBA_SHA1_WITH_SHA1_HMAC = 0x000003C0L;
++
++ /* CKM_TLS12_MASTER_KEY_DERIVE, CKM_TLS12_KEY_AND_MAC_DERIVE,
++ * CKM_TLS12_MASTER_KEY_DERIVE_DH and CKM_TLS_MAC are new for v2.40 */
++ public static final long CKM_TLS12_MASTER_KEY_DERIVE = 0x000003E0L;
++ public static final long CKM_TLS12_KEY_AND_MAC_DERIVE = 0x000003E1L;
++ public static final long CKM_TLS12_MASTER_KEY_DERIVE_DH = 0x000003E2L;
++ public static final long CKM_TLS_MAC = 0x000003E4L;
++
+ public static final long CKM_KEY_WRAP_LYNKS = 0x00000400L;
+ public static final long CKM_KEY_WRAP_SET_OAEP = 0x00000401L;
+
+diff --git openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
+--- openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
++++ openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+
+ /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
+@@ -457,67 +457,113 @@
+ return ckAttribute ;
+ }
+
+-/*
+- * converts the Java CK_SSL3_MASTER_KEY_DERIVE_PARAMS object to a
+- * CK_SSL3_MASTER_KEY_DERIVE_PARAMS structure
+- *
+- * @param env - used to call JNI funktions to get the Java classes and objects
+- * @param jParam - the Java CK_SSL3_MASTER_KEY_DERIVE_PARAMS object to convert
+- * @return - the new CK_SSL3_MASTER_KEY_DERIVE_PARAMS structure
+- */
+-CK_SSL3_MASTER_KEY_DERIVE_PARAMS jSsl3MasterKeyDeriveParamToCKSsl3MasterKeyDeriveParam(JNIEnv *env, jobject jParam)
+-{
+- // XXX don't return structs
+- // XXX prefetch class and field ids
+- jclass jSsl3MasterKeyDeriveParamsClass;
+- CK_SSL3_MASTER_KEY_DERIVE_PARAMS ckParam;
++void masterKeyDeriveParamToCKMasterKeyDeriveParam(JNIEnv *env, jobject jParam,
++ jclass masterKeyDeriveParamClass,
++ CK_VERSION_PTR* cKMasterKeyDeriveParamVersion,
++ CK_SSL3_RANDOM_DATA* cKMasterKeyDeriveParamRandomInfo) {
+ jfieldID fieldID;
+ jclass jSsl3RandomDataClass;
+ jobject jRandomInfo, jRIClientRandom, jRIServerRandom, jVersion;
+- memset(&ckParam, 0, sizeof(CK_SSL3_MASTER_KEY_DERIVE_PARAMS));
+
+ /* get RandomInfo */
+- jSsl3MasterKeyDeriveParamsClass = (*env)->FindClass(env, CLASS_SSL3_MASTER_KEY_DERIVE_PARAMS);
+- if (jSsl3MasterKeyDeriveParamsClass == NULL) { return ckParam; }
+- fieldID = (*env)->GetFieldID(env, jSsl3MasterKeyDeriveParamsClass, "RandomInfo", "Lsun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA;");
+- if (fieldID == NULL) { return ckParam; }
++ fieldID = (*env)->GetFieldID(env, masterKeyDeriveParamClass, "RandomInfo",
++ "Lsun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA;");
++ if (fieldID == NULL) { return; }
+ jRandomInfo = (*env)->GetObjectField(env, jParam, fieldID);
+
+ /* get pClientRandom and ulClientRandomLength out of RandomInfo */
+ jSsl3RandomDataClass = (*env)->FindClass(env, CLASS_SSL3_RANDOM_DATA);
+- if (jSsl3RandomDataClass == NULL) { return ckParam; }
++ if (jSsl3RandomDataClass == NULL) { return; }
+ fieldID = (*env)->GetFieldID(env, jSsl3RandomDataClass, "pClientRandom", "[B");
+- if (fieldID == NULL) { return ckParam; }
++ if (fieldID == NULL) { return; }
+ jRIClientRandom = (*env)->GetObjectField(env, jRandomInfo, fieldID);
+
+ /* get pServerRandom and ulServerRandomLength out of RandomInfo */
+ fieldID = (*env)->GetFieldID(env, jSsl3RandomDataClass, "pServerRandom", "[B");
+- if (fieldID == NULL) { return ckParam; }
++ if (fieldID == NULL) { return; }
+ jRIServerRandom = (*env)->GetObjectField(env, jRandomInfo, fieldID);
+
+ /* get pVersion */
+- fieldID = (*env)->GetFieldID(env, jSsl3MasterKeyDeriveParamsClass, "pVersion", "Lsun/security/pkcs11/wrapper/CK_VERSION;");
+- if (fieldID == NULL) { return ckParam; }
++ fieldID = (*env)->GetFieldID(env, masterKeyDeriveParamClass, "pVersion",
++ "Lsun/security/pkcs11/wrapper/CK_VERSION;");
++ if (fieldID == NULL) { return; }
+ jVersion = (*env)->GetObjectField(env, jParam, fieldID);
+
+ /* populate java values */
+- ckParam.pVersion = jVersionToCKVersionPtr(env, jVersion);
+- if ((*env)->ExceptionCheck(env)) { return ckParam; }
+- jByteArrayToCKByteArray(env, jRIClientRandom, &(ckParam.RandomInfo.pClientRandom), &(ckParam.RandomInfo.ulClientRandomLen));
++ *cKMasterKeyDeriveParamVersion = jVersionToCKVersionPtr(env, jVersion);
++ if ((*env)->ExceptionCheck(env)) { return; }
++ jByteArrayToCKByteArray(env, jRIClientRandom,
++ &(cKMasterKeyDeriveParamRandomInfo->pClientRandom),
++ &(cKMasterKeyDeriveParamRandomInfo->ulClientRandomLen));
+ if ((*env)->ExceptionCheck(env)) {
+- free(ckParam.pVersion);
+- return ckParam;
++ free(*cKMasterKeyDeriveParamVersion);
++ return;
+ }
+- jByteArrayToCKByteArray(env, jRIServerRandom, &(ckParam.RandomInfo.pServerRandom), &(ckParam.RandomInfo.ulServerRandomLen));
++ jByteArrayToCKByteArray(env, jRIServerRandom,
++ &(cKMasterKeyDeriveParamRandomInfo->pServerRandom),
++ &(cKMasterKeyDeriveParamRandomInfo->ulServerRandomLen));
+ if ((*env)->ExceptionCheck(env)) {
+- free(ckParam.pVersion);
+- free(ckParam.RandomInfo.pClientRandom);
+- return ckParam;
++ free(*cKMasterKeyDeriveParamVersion);
++ free(cKMasterKeyDeriveParamRandomInfo->pClientRandom);
++ return;
+ }
+-
+- return ckParam ;
+ }
+
++/*
++ * converts the Java CK_SSL3_MASTER_KEY_DERIVE_PARAMS object to a
++ * CK_SSL3_MASTER_KEY_DERIVE_PARAMS structure
++ *
++ * @param env - used to call JNI functions to get the Java classes and objects
++ * @param jParam - the Java CK_SSL3_MASTER_KEY_DERIVE_PARAMS object to convert
++ * @return - the new CK_SSL3_MASTER_KEY_DERIVE_PARAMS structure
++ */
++CK_SSL3_MASTER_KEY_DERIVE_PARAMS
++jSsl3MasterKeyDeriveParamToCKSsl3MasterKeyDeriveParam(JNIEnv *env,
++ jobject jParam)
++{
++ CK_SSL3_MASTER_KEY_DERIVE_PARAMS ckParam;
++ jclass jSsl3MasterKeyDeriveParamsClass;
++ memset(&ckParam, 0, sizeof(CK_SSL3_MASTER_KEY_DERIVE_PARAMS));
++ jSsl3MasterKeyDeriveParamsClass =
++ (*env)->FindClass(env, CLASS_SSL3_MASTER_KEY_DERIVE_PARAMS);
++ if (jSsl3MasterKeyDeriveParamsClass == NULL) { return ckParam; }
++ masterKeyDeriveParamToCKMasterKeyDeriveParam(env, jParam,
++ jSsl3MasterKeyDeriveParamsClass,
++ &ckParam.pVersion, &ckParam.RandomInfo);
++ return ckParam;
++}
++
++/*
++ * converts the Java CK_TLS12_MASTER_KEY_DERIVE_PARAMS object to a
++ * CK_TLS12_MASTER_KEY_DERIVE_PARAMS structure
++ *
++ * @param env - used to call JNI functions to get the Java classes and objects
++ * @param jParam - the Java CK_TLS12_MASTER_KEY_DERIVE_PARAMS object to convert
++ * @return - the new CK_TLS12_MASTER_KEY_DERIVE_PARAMS structure
++ */
++CK_TLS12_MASTER_KEY_DERIVE_PARAMS
++jTls12MasterKeyDeriveParamToCKTls12MasterKeyDeriveParam(JNIEnv *env,
++ jobject jParam)
++{
++ CK_TLS12_MASTER_KEY_DERIVE_PARAMS ckParam;
++ jclass jTls12MasterKeyDeriveParamsClass;
++ jfieldID fieldID;
++ memset(&ckParam, 0, sizeof(CK_TLS12_MASTER_KEY_DERIVE_PARAMS));
++ jTls12MasterKeyDeriveParamsClass =
++ (*env)->FindClass(env, CLASS_TLS12_MASTER_KEY_DERIVE_PARAMS);
++ if (jTls12MasterKeyDeriveParamsClass == NULL) { return ckParam; }
++ masterKeyDeriveParamToCKMasterKeyDeriveParam(env, jParam,
++ jTls12MasterKeyDeriveParamsClass, &ckParam.pVersion,
++ &ckParam.RandomInfo);
++ fieldID = (*env)->GetFieldID(env,
++ jTls12MasterKeyDeriveParamsClass, "prfHashMechanism", "J");
++ if (fieldID != NULL) {
++ jlong prfHashMechanism =
++ (*env)->GetLongField(env, jParam, fieldID);
++ ckParam.prfHashMechanism = (CK_MECHANISM_TYPE)prfHashMechanism;
++ }
++ return ckParam;
++}
+
+ /*
+ * converts the Java CK_TLS_PRF_PARAMS object to a CK_TLS_PRF_PARAMS structure
+@@ -576,126 +622,220 @@
+ }
+
+ /*
+- * converts the Java CK_SSL3_KEY_MAT_PARAMS object to a CK_SSL3_KEY_MAT_PARAMS structure
+- *
+- * @param env - used to call JNI funktions to get the Java classes and objects
+- * @param jParam - the Java CK_SSL3_KEY_MAT_PARAMS object to convert
+- * @return - the new CK_SSL3_KEY_MAT_PARAMS structure
++ * converts the Java CK_TLS_MAC_PARAMS object to a CK_TLS_MAC_PARAMS structure
+ */
+-CK_SSL3_KEY_MAT_PARAMS jSsl3KeyMatParamToCKSsl3KeyMatParam(JNIEnv *env, jobject jParam)
++CK_TLS_MAC_PARAMS jTlsMacParamsToCKTlsMacParam(JNIEnv *env, jobject jParam)
+ {
+- // XXX don't return structs
+- // XXX prefetch class and field ids
+- jclass jSsl3KeyMatParamsClass, jSsl3RandomDataClass, jSsl3KeyMatOutClass;
+- CK_SSL3_KEY_MAT_PARAMS ckParam;
++ jclass jTlsMacParamsClass;
++ CK_TLS_MAC_PARAMS ckParam;
++ jfieldID fieldID;
++ jlong jPrfMechanism, jUlMacLength, jUlServerOrClient;
++ memset(&ckParam, 0, sizeof(CK_TLS_MAC_PARAMS));
++
++ jTlsMacParamsClass = (*env)->FindClass(env, CLASS_TLS_MAC_PARAMS);
++ if (jTlsMacParamsClass == NULL) { return ckParam; }
++
++ /* get prfMechanism */
++ fieldID = (*env)->GetFieldID(env, jTlsMacParamsClass, "prfMechanism", "J");
++ if (fieldID == NULL) { return ckParam; }
++ jPrfMechanism = (*env)->GetLongField(env, jParam, fieldID);
++
++ /* get ulMacLength */
++ fieldID = (*env)->GetFieldID(env, jTlsMacParamsClass, "ulMacLength", "J");
++ if (fieldID == NULL) { return ckParam; }
++ jUlMacLength = (*env)->GetLongField(env, jParam, fieldID);
++
++ /* get ulServerOrClient */
++ fieldID = (*env)->GetFieldID(env, jTlsMacParamsClass, "ulServerOrClient", "J");
++ if (fieldID == NULL) { return ckParam; }
++ jUlServerOrClient = (*env)->GetLongField(env, jParam, fieldID);
++
++ /* populate java values */
++ ckParam.prfMechanism = jLongToCKULong(jPrfMechanism);
++ ckParam.ulMacLength = jLongToCKULong(jUlMacLength);
++ ckParam.ulServerOrClient = jLongToCKULong(jUlServerOrClient);
++
++ return ckParam;
++}
++
++void keyMatParamToCKKeyMatParam(JNIEnv *env, jobject jParam,
++ jclass jKeyMatParamClass,
++ CK_ULONG* cKKeyMatParamUlMacSizeInBits,
++ CK_ULONG* cKKeyMatParamUlKeySizeInBits,
++ CK_ULONG* cKKeyMatParamUlIVSizeInBits,
++ CK_BBOOL* cKKeyMatParamBIsExport,
++ CK_SSL3_RANDOM_DATA* cKKeyMatParamRandomInfo,
++ CK_SSL3_KEY_MAT_OUT_PTR* cKKeyMatParamPReturnedKeyMaterial)
++{
++ jclass jSsl3RandomDataClass, jSsl3KeyMatOutClass;
+ jfieldID fieldID;
+ jlong jMacSizeInBits, jKeySizeInBits, jIVSizeInBits;
+ jboolean jIsExport;
+ jobject jRandomInfo, jRIClientRandom, jRIServerRandom;
+ jobject jReturnedKeyMaterial, jRMIvClient, jRMIvServer;
+ CK_ULONG ckTemp;
+- memset(&ckParam, 0, sizeof(CK_SSL3_KEY_MAT_PARAMS));
+
+ /* get ulMacSizeInBits */
+- jSsl3KeyMatParamsClass = (*env)->FindClass(env, CLASS_SSL3_KEY_MAT_PARAMS);
+- if (jSsl3KeyMatParamsClass == NULL) { return ckParam; }
+- fieldID = (*env)->GetFieldID(env, jSsl3KeyMatParamsClass, "ulMacSizeInBits", "J");
+- if (fieldID == NULL) { return ckParam; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamClass, "ulMacSizeInBits", "J");
++ if (fieldID == NULL) { return; }
+ jMacSizeInBits = (*env)->GetLongField(env, jParam, fieldID);
+
+ /* get ulKeySizeInBits */
+- fieldID = (*env)->GetFieldID(env, jSsl3KeyMatParamsClass, "ulKeySizeInBits", "J");
+- if (fieldID == NULL) { return ckParam; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamClass, "ulKeySizeInBits", "J");
++ if (fieldID == NULL) { return; }
+ jKeySizeInBits = (*env)->GetLongField(env, jParam, fieldID);
+
+ /* get ulIVSizeInBits */
+- fieldID = (*env)->GetFieldID(env, jSsl3KeyMatParamsClass, "ulIVSizeInBits", "J");
+- if (fieldID == NULL) { return ckParam; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamClass, "ulIVSizeInBits", "J");
++ if (fieldID == NULL) { return; }
+ jIVSizeInBits = (*env)->GetLongField(env, jParam, fieldID);
+
+ /* get bIsExport */
+- fieldID = (*env)->GetFieldID(env, jSsl3KeyMatParamsClass, "bIsExport", "Z");
+- if (fieldID == NULL) { return ckParam; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamClass, "bIsExport", "Z");
++ if (fieldID == NULL) { return; }
+ jIsExport = (*env)->GetBooleanField(env, jParam, fieldID);
+
+ /* get RandomInfo */
+ jSsl3RandomDataClass = (*env)->FindClass(env, CLASS_SSL3_RANDOM_DATA);
+- if (jSsl3RandomDataClass == NULL) { return ckParam; }
+- fieldID = (*env)->GetFieldID(env, jSsl3KeyMatParamsClass, "RandomInfo", "Lsun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA;");
+- if (fieldID == NULL) { return ckParam; }
++ if (jSsl3RandomDataClass == NULL) { return; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamClass, "RandomInfo",
++ "Lsun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA;");
++ if (fieldID == NULL) { return; }
+ jRandomInfo = (*env)->GetObjectField(env, jParam, fieldID);
+
+ /* get pClientRandom and ulClientRandomLength out of RandomInfo */
+ fieldID = (*env)->GetFieldID(env, jSsl3RandomDataClass, "pClientRandom", "[B");
+- if (fieldID == NULL) { return ckParam; }
++ if (fieldID == NULL) { return; }
+ jRIClientRandom = (*env)->GetObjectField(env, jRandomInfo, fieldID);
+
+ /* get pServerRandom and ulServerRandomLength out of RandomInfo */
+ fieldID = (*env)->GetFieldID(env, jSsl3RandomDataClass, "pServerRandom", "[B");
+- if (fieldID == NULL) { return ckParam; }
++ if (fieldID == NULL) { return; }
+ jRIServerRandom = (*env)->GetObjectField(env, jRandomInfo, fieldID);
+
+ /* get pReturnedKeyMaterial */
+ jSsl3KeyMatOutClass = (*env)->FindClass(env, CLASS_SSL3_KEY_MAT_OUT);
+- if (jSsl3KeyMatOutClass == NULL) { return ckParam; }
+- fieldID = (*env)->GetFieldID(env, jSsl3KeyMatParamsClass, "pReturnedKeyMaterial", "Lsun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT;");
+- if (fieldID == NULL) { return ckParam; }
++ if (jSsl3KeyMatOutClass == NULL) { return; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamClass, "pReturnedKeyMaterial",
++ "Lsun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT;");
++ if (fieldID == NULL) { return; }
+ jReturnedKeyMaterial = (*env)->GetObjectField(env, jParam, fieldID);
+
+ /* get pIVClient out of pReturnedKeyMaterial */
+ fieldID = (*env)->GetFieldID(env, jSsl3KeyMatOutClass, "pIVClient", "[B");
+- if (fieldID == NULL) { return ckParam; }
++ if (fieldID == NULL) { return; }
+ jRMIvClient = (*env)->GetObjectField(env, jReturnedKeyMaterial, fieldID);
+
+ /* get pIVServer out of pReturnedKeyMaterial */
+ fieldID = (*env)->GetFieldID(env, jSsl3KeyMatOutClass, "pIVServer", "[B");
+- if (fieldID == NULL) { return ckParam; }
++ if (fieldID == NULL) { return; }
+ jRMIvServer = (*env)->GetObjectField(env, jReturnedKeyMaterial, fieldID);
+
+ /* populate java values */
+- ckParam.ulMacSizeInBits = jLongToCKULong(jMacSizeInBits);
+- ckParam.ulKeySizeInBits = jLongToCKULong(jKeySizeInBits);
+- ckParam.ulIVSizeInBits = jLongToCKULong(jIVSizeInBits);
+- ckParam.bIsExport = jBooleanToCKBBool(jIsExport);
+- jByteArrayToCKByteArray(env, jRIClientRandom, &(ckParam.RandomInfo.pClientRandom), &(ckParam.RandomInfo.ulClientRandomLen));
+- if ((*env)->ExceptionCheck(env)) { return ckParam; }
+- jByteArrayToCKByteArray(env, jRIServerRandom, &(ckParam.RandomInfo.pServerRandom), &(ckParam.RandomInfo.ulServerRandomLen));
++ *cKKeyMatParamUlMacSizeInBits = jLongToCKULong(jMacSizeInBits);
++ *cKKeyMatParamUlKeySizeInBits = jLongToCKULong(jKeySizeInBits);
++ *cKKeyMatParamUlIVSizeInBits = jLongToCKULong(jIVSizeInBits);
++ *cKKeyMatParamBIsExport = jBooleanToCKBBool(jIsExport);
++ jByteArrayToCKByteArray(env, jRIClientRandom,
++ &(cKKeyMatParamRandomInfo->pClientRandom),
++ &(cKKeyMatParamRandomInfo->ulClientRandomLen));
++ if ((*env)->ExceptionCheck(env)) { return; }
++ jByteArrayToCKByteArray(env, jRIServerRandom,
++ &(cKKeyMatParamRandomInfo->pServerRandom),
++ &(cKKeyMatParamRandomInfo->ulServerRandomLen));
+ if ((*env)->ExceptionCheck(env)) {
+- free(ckParam.RandomInfo.pClientRandom);
+- return ckParam;
++ free(cKKeyMatParamRandomInfo->pClientRandom);
++ return;
+ }
+ /* allocate memory for pRetrunedKeyMaterial */
+- ckParam.pReturnedKeyMaterial = (CK_SSL3_KEY_MAT_OUT_PTR) malloc(sizeof(CK_SSL3_KEY_MAT_OUT));
+- if (ckParam.pReturnedKeyMaterial == NULL) {
+- free(ckParam.RandomInfo.pClientRandom);
+- free(ckParam.RandomInfo.pServerRandom);
++ *cKKeyMatParamPReturnedKeyMaterial =
++ (CK_SSL3_KEY_MAT_OUT_PTR)malloc(sizeof(CK_SSL3_KEY_MAT_OUT));
++ if (*cKKeyMatParamPReturnedKeyMaterial == NULL) {
++ free(cKKeyMatParamRandomInfo->pClientRandom);
++ free(cKKeyMatParamRandomInfo->pServerRandom);
+ throwOutOfMemoryError(env, 0);
+- return ckParam;
++ return;
+ }
+
+ // the handles are output params only, no need to fetch them from Java
+- ckParam.pReturnedKeyMaterial->hClientMacSecret = 0;
+- ckParam.pReturnedKeyMaterial->hServerMacSecret = 0;
+- ckParam.pReturnedKeyMaterial->hClientKey = 0;
+- ckParam.pReturnedKeyMaterial->hServerKey = 0;
++ (*cKKeyMatParamPReturnedKeyMaterial)->hClientMacSecret = 0;
++ (*cKKeyMatParamPReturnedKeyMaterial)->hServerMacSecret = 0;
++ (*cKKeyMatParamPReturnedKeyMaterial)->hClientKey = 0;
++ (*cKKeyMatParamPReturnedKeyMaterial)->hServerKey = 0;
+
+- jByteArrayToCKByteArray(env, jRMIvClient, &(ckParam.pReturnedKeyMaterial->pIVClient), &ckTemp);
++ jByteArrayToCKByteArray(env, jRMIvClient,
++ &((*cKKeyMatParamPReturnedKeyMaterial)->pIVClient), &ckTemp);
+ if ((*env)->ExceptionCheck(env)) {
+- free(ckParam.RandomInfo.pClientRandom);
+- free(ckParam.RandomInfo.pServerRandom);
+- free(ckParam.pReturnedKeyMaterial);
+- return ckParam;
++ free(cKKeyMatParamRandomInfo->pClientRandom);
++ free(cKKeyMatParamRandomInfo->pServerRandom);
++ free((*cKKeyMatParamPReturnedKeyMaterial));
++ return;
+ }
+- jByteArrayToCKByteArray(env, jRMIvServer, &(ckParam.pReturnedKeyMaterial->pIVServer), &ckTemp);
++ jByteArrayToCKByteArray(env, jRMIvServer,
++ &((*cKKeyMatParamPReturnedKeyMaterial)->pIVServer), &ckTemp);
+ if ((*env)->ExceptionCheck(env)) {
+- free(ckParam.RandomInfo.pClientRandom);
+- free(ckParam.RandomInfo.pServerRandom);
+- free(ckParam.pReturnedKeyMaterial->pIVClient);
+- free(ckParam.pReturnedKeyMaterial);
+- return ckParam;
++ free(cKKeyMatParamRandomInfo->pClientRandom);
++ free(cKKeyMatParamRandomInfo->pServerRandom);
++ free((*cKKeyMatParamPReturnedKeyMaterial)->pIVClient);
++ free((*cKKeyMatParamPReturnedKeyMaterial));
++ return;
+ }
+
+- return ckParam ;
++ return;
++}
++/*
++ * converts the Java CK_SSL3_KEY_MAT_PARAMS object to a
++ * CK_SSL3_KEY_MAT_PARAMS structure
++ *
++ * @param env - used to call JNI funktions to get the Java classes and objects
++ * @param jParam - the Java CK_SSL3_KEY_MAT_PARAMS object to convert
++ * @return - the new CK_SSL3_KEY_MAT_PARAMS structure
++ */
++CK_SSL3_KEY_MAT_PARAMS
++jSsl3KeyMatParamToCKSsl3KeyMatParam(JNIEnv *env, jobject jParam)
++{
++ CK_SSL3_KEY_MAT_PARAMS ckParam;
++ jclass jSsl3KeyMatParamsClass;
++ memset(&ckParam, 0, sizeof(CK_SSL3_KEY_MAT_PARAMS));
++ jSsl3KeyMatParamsClass = (*env)->FindClass(env,
++ CLASS_SSL3_KEY_MAT_PARAMS);
++ if (jSsl3KeyMatParamsClass == NULL) { return ckParam; }
++ keyMatParamToCKKeyMatParam(env, jParam, jSsl3KeyMatParamsClass,
++ &ckParam.ulMacSizeInBits, &ckParam.ulKeySizeInBits,
++ &ckParam.ulIVSizeInBits, &ckParam.bIsExport,
++ &ckParam.RandomInfo, &ckParam.pReturnedKeyMaterial);
++ return ckParam;
++}
++
++/*
++ * converts the Java CK_TLS12_KEY_MAT_PARAMS object to a
++ * CK_TLS12_KEY_MAT_PARAMS structure
++ *
++ * @param env - used to call JNI functions to get the Java classes and objects
++ * @param jParam - the Java CK_TLS12_KEY_MAT_PARAMS object to convert
++ * @return - the new CK_TLS12_KEY_MAT_PARAMS structure
++ */
++CK_TLS12_KEY_MAT_PARAMS jTls12KeyMatParamToCKTls12KeyMatParam(JNIEnv *env,
++ jobject jParam)
++{
++ CK_TLS12_KEY_MAT_PARAMS ckParam;
++ jclass jTls12KeyMatParamsClass;
++ jfieldID fieldID;
++ memset(&ckParam, 0, sizeof(CK_TLS12_KEY_MAT_PARAMS));
++ jTls12KeyMatParamsClass = (*env)->FindClass(env,
++ CLASS_TLS12_KEY_MAT_PARAMS);
++ if (jTls12KeyMatParamsClass == NULL) { return ckParam; }
++ keyMatParamToCKKeyMatParam(env, jParam, jTls12KeyMatParamsClass,
++ &ckParam.ulMacSizeInBits, &ckParam.ulKeySizeInBits,
++ &ckParam.ulIVSizeInBits, &ckParam.bIsExport,
++ &ckParam.RandomInfo, &ckParam.pReturnedKeyMaterial);
++ fieldID = (*env)->GetFieldID(env, jTls12KeyMatParamsClass,
++ "prfHashMechanism", "J");
++ if (fieldID != NULL) {
++ jlong prfHashMechanism = (*env)->GetLongField(env, jParam, fieldID);
++ ckParam.prfHashMechanism = (CK_MECHANISM_TYPE)prfHashMechanism;
++ }
++ return ckParam;
+ }
+
+ /*
+@@ -980,8 +1120,11 @@
+ void jMechanismParameterToCKMechanismParameterSlow(JNIEnv *env, jobject jParam, CK_VOID_PTR *ckpParamPtr, CK_ULONG *ckpLength)
+ {
+ /* get all Java mechanism parameter classes */
+- jclass jVersionClass, jSsl3MasterKeyDeriveParamsClass, jSsl3KeyMatParamsClass;
+- jclass jTlsPrfParamsClass, jAesCtrParamsClass, jRsaPkcsOaepParamsClass;
++ jclass jVersionClass, jSsl3MasterKeyDeriveParamsClass;
++ jclass jTls12MasterKeyDeriveParamsClass, jSsl3KeyMatParamsClass;
++ jclass jTls12KeyMatParamsClass;
++ jclass jTlsPrfParamsClass, jTlsMacParamsClass, jAesCtrParamsClass;
++ jclass jRsaPkcsOaepParamsClass;
+ jclass jPbeParamsClass, jPkcs5Pbkd2ParamsClass, jRsaPkcsPssParamsClass;
+ jclass jEcdh1DeriveParamsClass, jEcdh2DeriveParamsClass;
+ jclass jX942Dh1DeriveParamsClass, jX942Dh2DeriveParamsClass;
+@@ -1061,6 +1204,62 @@
+ return;
+ }
+
++ jTls12KeyMatParamsClass = (*env)->FindClass(env, CLASS_TLS12_KEY_MAT_PARAMS);
++ if (jTls12KeyMatParamsClass == NULL) { return; }
++ if ((*env)->IsInstanceOf(env, jParam, jTls12KeyMatParamsClass)) {
++ /*
++ * CK_TLS12_KEY_MAT_PARAMS
++ */
++ CK_TLS12_KEY_MAT_PARAMS_PTR ckpParam;
++
++ ckpParam = (CK_TLS12_KEY_MAT_PARAMS_PTR) malloc(sizeof(CK_TLS12_KEY_MAT_PARAMS));
++ if (ckpParam == NULL) {
++ throwOutOfMemoryError(env, 0);
++ return;
++ }
++
++ /* convert jParameter to CKParameter */
++ *ckpParam = jTls12KeyMatParamToCKTls12KeyMatParam(env, jParam);
++ if ((*env)->ExceptionCheck(env)) {
++ free(ckpParam);
++ return;
++ }
++
++ /* get length and pointer of parameter */
++ *ckpLength = sizeof(CK_TLS12_KEY_MAT_PARAMS);
++ *ckpParamPtr = ckpParam;
++ return;
++ }
++
++ jTls12MasterKeyDeriveParamsClass =
++ (*env)->FindClass(env, CLASS_TLS12_MASTER_KEY_DERIVE_PARAMS);
++ if (jTls12MasterKeyDeriveParamsClass == NULL) { return; }
++ if ((*env)->IsInstanceOf(env, jParam, jTls12MasterKeyDeriveParamsClass)) {
++ /*
++ * CK_TLS12_MASTER_KEY_DERIVE_PARAMS
++ */
++ CK_TLS12_MASTER_KEY_DERIVE_PARAMS_PTR ckpParam;
++
++ ckpParam = (CK_TLS12_MASTER_KEY_DERIVE_PARAMS_PTR)malloc(
++ sizeof(CK_TLS12_MASTER_KEY_DERIVE_PARAMS));
++ if (ckpParam == NULL) {
++ throwOutOfMemoryError(env, 0);
++ return;
++ }
++
++ /* convert jParameter to CKParameter */
++ *ckpParam = jTls12MasterKeyDeriveParamToCKTls12MasterKeyDeriveParam(env, jParam);
++ if ((*env)->ExceptionCheck(env)) {
++ free(ckpParam);
++ return;
++ }
++
++ /* get length and pointer of parameter */
++ *ckpLength = sizeof(CK_TLS12_MASTER_KEY_DERIVE_PARAMS);
++ *ckpParamPtr = ckpParam;
++ return;
++ }
++
+ jTlsPrfParamsClass = (*env)->FindClass(env, CLASS_TLS_PRF_PARAMS);
+ if (jTlsPrfParamsClass == NULL) { return; }
+ if ((*env)->IsInstanceOf(env, jParam, jTlsPrfParamsClass)) {
+@@ -1088,6 +1287,30 @@
+ return;
+ }
+
++ jTlsMacParamsClass = (*env)->FindClass(env, CLASS_TLS_MAC_PARAMS);
++ if (jTlsMacParamsClass == NULL) { return; }
++ if ((*env)->IsInstanceOf(env, jParam, jTlsMacParamsClass)) {
++ CK_TLS_MAC_PARAMS_PTR ckpParam;
++
++ ckpParam = (CK_TLS_MAC_PARAMS_PTR) malloc(sizeof(CK_TLS_MAC_PARAMS));
++ if (ckpParam == NULL) {
++ throwOutOfMemoryError(env, 0);
++ return;
++ }
++
++ /* convert jParameter to CKParameter */
++ *ckpParam = jTlsMacParamsToCKTlsMacParam(env, jParam);
++ if ((*env)->ExceptionCheck(env)) {
++ free(ckpParam);
++ return;
++ }
++
++ /* get length and pointer of parameter */
++ *ckpLength = sizeof(CK_TLS_MAC_PARAMS);
++ *ckpParamPtr = ckpParam;
++ return;
++ }
++
+ jAesCtrParamsClass = (*env)->FindClass(env, CLASS_AES_CTR_PARAMS);
+ if (jAesCtrParamsClass == NULL) { return; }
+ if ((*env)->IsInstanceOf(env, jParam, jAesCtrParamsClass)) {
+diff --git openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
+--- openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
++++ openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+
+ /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
+@@ -355,25 +355,38 @@
+
+ #ifdef P11_ENABLE_C_DERIVEKEY
+
+-void freeMasterKeyDeriveParams(CK_MECHANISM_PTR ckMechanism) {
++static void freeMasterKeyDeriveParams(CK_SSL3_RANDOM_DATA *RandomInfo, CK_VERSION_PTR pVersion) {
++ if (RandomInfo->pClientRandom != NULL) {
++ free(RandomInfo->pClientRandom);
++ }
++ if (RandomInfo->pServerRandom != NULL) {
++ free(RandomInfo->pServerRandom);
++ }
++ if (pVersion != NULL) {
++ free(pVersion);
++ }
++}
++
++void ssl3FreeMasterKeyDeriveParams(CK_MECHANISM_PTR ckMechanism) {
+ CK_SSL3_MASTER_KEY_DERIVE_PARAMS *params = (CK_SSL3_MASTER_KEY_DERIVE_PARAMS *) ckMechanism->pParameter;
+ if (params == NULL) {
+ return;
+ }
++ freeMasterKeyDeriveParams(&(params->RandomInfo), params->pVersion);
++}
+
+- if (params->RandomInfo.pClientRandom != NULL) {
+- free(params->RandomInfo.pClientRandom);
++void tls12FreeMasterKeyDeriveParams(CK_MECHANISM_PTR ckMechanism) {
++ CK_TLS12_MASTER_KEY_DERIVE_PARAMS *params =
++ (CK_TLS12_MASTER_KEY_DERIVE_PARAMS *)ckMechanism->pParameter;
++ if (params == NULL) {
++ return;
+ }
+- if (params->RandomInfo.pServerRandom != NULL) {
+- free(params->RandomInfo.pServerRandom);
+- }
+- if (params->pVersion != NULL) {
+- free(params->pVersion);
+- }
++ freeMasterKeyDeriveParams(&(params->RandomInfo), params->pVersion);
+ }
+
+ void freeEcdh1DeriveParams(CK_MECHANISM_PTR ckMechanism) {
+- CK_ECDH1_DERIVE_PARAMS *params = (CK_ECDH1_DERIVE_PARAMS *) ckMechanism->pParameter;
++ CK_ECDH1_DERIVE_PARAMS *params =
++ (CK_ECDH1_DERIVE_PARAMS *)ckMechanism->pParameter;
+ if (params == NULL) {
+ return;
+ }
+@@ -498,6 +511,7 @@
+ switch (ckMechanism.mechanism) {
+ case CKM_SSL3_KEY_AND_MAC_DERIVE:
+ case CKM_TLS_KEY_AND_MAC_DERIVE:
++ case CKM_TLS12_KEY_AND_MAC_DERIVE:
+ case CKM_TLS_PRF:
+ // these mechanism do not return a key handle via phKey
+ // set to NULL in case pedantic implementations check for it
+@@ -519,17 +533,28 @@
+ case CKM_SSL3_MASTER_KEY_DERIVE:
+ case CKM_TLS_MASTER_KEY_DERIVE:
+ /* we must copy back the client version */
+- copyBackClientVersion(env, &ckMechanism, jMechanism);
+- freeMasterKeyDeriveParams(&ckMechanism);
++ ssl3CopyBackClientVersion(env, &ckMechanism, jMechanism);
++ ssl3FreeMasterKeyDeriveParams(&ckMechanism);
++ break;
++ case CKM_TLS12_MASTER_KEY_DERIVE:
++ tls12CopyBackClientVersion(env, &ckMechanism, jMechanism);
++ tls12FreeMasterKeyDeriveParams(&ckMechanism);
+ break;
+ case CKM_SSL3_MASTER_KEY_DERIVE_DH:
+ case CKM_TLS_MASTER_KEY_DERIVE_DH:
+- freeMasterKeyDeriveParams(&ckMechanism);
++ ssl3FreeMasterKeyDeriveParams(&ckMechanism);
++ break;
++ case CKM_TLS12_MASTER_KEY_DERIVE_DH:
++ tls12FreeMasterKeyDeriveParams(&ckMechanism);
+ break;
+ case CKM_SSL3_KEY_AND_MAC_DERIVE:
+ case CKM_TLS_KEY_AND_MAC_DERIVE:
+ /* we must copy back the unwrapped key info to the jMechanism object */
+- copyBackSSLKeyMatParams(env, &ckMechanism, jMechanism);
++ ssl3CopyBackKeyMatParams(env, &ckMechanism, jMechanism);
++ break;
++ case CKM_TLS12_KEY_AND_MAC_DERIVE:
++ /* we must copy back the unwrapped key info to the jMechanism object */
++ tls12CopyBackKeyMatParams(env, &ckMechanism, jMechanism);
+ break;
+ case CKM_TLS_PRF:
+ copyBackTLSPrfParams(env, &ckMechanism, jMechanism);
+@@ -550,53 +575,42 @@
+ return jKeyHandle ;
+ }
+
+-/*
+- * Copy back the client version information from the native
+- * structure to the Java object. This is only used for the
+- * CKM_SSL3_MASTER_KEY_DERIVE mechanism when used for deriving a key.
+- *
+- */
+-void copyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism)
++static void copyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism,
++ CK_VERSION *ckVersion, const char *class_master_key_derive_params)
+ {
+- jclass jMechanismClass, jSSL3MasterKeyDeriveParamsClass, jVersionClass;
+- CK_SSL3_MASTER_KEY_DERIVE_PARAMS *ckSSL3MasterKeyDeriveParams;
+- CK_VERSION *ckVersion;
+- jfieldID fieldID;
+- CK_MECHANISM_TYPE ckMechanismType;
+- jlong jMechanismType;
+- jobject jSSL3MasterKeyDeriveParams;
+- jobject jVersion;
++ jclass jMasterKeyDeriveParamsClass, jMechanismClass, jVersionClass;
++ jobject jMasterKeyDeriveParams;
++ jfieldID fieldID;
++ CK_MECHANISM_TYPE ckMechanismType;
++ jlong jMechanismType;
++ jobject jVersion;
+
+- /* get mechanism */
+- jMechanismClass = (*env)->FindClass(env, CLASS_MECHANISM);
+- if (jMechanismClass == NULL) { return; }
+- fieldID = (*env)->GetFieldID(env, jMechanismClass, "mechanism", "J");
+- if (fieldID == NULL) { return; }
+- jMechanismType = (*env)->GetLongField(env, jMechanism, fieldID);
+- ckMechanismType = jLongToCKULong(jMechanismType);
+- if (ckMechanismType != ckMechanism->mechanism) {
+- /* we do not have maching types, this should not occur */
+- return;
+- }
++ /* get mechanism */
++ jMechanismClass = (*env)->FindClass(env, CLASS_MECHANISM);
++ if (jMechanismClass == NULL) { return; }
++ fieldID = (*env)->GetFieldID(env, jMechanismClass, "mechanism", "J");
++ if (fieldID == NULL) { return; }
++ jMechanismType = (*env)->GetLongField(env, jMechanism, fieldID);
++ ckMechanismType = jLongToCKULong(jMechanismType);
++ if (ckMechanismType != ckMechanism->mechanism) {
++ /* we do not have maching types, this should not occur */
++ return;
++ }
+
+- /* get the native CK_SSL3_MASTER_KEY_DERIVE_PARAMS */
+- ckSSL3MasterKeyDeriveParams = (CK_SSL3_MASTER_KEY_DERIVE_PARAMS *) ckMechanism->pParameter;
+- if (ckSSL3MasterKeyDeriveParams != NULL_PTR) {
+- /* get the native CK_VERSION */
+- ckVersion = ckSSL3MasterKeyDeriveParams->pVersion;
+ if (ckVersion != NULL_PTR) {
+ /* get the Java CK_SSL3_MASTER_KEY_DERIVE_PARAMS (pParameter) */
+ fieldID = (*env)->GetFieldID(env, jMechanismClass, "pParameter", "Ljava/lang/Object;");
+ if (fieldID == NULL) { return; }
+
+- jSSL3MasterKeyDeriveParams = (*env)->GetObjectField(env, jMechanism, fieldID);
++ jMasterKeyDeriveParams = (*env)->GetObjectField(env, jMechanism, fieldID);
+
+ /* get the Java CK_VERSION */
+- jSSL3MasterKeyDeriveParamsClass = (*env)->FindClass(env, CLASS_SSL3_MASTER_KEY_DERIVE_PARAMS);
+- if (jSSL3MasterKeyDeriveParamsClass == NULL) { return; }
+- fieldID = (*env)->GetFieldID(env, jSSL3MasterKeyDeriveParamsClass, "pVersion", "L"CLASS_VERSION";");
++ jMasterKeyDeriveParamsClass = (*env)->FindClass(env, class_master_key_derive_params);
++ if (jMasterKeyDeriveParamsClass == NULL) { return; }
++ fieldID = (*env)->GetFieldID(env, jMasterKeyDeriveParamsClass,
++ "pVersion", "L"CLASS_VERSION";");
+ if (fieldID == NULL) { return; }
+- jVersion = (*env)->GetObjectField(env, jSSL3MasterKeyDeriveParams, fieldID);
++ jVersion = (*env)->GetObjectField(env, jMasterKeyDeriveParams, fieldID);
+
+ /* now copy back the version from the native structure to the Java structure */
+
+@@ -612,92 +626,126 @@
+ if (fieldID == NULL) { return; }
+ (*env)->SetByteField(env, jVersion, fieldID, ckByteToJByte(ckVersion->minor));
+ }
+- }
+ }
+
++/*
++ * Copy back the client version information from the native
++ * structure to the Java object. This is only used for
++ * CKM_SSL3_MASTER_KEY_DERIVE and CKM_TLS_MASTER_KEY_DERIVE
++ * mechanisms when used for deriving a key.
++ *
++ */
++void ssl3CopyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism,
++ jobject jMechanism)
++{
++ CK_SSL3_MASTER_KEY_DERIVE_PARAMS *ckSSL3MasterKeyDeriveParams;
++ ckSSL3MasterKeyDeriveParams =
++ (CK_SSL3_MASTER_KEY_DERIVE_PARAMS *)ckMechanism->pParameter;
++ if (ckSSL3MasterKeyDeriveParams != NULL_PTR) {
++ copyBackClientVersion(env, ckMechanism, jMechanism,
++ ckSSL3MasterKeyDeriveParams->pVersion,
++ CLASS_SSL3_MASTER_KEY_DERIVE_PARAMS);
++ }
++}
+
+ /*
+- * Copy back the derived keys and initialization vectors from the native
+- * structure to the Java object. This is only used for the
+- * CKM_SSL3_KEY_AND_MAC_DERIVE mechanism when used for deriving a key.
++ * Copy back the client version information from the native
++ * structure to the Java object. This is only used for
++ * CKM_TLS12_MASTER_KEY_DERIVE mechanism when used for deriving a key.
+ *
+ */
+-void copyBackSSLKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism)
++void tls12CopyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism,
++ jobject jMechanism)
+ {
+- jclass jMechanismClass, jSSL3KeyMatParamsClass, jSSL3KeyMatOutClass;
+- CK_SSL3_KEY_MAT_PARAMS *ckSSL3KeyMatParam;
+- CK_SSL3_KEY_MAT_OUT *ckSSL3KeyMatOut;
+- jfieldID fieldID;
+- CK_MECHANISM_TYPE ckMechanismType;
+- jlong jMechanismType;
+- CK_BYTE_PTR iv;
+- jobject jSSL3KeyMatParam;
+- jobject jSSL3KeyMatOut;
+- jobject jIV;
+- jint jLength;
+- jbyte* jBytes;
+- int i;
++ CK_TLS12_MASTER_KEY_DERIVE_PARAMS *ckTLS12MasterKeyDeriveParams;
++ ckTLS12MasterKeyDeriveParams =
++ (CK_TLS12_MASTER_KEY_DERIVE_PARAMS *)ckMechanism->pParameter;
++ if (ckTLS12MasterKeyDeriveParams != NULL_PTR) {
++ copyBackClientVersion(env, ckMechanism, jMechanism,
++ ckTLS12MasterKeyDeriveParams->pVersion,
++ CLASS_TLS12_MASTER_KEY_DERIVE_PARAMS);
++ }
++}
+
+- /* get mechanism */
+- jMechanismClass= (*env)->FindClass(env, CLASS_MECHANISM);
+- if (jMechanismClass == NULL) { return; }
+- fieldID = (*env)->GetFieldID(env, jMechanismClass, "mechanism", "J");
+- if (fieldID == NULL) { return; }
+- jMechanismType = (*env)->GetLongField(env, jMechanism, fieldID);
+- ckMechanismType = jLongToCKULong(jMechanismType);
+- if (ckMechanismType != ckMechanism->mechanism) {
+- /* we do not have maching types, this should not occur */
+- return;
+- }
++static void copyBackKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism,
++ jobject jMechanism, CK_SSL3_RANDOM_DATA *RandomInfo,
++ CK_SSL3_KEY_MAT_OUT_PTR ckSSL3KeyMatOut, const char *class_key_mat_params)
++{
++ jclass jMechanismClass, jKeyMatParamsClass, jSSL3KeyMatOutClass;
++ jfieldID fieldID;
++ CK_MECHANISM_TYPE ckMechanismType;
++ jlong jMechanismType;
++ CK_BYTE_PTR iv;
++ jobject jKeyMatParam;
++ jobject jSSL3KeyMatOut;
++ jobject jIV;
++ jint jLength;
++ jbyte* jBytes;
++ int i;
+
+- /* get the native CK_SSL3_KEY_MAT_PARAMS */
+- ckSSL3KeyMatParam = (CK_SSL3_KEY_MAT_PARAMS *) ckMechanism->pParameter;
+- if (ckSSL3KeyMatParam != NULL_PTR) {
+- // free malloc'd data
+- if (ckSSL3KeyMatParam->RandomInfo.pClientRandom != NULL) {
+- free(ckSSL3KeyMatParam->RandomInfo.pClientRandom);
+- }
+- if (ckSSL3KeyMatParam->RandomInfo.pServerRandom != NULL) {
+- free(ckSSL3KeyMatParam->RandomInfo.pServerRandom);
++ /* get mechanism */
++ jMechanismClass= (*env)->FindClass(env, CLASS_MECHANISM);
++ if (jMechanismClass == NULL) { return; }
++ fieldID = (*env)->GetFieldID(env, jMechanismClass, "mechanism", "J");
++ if (fieldID == NULL) { return; }
++ jMechanismType = (*env)->GetLongField(env, jMechanism, fieldID);
++ ckMechanismType = jLongToCKULong(jMechanismType);
++ if (ckMechanismType != ckMechanism->mechanism) {
++ /* we do not have maching types, this should not occur */
++ return;
+ }
+
+- /* get the native CK_SSL3_KEY_MAT_OUT */
+- ckSSL3KeyMatOut = ckSSL3KeyMatParam->pReturnedKeyMaterial;
++ // free malloc'd data
++ if (RandomInfo->pClientRandom != NULL) {
++ free(RandomInfo->pClientRandom);
++ }
++ if (RandomInfo->pServerRandom != NULL) {
++ free(RandomInfo->pServerRandom);
++ }
++
+ if (ckSSL3KeyMatOut != NULL_PTR) {
+- /* get the Java CK_SSL3_KEY_MAT_PARAMS (pParameter) */
+- fieldID = (*env)->GetFieldID(env, jMechanismClass, "pParameter", "Ljava/lang/Object;");
++ /* get the Java params object (pParameter) */
++ fieldID = (*env)->GetFieldID(env, jMechanismClass, "pParameter",
++ "Ljava/lang/Object;");
+ if (fieldID == NULL) { return; }
+- jSSL3KeyMatParam = (*env)->GetObjectField(env, jMechanism, fieldID);
++ jKeyMatParam = (*env)->GetObjectField(env, jMechanism, fieldID);
+
+ /* get the Java CK_SSL3_KEY_MAT_OUT */
+- jSSL3KeyMatParamsClass = (*env)->FindClass(env, CLASS_SSL3_KEY_MAT_PARAMS);
+- if (jSSL3KeyMatParamsClass == NULL) { return; }
+- fieldID = (*env)->GetFieldID(env, jSSL3KeyMatParamsClass, "pReturnedKeyMaterial", "L"CLASS_SSL3_KEY_MAT_OUT";");
++ jKeyMatParamsClass = (*env)->FindClass(env, class_key_mat_params);
++ if (jKeyMatParamsClass == NULL) { return; }
++ fieldID = (*env)->GetFieldID(env, jKeyMatParamsClass,
++ "pReturnedKeyMaterial", "L"CLASS_SSL3_KEY_MAT_OUT";");
+ if (fieldID == NULL) { return; }
+- jSSL3KeyMatOut = (*env)->GetObjectField(env, jSSL3KeyMatParam, fieldID);
++ jSSL3KeyMatOut = (*env)->GetObjectField(env, jKeyMatParam, fieldID);
+
+ /* now copy back all the key handles and the initialization vectors */
+ /* copy back client MAC secret handle */
+ jSSL3KeyMatOutClass = (*env)->FindClass(env, CLASS_SSL3_KEY_MAT_OUT);
+ if (jSSL3KeyMatOutClass == NULL) { return; }
+- fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass, "hClientMacSecret", "J");
++ fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass,
++ "hClientMacSecret", "J");
+ if (fieldID == NULL) { return; }
+- (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID, ckULongToJLong(ckSSL3KeyMatOut->hClientMacSecret));
++ (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID,
++ ckULongToJLong(ckSSL3KeyMatOut->hClientMacSecret));
+
+ /* copy back server MAC secret handle */
+- fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass, "hServerMacSecret", "J");
++ fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass,
++ "hServerMacSecret", "J");
+ if (fieldID == NULL) { return; }
+- (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID, ckULongToJLong(ckSSL3KeyMatOut->hServerMacSecret));
++ (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID,
++ ckULongToJLong(ckSSL3KeyMatOut->hServerMacSecret));
+
+ /* copy back client secret key handle */
+ fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass, "hClientKey", "J");
+ if (fieldID == NULL) { return; }
+- (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID, ckULongToJLong(ckSSL3KeyMatOut->hClientKey));
++ (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID,
++ ckULongToJLong(ckSSL3KeyMatOut->hClientKey));
+
+ /* copy back server secret key handle */
+ fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass, "hServerKey", "J");
+ if (fieldID == NULL) { return; }
+- (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID, ckULongToJLong(ckSSL3KeyMatOut->hServerKey));
++ (*env)->SetLongField(env, jSSL3KeyMatOut, fieldID,
++ ckULongToJLong(ckSSL3KeyMatOut->hServerKey));
+
+ /* copy back the client IV */
+ fieldID = (*env)->GetFieldID(env, jSSL3KeyMatOutClass, "pIVClient", "[B");
+@@ -740,7 +788,45 @@
+ free(ckSSL3KeyMatOut->pIVServer);
+ free(ckSSL3KeyMatOut);
+ }
+- }
++}
++
++/*
++ * Copy back the derived keys and initialization vectors from the native
++ * structure to the Java object. This is only used for
++ * CKM_SSL3_KEY_AND_MAC_DERIVE and CKM_TLS_KEY_AND_MAC_DERIVE mechanisms
++ * when used for deriving a key.
++ *
++ */
++void ssl3CopyBackKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism,
++ jobject jMechanism)
++{
++ CK_SSL3_KEY_MAT_PARAMS *ckSSL3KeyMatParam;
++ ckSSL3KeyMatParam = (CK_SSL3_KEY_MAT_PARAMS *)ckMechanism->pParameter;
++ if (ckSSL3KeyMatParam != NULL_PTR) {
++ copyBackKeyMatParams(env, ckMechanism, jMechanism,
++ &(ckSSL3KeyMatParam->RandomInfo),
++ ckSSL3KeyMatParam->pReturnedKeyMaterial,
++ CLASS_SSL3_KEY_MAT_PARAMS);
++ }
++}
++
++/*
++ * Copy back the derived keys and initialization vectors from the native
++ * structure to the Java object. This is only used for
++ * CKM_TLS12_KEY_AND_MAC_DERIVE mechanism when used for deriving a key.
++ *
++ */
++void tls12CopyBackKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism,
++ jobject jMechanism)
++{
++ CK_TLS12_KEY_MAT_PARAMS *ckTLS12KeyMatParam;
++ ckTLS12KeyMatParam = (CK_TLS12_KEY_MAT_PARAMS *) ckMechanism->pParameter;
++ if (ckTLS12KeyMatParam != NULL_PTR) {
++ copyBackKeyMatParams(env, ckMechanism, jMechanism,
++ &(ckTLS12KeyMatParam->RandomInfo),
++ ckTLS12KeyMatParam->pReturnedKeyMaterial,
++ CLASS_TLS12_KEY_MAT_PARAMS);
++ }
+ }
+
+ #endif
+diff --git openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
+--- openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
++++ openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
+@@ -807,6 +807,12 @@
+ #define CKM_WTLS_SERVER_KEY_AND_MAC_DERIVE 0x000003D4
+ #define CKM_WTLS_CLIENT_KEY_AND_MAC_DERIVE 0x000003D5
+
++/* new for v2.40 */
++#define CKM_TLS12_MASTER_KEY_DERIVE 0x000003E0
++#define CKM_TLS12_KEY_AND_MAC_DERIVE 0x000003E1
++#define CKM_TLS12_MASTER_KEY_DERIVE_DH 0x000003E2
++#define CKM_TLS_MAC 0x000003E4
++
+ #define CKM_KEY_WRAP_LYNKS 0x00000400
+ #define CKM_KEY_WRAP_SET_OAEP 0x00000401
+
+@@ -1682,4 +1688,34 @@
+
+ typedef CK_PKCS5_PBKD2_PARAMS CK_PTR CK_PKCS5_PBKD2_PARAMS_PTR;
+
++/* new for v2.40 */
++
++typedef struct CK_TLS12_MASTER_KEY_DERIVE_PARAMS {
++ CK_SSL3_RANDOM_DATA RandomInfo;
++ CK_VERSION_PTR pVersion;
++ CK_MECHANISM_TYPE prfHashMechanism;
++} CK_TLS12_MASTER_KEY_DERIVE_PARAMS;
++
++typedef CK_TLS12_MASTER_KEY_DERIVE_PARAMS CK_PTR CK_TLS12_MASTER_KEY_DERIVE_PARAMS_PTR;
++
++typedef struct CK_TLS12_KEY_MAT_PARAMS {
++ CK_ULONG ulMacSizeInBits;
++ CK_ULONG ulKeySizeInBits;
++ CK_ULONG ulIVSizeInBits;
++ CK_BBOOL bIsExport;
++ CK_SSL3_RANDOM_DATA RandomInfo;
++ CK_SSL3_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
++ CK_MECHANISM_TYPE prfHashMechanism;
++} CK_TLS12_KEY_MAT_PARAMS;
++
++typedef CK_TLS12_KEY_MAT_PARAMS CK_PTR CK_TLS12_KEY_MAT_PARAMS_PTR;
++
++typedef struct CK_TLS_MAC_PARAMS {
++ CK_MECHANISM_TYPE prfMechanism;
++ CK_ULONG ulMacLength;
++ CK_ULONG ulServerOrClient;
++} CK_TLS_MAC_PARAMS;
++
++typedef CK_TLS_MAC_PARAMS CK_PTR CK_TLS_MAC_PARAMS_PTR;
++
+ #endif
+diff --git openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
+--- openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
++++ openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+
+ /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
+@@ -268,10 +268,13 @@
+ #define CLASS_SSL3_RANDOM_DATA "sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA"
+ // CLASS_SSL3_RANDOM_DATA is used by CLASS_SSL3_MASTER_KEY_DERIVE_PARAMS
+ #define CLASS_SSL3_KEY_MAT_OUT "sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT"
+-// CLASS_SSL3_KEY_MAT_OUT is used by CLASS_SSL3_KEY_MAT_PARAMS
++// CLASS_SSL3_KEY_MAT_OUT is used by CLASS_SSL3_KEY_MAT_PARAMS and CK_TLS12_KEY_MAT_PARAMS
+ #define CLASS_SSL3_MASTER_KEY_DERIVE_PARAMS "sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS"
++#define CLASS_TLS12_MASTER_KEY_DERIVE_PARAMS "sun/security/pkcs11/wrapper/CK_TLS12_MASTER_KEY_DERIVE_PARAMS"
+ #define CLASS_SSL3_KEY_MAT_PARAMS "sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_PARAMS"
++#define CLASS_TLS12_KEY_MAT_PARAMS "sun/security/pkcs11/wrapper/CK_TLS12_KEY_MAT_PARAMS"
+ #define CLASS_TLS_PRF_PARAMS "sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS"
++#define CLASS_TLS_MAC_PARAMS "sun/security/pkcs11/wrapper/CK_TLS_MAC_PARAMS"
+ #define CLASS_AES_CTR_PARAMS "sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS"
+
+ /* function to convert a PKCS#11 return value other than CK_OK into a Java Exception
+@@ -361,9 +364,11 @@
+ CK_KEY_WRAP_SET_OAEP_PARAMS jKeyWrapSetOaepParamToCKKeyWrapSetOaepParam(JNIEnv *env, jobject jParam);
+ void copyBackSetUnwrappedKey(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
+ CK_SSL3_MASTER_KEY_DERIVE_PARAMS jSsl3MasterKeyDeriveParamToCKSsl3MasterKeyDeriveParam(JNIEnv *env, jobject jParam);
+-void copyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
++void ssl3CopyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
++void tls12CopyBackClientVersion(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
+ CK_SSL3_KEY_MAT_PARAMS jSsl3KeyMatParamToCKSsl3KeyMatParam(JNIEnv *env, jobject jParam);
+-void copyBackSSLKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
++void ssl3CopyBackKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
++void tls12CopyBackKeyMatParams(JNIEnv *env, CK_MECHANISM *ckMechanism, jobject jMechanism);
+ CK_KEY_DERIVATION_STRING_DATA jKeyDerivationStringDataToCKKeyDerivationStringData(JNIEnv *env, jobject jParam);
+ CK_RSA_PKCS_PSS_PARAMS jRsaPkcsPssParamToCKRsaPkcsPssParam(JNIEnv *env, jobject jParam);
+ CK_ECDH1_DERIVE_PARAMS jEcdh1DeriveParamToCKEcdh1DeriveParam(JNIEnv *env, jobject jParam);
+diff --git openjdk.orig/jdk/test/sun/security/pkcs11/fips/TestTLS12.java openjdk/jdk/test/sun/security/pkcs11/fips/TestTLS12.java
+new file mode 100644
+--- /dev/null
++++ openjdk/jdk/test/sun/security/pkcs11/fips/TestTLS12.java
+@@ -0,0 +1,449 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ *
++ * 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.
++ */
++
++/*
++ * @test
++ * @bug 8029661
++ * @summary Test TLS 1.2
++ * @library ..
++ * @run main/othervm/timeout=120 TestTLS12
++ */
++
++import java.io.File;
++import java.io.FileInputStream;
++import java.io.InputStream;
++import java.nio.ByteBuffer;
++
++import java.security.interfaces.RSAPrivateKey;
++import java.security.interfaces.RSAPublicKey;
++import java.security.KeyStore;
++import java.security.NoSuchAlgorithmException;
++import java.security.Provider;
++import java.security.SecureRandom;
++import java.security.Security;
++
++import java.util.Arrays;
++
++import javax.crypto.Cipher;
++import javax.crypto.KeyGenerator;
++import javax.crypto.SecretKey;
++import javax.crypto.spec.SecretKeySpec;
++
++import javax.net.ssl.KeyManagerFactory;
++import javax.net.ssl.SSLContext;
++import javax.net.ssl.SSLEngine;
++import javax.net.ssl.SSLEngineResult;
++import javax.net.ssl.SSLEngineResult.HandshakeStatus;
++import javax.net.ssl.SSLParameters;
++import javax.net.ssl.SSLSession;
++import javax.net.ssl.TrustManagerFactory;
++
++import sun.security.internal.spec.TlsMasterSecretParameterSpec;
++import sun.security.internal.spec.TlsPrfParameterSpec;
++import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
++
++public final class TestTLS12 extends SecmodTest {
++
++ private static final boolean enableDebug = true;
++
++ private static Provider sunPKCS11NSSProvider;
++ private static Provider sunJCEProvider;
++ private static com.sun.net.ssl.internal.ssl.Provider jsseProvider;
++ private static KeyStore ks;
++ private static KeyStore ts;
++ private static char[] passphrase = "JAHshj131@@".toCharArray();
++ private static RSAPrivateKey privateKey;
++ private static RSAPublicKey publicKey;
++
++ public static void main(String[] args) throws Exception {
++ try {
++ initialize();
++ } catch (Exception e) {
++ System.out.println("Test skipped: failure during" +
++ " initialization");
++ return;
++ }
++
++ if (shouldRun()) {
++ // Test against JCE
++ testTlsAuthenticationCodeGeneration();
++
++ // Self-integrity test (complete TLS 1.2 communication)
++ new testTLS12SunPKCS11Communication().run();
++
++ System.out.println("Test PASS - OK");
++ } else {
++ System.out.println("Test skipped: TLS 1.2 mechanisms" +
++ " not supported by current SunPKCS11 back-end");
++ }
++ }
++
++ private static boolean shouldRun() {
++ if (sunPKCS11NSSProvider == null) {
++ return false;
++ }
++ try {
++ KeyGenerator.getInstance("SunTls12MasterSecret",
++ sunPKCS11NSSProvider);
++ KeyGenerator.getInstance(
++ "SunTls12RsaPremasterSecret", sunPKCS11NSSProvider);
++ KeyGenerator.getInstance("SunTls12Prf", sunPKCS11NSSProvider);
++ } catch (NoSuchAlgorithmException e) {
++ return false;
++ }
++ return true;
++ }
++
++ private static void testTlsAuthenticationCodeGeneration()
++ throws Exception {
++ // Generate RSA Pre-Master Secret in SunPKCS11 provider
++ SecretKey rsaPreMasterSecret = null;
++ @SuppressWarnings("deprecation")
++ TlsRsaPremasterSecretParameterSpec rsaPreMasterSecretSpec =
++ new TlsRsaPremasterSecretParameterSpec(0x0303, 0x0303);
++ {
++ KeyGenerator rsaPreMasterSecretKG = KeyGenerator.getInstance(
++ "SunTls12RsaPremasterSecret", sunPKCS11NSSProvider);
++ rsaPreMasterSecretKG.init(rsaPreMasterSecretSpec, null);
++ rsaPreMasterSecret = rsaPreMasterSecretKG.generateKey();
++ }
++
++ // Get RSA Pre-Master Secret in plain (from SunPKCS11 provider)
++ byte[] rsaPlainPreMasterSecret = null;
++ {
++ Cipher rsaPreMasterSecretWrapperCipher =
++ Cipher.getInstance("RSA/ECB/PKCS1Padding",
++ sunPKCS11NSSProvider);
++ rsaPreMasterSecretWrapperCipher.init(Cipher.WRAP_MODE, publicKey,
++ new SecureRandom());
++ byte[] rsaEncryptedPreMasterSecret =
++ rsaPreMasterSecretWrapperCipher.wrap(rsaPreMasterSecret);
++ Cipher rsaPreMasterSecretUnwrapperCipher =
++ Cipher.getInstance("RSA/ECB/PKCS1Padding", sunJCEProvider);
++ rsaPreMasterSecretUnwrapperCipher.init(Cipher.UNWRAP_MODE,
++ privateKey, rsaPreMasterSecretSpec);
++ rsaPlainPreMasterSecret = rsaPreMasterSecretUnwrapperCipher.unwrap(
++ rsaEncryptedPreMasterSecret, "TlsRsaPremasterSecret",
++ Cipher.SECRET_KEY).getEncoded();
++
++ if (enableDebug) {
++ System.out.println("rsaPlainPreMasterSecret:");
++ for (byte b : rsaPlainPreMasterSecret) {
++ System.out.printf("%02X, ", b);
++ }
++ System.out.println("");
++ }
++ }
++
++ // Generate Master Secret
++ SecretKey sunPKCS11MasterSecret = null;
++ SecretKey jceMasterSecret = null;
++ {
++ KeyGenerator sunPKCS11MasterSecretGenerator =
++ KeyGenerator.getInstance("SunTls12MasterSecret",
++ sunPKCS11NSSProvider);
++ KeyGenerator jceMasterSecretGenerator = KeyGenerator.getInstance(
++ "SunTls12MasterSecret", sunJCEProvider);
++ @SuppressWarnings("deprecation")
++ TlsMasterSecretParameterSpec sunPKCS11MasterSecretSpec =
++ new TlsMasterSecretParameterSpec(rsaPreMasterSecret, 3, 3,
++ new byte[32], new byte[32], "SHA-256", 32, 64);
++ @SuppressWarnings("deprecation")
++ TlsMasterSecretParameterSpec jceMasterSecretSpec =
++ new TlsMasterSecretParameterSpec(
++ new SecretKeySpec(rsaPlainPreMasterSecret,
++ "Generic"), 3, 3, new byte[32],
++ new byte[32], "SHA-256", 32, 64);
++ sunPKCS11MasterSecretGenerator.init(sunPKCS11MasterSecretSpec,
++ null);
++ jceMasterSecretGenerator.init(jceMasterSecretSpec, null);
++ sunPKCS11MasterSecret =
++ sunPKCS11MasterSecretGenerator.generateKey();
++ jceMasterSecret = jceMasterSecretGenerator.generateKey();
++ if (enableDebug) {
++ System.out.println("Master Secret (SunJCE):");
++ if (jceMasterSecret != null) {
++ for (byte b : jceMasterSecret.getEncoded()) {
++ System.out.printf("%02X, ", b);
++ }
++ System.out.println("");
++ }
++ }
++ }
++
++ // Generate authentication codes
++ byte[] sunPKCS11AuthenticationCode = null;
++ byte[] jceAuthenticationCode = null;
++ {
++ // Generate SunPKCS11 authentication code
++ {
++ @SuppressWarnings("deprecation")
++ TlsPrfParameterSpec sunPKCS11AuthenticationCodeSpec =
++ new TlsPrfParameterSpec(sunPKCS11MasterSecret,
++ "client finished", "a".getBytes(), 12,
++ "SHA-256", 32, 64);
++ KeyGenerator sunPKCS11AuthCodeGenerator =
++ KeyGenerator.getInstance("SunTls12Prf",
++ sunPKCS11NSSProvider);
++ sunPKCS11AuthCodeGenerator.init(
++ sunPKCS11AuthenticationCodeSpec);
++ sunPKCS11AuthenticationCode =
++ sunPKCS11AuthCodeGenerator.generateKey().getEncoded();
++ }
++
++ // Generate SunJCE authentication code
++ {
++ @SuppressWarnings("deprecation")
++ TlsPrfParameterSpec jceAuthenticationCodeSpec =
++ new TlsPrfParameterSpec(jceMasterSecret,
++ "client finished", "a".getBytes(), 12,
++ "SHA-256", 32, 64);
++ KeyGenerator jceAuthCodeGenerator =
++ KeyGenerator.getInstance("SunTls12Prf",
++ sunJCEProvider);
++ jceAuthCodeGenerator.init(jceAuthenticationCodeSpec);
++ jceAuthenticationCode =
++ jceAuthCodeGenerator.generateKey().getEncoded();
++ }
++
++ if (enableDebug) {
++ System.out.println("SunPKCS11 Authentication Code: ");
++ for (byte b : sunPKCS11AuthenticationCode) {
++ System.out.printf("%02X, ", b);
++ }
++ System.out.println("");
++ System.out.println("SunJCE Authentication Code: ");
++ for (byte b : jceAuthenticationCode) {
++ System.out.printf("%02X, ", b);
++ }
++ System.out.println("");
++ }
++ }
++
++ if (sunPKCS11AuthenticationCode == null ||
++ jceAuthenticationCode == null ||
++ sunPKCS11AuthenticationCode.length == 0 ||
++ jceAuthenticationCode.length == 0 ||
++ !Arrays.equals(sunPKCS11AuthenticationCode,
++ jceAuthenticationCode)) {
++ throw new Exception("Authentication codes from JCE" +
++ " and SunPKCS11 differ.");
++ }
++ }
++
++ private static class testTLS12SunPKCS11Communication {
++ public static void run() throws Exception {
++ SSLEngine[][] enginesToTest = getSSLEnginesToTest();
++
++ for (SSLEngine[] engineToTest : enginesToTest) {
++
++ SSLEngine clientSSLEngine = engineToTest[0];
++ SSLEngine serverSSLEngine = engineToTest[1];
++
++ // SSLEngine code based on RedhandshakeFinished.java
++
++ boolean dataDone = false;
++
++ ByteBuffer clientOut = null;
++ ByteBuffer clientIn = null;
++ ByteBuffer serverOut = null;
++ ByteBuffer serverIn = null;
++ ByteBuffer cTOs;
++ ByteBuffer sTOc;
++
++ SSLSession session = clientSSLEngine.getSession();
++ int appBufferMax = session.getApplicationBufferSize();
++ int netBufferMax = session.getPacketBufferSize();
++
++ clientIn = ByteBuffer.allocate(appBufferMax + 50);
++ serverIn = ByteBuffer.allocate(appBufferMax + 50);
++
++ cTOs = ByteBuffer.allocateDirect(netBufferMax);
++ sTOc = ByteBuffer.allocateDirect(netBufferMax);
++
++ clientOut = ByteBuffer.wrap(
++ "Hi Server, I'm Client".getBytes());
++ serverOut = ByteBuffer.wrap(
++ "Hello Client, I'm Server".getBytes());
++
++ SSLEngineResult clientResult;
++ SSLEngineResult serverResult;
++
++ while (!dataDone) {
++ clientResult = clientSSLEngine.wrap(clientOut, cTOs);
++ runDelegatedTasks(clientResult, clientSSLEngine);
++ serverResult = serverSSLEngine.wrap(serverOut, sTOc);
++ runDelegatedTasks(serverResult, serverSSLEngine);
++ cTOs.flip();
++ sTOc.flip();
++
++ if (enableDebug) {
++ System.out.println("Client -> Network");
++ printTlsNetworkPacket("", cTOs);
++ System.out.println("");
++ System.out.println("Server -> Network");
++ printTlsNetworkPacket("", sTOc);
++ System.out.println("");
++ }
++
++ clientResult = clientSSLEngine.unwrap(sTOc, clientIn);
++ runDelegatedTasks(clientResult, clientSSLEngine);
++ serverResult = serverSSLEngine.unwrap(cTOs, serverIn);
++ runDelegatedTasks(serverResult, serverSSLEngine);
++
++ cTOs.compact();
++ sTOc.compact();
++
++ if (!dataDone &&
++ (clientOut.limit() == serverIn.position()) &&
++ (serverOut.limit() == clientIn.position())) {
++ checkTransfer(serverOut, clientIn);
++ checkTransfer(clientOut, serverIn);
++ dataDone = true;
++ }
++ }
++ }
++ }
++
++ static void printTlsNetworkPacket(String prefix, ByteBuffer bb) {
++ ByteBuffer slice = bb.slice();
++ byte[] buffer = new byte[slice.remaining()];
++ slice.get(buffer);
++ for (int i = 0; i < buffer.length; i++) {
++ System.out.printf("%02X, ", (byte)(buffer[i] & (byte)0xFF));
++ if (i % 8 == 0 && i % 16 != 0) {
++ System.out.print(" ");
++ }
++ if (i % 16 == 0) {
++ System.out.println("");
++ }
++ }
++ System.out.flush();
++ }
++
++ private static void checkTransfer(ByteBuffer a, ByteBuffer b)
++ throws Exception {
++ a.flip();
++ b.flip();
++ if (!a.equals(b)) {
++ throw new Exception("Data didn't transfer cleanly");
++ }
++ a.position(a.limit());
++ b.position(b.limit());
++ a.limit(a.capacity());
++ b.limit(b.capacity());
++ }
++
++ private static void runDelegatedTasks(SSLEngineResult result,
++ SSLEngine engine) throws Exception {
++
++ if (result.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
++ Runnable runnable;
++ while ((runnable = engine.getDelegatedTask()) != null) {
++ runnable.run();
++ }
++ HandshakeStatus hsStatus = engine.getHandshakeStatus();
++ if (hsStatus == HandshakeStatus.NEED_TASK) {
++ throw new Exception(
++ "handshake shouldn't need additional tasks");
++ }
++ }
++ }
++
++ private static SSLEngine[][] getSSLEnginesToTest() throws Exception {
++ SSLEngine[][] enginesToTest = new SSLEngine[2][2];
++ String[][] preferredSuites = new String[][]{ new String[] {
++ "TLS_RSA_WITH_AES_128_CBC_SHA256"
++ }, new String[] {
++ "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"
++ }};
++ for (int i = 0; i < enginesToTest.length; i++) {
++ enginesToTest[i][0] = createSSLEngine(true);
++ enginesToTest[i][1] = createSSLEngine(false);
++ enginesToTest[i][0].setEnabledCipherSuites(preferredSuites[i]);
++ enginesToTest[i][1].setEnabledCipherSuites(preferredSuites[i]);
++ }
++ return enginesToTest;
++ }
++
++ static private SSLEngine createSSLEngine(boolean client)
++ throws Exception {
++ SSLEngine ssle;
++ KeyManagerFactory kmf = KeyManagerFactory.getInstance("PKIX",
++ jsseProvider);
++ kmf.init(ks, passphrase);
++
++ TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX",
++ jsseProvider);
++ tmf.init(ts);
++
++ SSLContext sslCtx = SSLContext.getInstance("TLSv1.2",
++ jsseProvider);
++ sslCtx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
++ ssle = sslCtx.createSSLEngine("localhost", 443);
++ ssle.setUseClientMode(client);
++ SSLParameters sslParameters = ssle.getSSLParameters();
++ ssle.setSSLParameters(sslParameters);
++
++ return ssle;
++ }
++ }
++
++ private static void initialize() throws Exception {
++ if (initSecmod() == false) {
++ return;
++ }
++ String configName = BASE + SEP + "fips.cfg";
++ sunPKCS11NSSProvider = getSunPKCS11(configName);
++ System.out.println("SunPKCS11 provider: " + sunPKCS11NSSProvider);
++ Security.addProvider(sunPKCS11NSSProvider);
++
++ sunJCEProvider = new com.sun.crypto.provider.SunJCE();
++ Security.addProvider(sunJCEProvider);
++
++ Security.removeProvider("SunJSSE");
++ jsseProvider =new com.sun.net.ssl.internal.ssl.Provider(
++ sunPKCS11NSSProvider);
++ Security.addProvider(jsseProvider);
++ System.out.println(jsseProvider.getInfo());
++
++ ks = KeyStore.getInstance("PKCS11", sunPKCS11NSSProvider);
++ ks.load(null, "test12".toCharArray());
++ ts = ks;
++
++ KeyStore ksPlain = readTestKeyStore();
++ privateKey = (RSAPrivateKey)ksPlain.getKey("rh_rsa_sha256",
++ passphrase);
++ publicKey = (RSAPublicKey)ksPlain.getCertificate(
++ "rh_rsa_sha256").getPublicKey();
++ }
++
++ private static KeyStore readTestKeyStore() throws Exception {
++ File file = new File(System.getProperty("test.src", "."), "keystore");
++ InputStream in = new FileInputStream(file);
++ KeyStore ks = KeyStore.getInstance("JKS");
++ ks.load(in, "passphrase".toCharArray());
++ in.close();
++ return ks;
++ }
++}
+\ No newline at end of file
diff --git a/jdk8035341-allow_using_system_installed_libpng.patch b/jdk8035341-allow_using_system_installed_libpng.patch
new file mode 100644
index 0000000..53661d8
--- /dev/null
+++ b/jdk8035341-allow_using_system_installed_libpng.patch
@@ -0,0 +1,115 @@
+diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
+--- jdk8/common/autoconf/libraries.m4 2013-11-14 20:08:01.845065585 -0500
++++ jdk8/common/autoconf/libraries.m4 2013-11-14 20:10:56.186553066 -0500
+@@ -676,6 +676,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
+ #
+
+diff -ruN jdk8/common/autoconf/spec.gmk.in jdk8/common/autoconf/spec.gmk.in
+--- jdk8/common/autoconf/spec.gmk.in 2013-10-31 19:24:33.000000000 -0400
++++ jdk8/common/autoconf/spec.gmk.in 2013-11-14 21:10:56.365976518 -0500
+@@ -548,6 +548,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@
+diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.gmk
+--- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 20:08:01.845065585 -0500
++++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 20:14:10.791982343 -0500
+@@ -1183,7 +1183,6 @@
+
+ ifndef BUILD_HEADLESS_ONLY
+ LIBSPLASHSCREEN_DIRS := \
+- $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
+
+ ifeq ($(USE_EXTERNAL_LIBGIF), true)
+@@ -1200,6 +1199,13 @@
+ LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/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
+@@ -1263,12 +1269,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), \
++ $(LIBZ) $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(LIBPNG_LDFLAGS), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+diff -ruN jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
+--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2013-10-31 19:44:18.000000000 -0400
++++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2013-11-14 20:14:41.363892797 -0500
+@@ -25,8 +25,7 @@
+
+ #include "splashscreen_impl.h"
+
+-#include "../libpng/png.h"
+-
++#include <png.h>
+ #include <setjmp.h>
+
+ #define SIG_BYTES 8
diff --git a/jdk8042159-allow_using_system_installed_lcms2.patch b/jdk8042159-allow_using_system_installed_lcms2.patch
new file mode 100644
index 0000000..6f39b57
--- /dev/null
+++ b/jdk8042159-allow_using_system_installed_lcms2.patch
@@ -0,0 +1,118 @@
+diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
+--- openjdk/common/autoconf/libraries.m4 2013-11-14 22:04:38.039440136 -0500
++++ openjdk/common/autoconf/libraries.m4 2013-11-14 22:05:11.474356424 -0500
+@@ -676,6 +676,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
+ #
+
+diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.gmk
+--- openjdk/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 22:04:38.040440133 -0500
++++ openjdk/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 22:05:11.475356411 -0500
+@@ -666,18 +666,35 @@
+
+ ##########################################################################################
+
++LIBLCMS_DIR := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms
++
++ifeq ($(USE_EXTERNAL_LCMS), true)
++ # If we're using an external library, we'll just need the wrapper part.
++ # By including it explicitely, all other files will be excluded.
++ BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c
++ BUILD_LIBLCMS_HEADERS :=
++else
++ BUILD_LIBLCMS_INCLUDE_FILES :=
++ # If we're using the bundled library, we'll need to include it in the
++ # include path explicitly. Otherwise the system headers will be used.
++ BUILD_LIBLCMS_HEADERS := -I$(LIBLCMS_DIR)
++endif
++
+ # TODO: Update awt lib path when awt is converted
+ $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
+ LIBRARY := lcms, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+- SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
++ SRC := $(LIBLCMS_DIR), \
++ INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
+ LANG := C, \
+ OPTIMIZATION := HIGHEST, \
+ CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
+ -DCMS_DONT_USE_FAST_FLOOR \
+ $(SHARED_LIBRARY_FLAGS) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
+- -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
++ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
++ $(BUILD_LIBLCMS_HEADERS) \
++ $(LCMS_CFLAGS), \
+ CFLAGS_solaris := -xc99=no_lib, \
+ CFLAGS_windows := -DCMS_IS_WINDOWS_, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
+@@ -685,10 +702,10 @@
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
+ 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_aix := -lm -lawt -ljava -ljvm,\
++ LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc $(LCMS_LIBS), \
++ LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm $(LCMS_LIBS), \
++ LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm $(LCMS_LIBS), \
++ LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm $(LCMS_LIBS),\
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=lcms.dll" \
+diff -r 3d1c3b0b73a3 src/share/native/sun/java2d/cmm/lcms/LCMS.c
+--- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Tue Sep 08 22:31:26 2015 +0300
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Thu Oct 15 05:29:28 2015 +0100
+@@ -30,7 +30,7 @@
+ #include "jni_util.h"
+ #include "Trace.h"
+ #include "Disposer.h"
+-#include "lcms2.h"
++#include <lcms2.h>
+ #include "jlong.h"
+
+
diff --git a/jdk8043805-allow_using_system_installed_libjpeg.patch b/jdk8043805-allow_using_system_installed_libjpeg.patch
new file mode 100644
index 0000000..003f32b
--- /dev/null
+++ b/jdk8043805-allow_using_system_installed_libjpeg.patch
@@ -0,0 +1,228 @@
+diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
+--- jdk8/common/autoconf/libraries.m4 2013-10-31 19:24:33.000000000 -0400
++++ jdk8/common/autoconf/libraries.m4 2013-11-14 21:55:20.249903347 -0500
+@@ -601,12 +601,42 @@
+ #
+
+ 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])
+- ])
++ AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg],
++ [use libjpeg from build system or OpenJDK sources (system, bundled) @<:@bundled@:>@])])
++
++ AC_CHECK_LIB(jpeg, jpeg_destroy_compress,
++ [ LIBJPEG_FOUND=yes ],
++ [ LIBJPEG_FOUND=no ])
++
++ 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
++
++ if test "x${with_libjpeg}" = "xbundled"; then
++ USE_EXTERNAL_LIBJPEG=false
++ AC_MSG_RESULT([bundled])
++ elif test "x${with_libjpeg}" = "xsystem"; then
++ if test "x${LIBJPEG_FOUND}" = "xyes"; then
++ USE_EXTERNAL_LIBJPEG=true
++ AC_MSG_RESULT([system])
++ else
++ AC_MSG_RESULT([system not found])
++ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])
++ fi
++ else
++ AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled'])
++ fi
+ AC_SUBST(USE_EXTERNAL_LIBJPEG)
+
++
+ ###############################################################################
+ #
+ # Check for the gif library
+diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.gmk
+--- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-10-31 19:44:18.000000000 -0400
++++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 21:56:01.020796703 -0500
+@@ -693,17 +693,17 @@
+ ##########################################################################################
+
+ 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_LIBJPEG_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
+
+@@ -718,37 +718,38 @@
+ # $(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, \
++$(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \
++ LIBRARY := javajpeg, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+- SRC := $(BUILD_LIBJPEG_CLOSED_SRC) \
++ SRC := $(BUILD_LIBJAVAJPEG_CLOSED_SRC) \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
+ LANG := C, \
+ OPTIMIZATION := HIGHEST, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+- $(BUILD_LIBJPEG_CLOSED_INCLUDES) \
++ $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
+- MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \
+- LDFLAGS := $(LDFLAGS_JDKLIB) \
++ MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
++ LDFLAGS := $(subst -Xlinker --as-needed,, \
++ $(subst -Wl$(COMMA)--as-needed,, $(LDFLAGS_JDKLIB))) -ljpeg \
+ $(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), \
+- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \
++ REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
++ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavajpeg, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+-$(BUILD_LIBJPEG): $(BUILD_LIBJAVA)
++$(BUILD_LIBJAVAJPEG): $(BUILD_LIBJAVA)
+
+-BUILD_LIBRARIES += $(BUILD_LIBJPEG)
++BUILD_LIBRARIES += $(BUILD_LIBJAVAJPEG)
+
+ ##########################################################################################
+
+@@ -1127,7 +1128,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
+
+@@ -1138,6 +1138,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/jpeg
++ endif
++
+ ifneq ($(OPENJDK_TARGET_OS), macosx)
+ LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
+ else
+@@ -1193,11 +1200,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) \
+diff -ruN jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
+--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2013-10-31 19:44:18.000000000 -0400
++++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2013-11-14 21:55:20.250903340 -0500
+@@ -89,7 +89,7 @@
+ java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction<Void>() {
+ public Void run() {
+- System.loadLibrary("jpeg");
++ System.loadLibrary("javajpeg");
+ return null;
+ }
+ });
+diff -ruN jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
+--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2013-10-31 19:44:18.000000000 -0400
++++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2013-11-14 21:55:20.250903340 -0500
+@@ -179,7 +179,7 @@
+ java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction<Void>() {
+ public Void run() {
+- System.loadLibrary("jpeg");
++ System.loadLibrary("javajpeg");
+ return null;
+ }
+ });
+diff -ruN jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java
+--- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2013-10-31 19:44:18.000000000 -0400
++++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2013-11-14 21:55:20.251903376 -0500
+@@ -56,7 +56,7 @@
+ java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction<Void>() {
+ public Void run() {
+- System.loadLibrary("jpeg");
++ System.loadLibrary("javajpeg");
+ return null;
+ }
+ });
+diff -ruN jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
+--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-10-31 19:44:18.000000000 -0400
++++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-11-14 21:55:20.251903376 -0500
+@@ -25,7 +25,6 @@
+
+ #include "splashscreen_impl.h"
+
+-#include "jinclude.h"
+ #include "jpeglib.h"
+ #include "jerror.h"
+
+@@ -107,11 +106,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;
diff --git a/jdk8044235-src_zip_should_include_all_sources.patch b/jdk8044235-src_zip_should_include_all_sources.patch
new file mode 100644
index 0000000..1beda6d
--- /dev/null
+++ b/jdk8044235-src_zip_should_include_all_sources.patch
@@ -0,0 +1,109 @@
+# HG changeset patch
+# User omajid
+# Date 1401638044 14400
+# Sun Jun 01 11:54:04 2014 -0400
+# Node ID fd78f7e83f3f1ce7d363b681b97583138218afcb
+# Parent 8d0af21b5b9789f97b05edacc221a63f851d13b8
+8044235: src.zip should include all sources
+Reviewed-by: andrew, dholmes
+
+diff --git a/make/CreateJars.gmk b/make/CreateJars.gmk
+--- openjdk/jdk/make/CreateJars.gmk
++++ openjdk/jdk/make/CreateJars.gmk
+@@ -584,40 +584,53 @@
+
+ ##########################################################################################
+
+-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 \
+- 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 \
+- #
++ifdef OPENJDK
++ SRC_ZIP_INCLUDES = \
++ com \
++ java \
++ javax \
++ jdk \
++ org \
++ sun \
++ #
++ SRC_ZIP_EXCLUDES =
++else
++ 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 \
++ 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 \
++ #
++ SRC_ZIP_EXCLUDES = javax/swing/beaninfo
++endif
+
+ SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes
+ SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc
+@@ -648,7 +661,7 @@
+ $(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
+ SRC := $(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src, \
+ INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \
+- EXCLUDES := javax/swing/beaninfo, \
++ EXCLUDES := $(SRC_ZIP_EXCLUDES), \
+ SUFFIXES := .java .c .h, \
+ ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
+ EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))
diff --git a/jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch b/jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
new file mode 100644
index 0000000..e91abd3
--- /dev/null
+++ b/jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
@@ -0,0 +1,191 @@
+# HG changeset patch
+# User stefank
+# Date 1525453613 -3600
+# Fri May 04 18:06:53 2018 +0100
+# Node ID 07a1135a327362f157955d470fad5df07cc35164
+# Parent de79964656fc652f2085dac4fe99bcc128b5a3b1
+8062808, PR3548: Turn on the -Wreturn-type warning
+Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett
+
+diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
++++ openjdk/hotspot/make/linux/makefiles/gcc.make
+@@ -210,7 +210,7 @@
+ WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body
+ endif
+
+-WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value
++WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value -Wreturn-type
+
+ ifeq ($(USE_CLANG),)
+ # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
+diff --git openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
+--- openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad
++++ openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
+@@ -1250,6 +1250,7 @@
+
+
+ Unimplemented();
++ return 0; // Mute compiler
+ }
+
+ #ifndef PRODUCT
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+@@ -541,6 +541,7 @@
+ err.report_and_die();
+
+ ShouldNotReachHere();
++ return true; // Mute compiler
+ }
+
+ void os::Linux::init_thread_fpu_state(void) {
+diff --git openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
+--- openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp
++++ openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
+@@ -506,7 +506,7 @@
+ ss.write((const char*)name->bytes(), name->utf8_length());
+ ss.write((const char*)signature->bytes(), signature->utf8_length());
+ ss.print(" is abstract");
+- return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
++ return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
+ }
+
+ Symbol* MethodFamily::generate_conflicts_message(GrowableArray<Method*>* methods, TRAPS) const {
+@@ -521,7 +521,7 @@
+ ss.print(".");
+ ss.write((const char*)name->bytes(), name->utf8_length());
+ }
+- return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
++ return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
+ }
+
+
+diff --git openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
+--- openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp
++++ openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
+@@ -249,7 +249,7 @@
+ MutexLocker ml(SymbolTable_lock, THREAD);
+
+ // Otherwise, add to symbol to table
+- return the_table()->basic_add(index, (u1*)name, len, hashValue, true, CHECK_NULL);
++ return the_table()->basic_add(index, (u1*)name, len, hashValue, true, THREAD);
+ }
+
+ Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) {
+@@ -288,7 +288,7 @@
+ // Grab SymbolTable_lock first.
+ MutexLocker ml(SymbolTable_lock, THREAD);
+
+- return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, CHECK_NULL);
++ return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, THREAD);
+ }
+
+ Symbol* SymbolTable::lookup_only(const char* name, int len,
+diff --git openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
+--- openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp
++++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
+@@ -229,15 +229,15 @@
+ class_name->as_C_string(),
+ class_loader.is_null() ? "null" : class_loader->klass()->name()->as_C_string()));
+ if (FieldType::is_array(class_name)) {
+- return resolve_array_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
++ return resolve_array_class_or_null(class_name, class_loader, protection_domain, THREAD);
+ } else if (FieldType::is_obj(class_name)) {
+ ResourceMark rm(THREAD);
+ // Ignore wrapping L and ;.
+ TempNewSymbol name = SymbolTable::new_symbol(class_name->as_C_string() + 1,
+ class_name->utf8_length() - 2, CHECK_NULL);
+- return resolve_instance_class_or_null(name, class_loader, protection_domain, CHECK_NULL);
++ return resolve_instance_class_or_null(name, class_loader, protection_domain, THREAD);
+ } else {
+- return resolve_instance_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
++ return resolve_instance_class_or_null(class_name, class_loader, protection_domain, THREAD);
+ }
+ }
+
+diff --git openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
+--- openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp
++++ openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
+@@ -367,7 +367,7 @@
+ _csv_format(csv_format), _print_help(print_help),
+ _print_class_stats(print_class_stats), _columns(columns) {}
+ void heap_inspection(outputStream* st) NOT_SERVICES_RETURN;
+- size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN;
++ size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN_(0);
+ static void find_instances_at_safepoint(Klass* k, GrowableArray<oop>* result) NOT_SERVICES_RETURN;
+ private:
+ void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL);
+diff --git openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
+--- openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp
++++ openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
+@@ -93,7 +93,7 @@
+ static void preload_and_dump(TRAPS) NOT_CDS_RETURN;
+ static int preload_and_dump(const char * class_list_path,
+ GrowableArray<Klass*>* class_promote_order,
+- TRAPS) NOT_CDS_RETURN;
++ TRAPS) NOT_CDS_RETURN_(0);
+
+ static ReservedSpace* shared_rs() {
+ CDS_ONLY(return _shared_rs);
+diff --git openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp openjdk/hotspot/src/share/vm/oops/constantPool.hpp
+--- openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp
++++ openjdk/hotspot/src/share/vm/oops/constantPool.hpp
+@@ -352,7 +352,7 @@
+
+ Klass* klass_at(int which, TRAPS) {
+ constantPoolHandle h_this(THREAD, this);
+- return klass_at_impl(h_this, which, CHECK_NULL);
++ return klass_at_impl(h_this, which, THREAD);
+ }
+
+ Symbol* klass_name_at(int which); // Returns the name, w/o resolving.
+diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
+--- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
++++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
+@@ -4244,7 +4244,7 @@
+ JVM_DTraceProvider* providers))
+ JVMWrapper("JVM_DTraceActivate");
+ return DTraceJSDT::activate(
+- version, module_name, providers_count, providers, CHECK_0);
++ version, module_name, providers_count, providers, THREAD);
+ JVM_END
+
+ JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method))
+diff --git openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp openjdk/hotspot/src/share/vm/runtime/reflection.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp
++++ openjdk/hotspot/src/share/vm/runtime/reflection.cpp
+@@ -1093,7 +1093,7 @@
+ } else {
+ if (rtype == T_BOOLEAN || rtype == T_BYTE || rtype == T_CHAR || rtype == T_SHORT)
+ narrow((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
+- return box((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
++ return box((jvalue*) result.get_value_addr(), rtype, THREAD);
+ }
+ }
+
+diff --git openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp
++++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
+@@ -1046,7 +1046,7 @@
+ // last java frame on stack (which includes native call frames)
+ vframeStream vfst(thread, true); // Do not skip and javaCalls
+
+- return find_callee_info_helper(thread, vfst, bc, callinfo, CHECK_(Handle()));
++ return find_callee_info_helper(thread, vfst, bc, callinfo, THREAD);
+ }
+
+
+diff --git openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp openjdk/hotspot/src/share/vm/services/memTracker.hpp
+--- openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp
++++ openjdk/hotspot/src/share/vm/services/memTracker.hpp
+@@ -64,7 +64,7 @@
+ const NativeCallStack& stack, MEMFLAGS flag = mtNone) { }
+ static inline void record_virtual_memory_commit(void* addr, size_t size, const NativeCallStack& stack) { }
+ static inline Tracker get_virtual_memory_uncommit_tracker() { return Tracker(); }
+- static inline Tracker get_virtual_memory_release_tracker() { }
++ static inline Tracker get_virtual_memory_release_tracker() { return Tracker(); }
+ static inline void record_virtual_memory_type(void* addr, MEMFLAGS flag) { }
+ static inline void record_thread_stack(void* addr, size_t size) { }
+ static inline void release_thread_stack(void* addr, size_t size) { }
diff --git a/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch b/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch
new file mode 100644
index 0000000..790ee0d
--- /dev/null
+++ b/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch
@@ -0,0 +1,28 @@
+# HG changeset patch
+# User goetz
+# Date 1415873641 -3600
+# Thu Nov 13 11:14:01 2014 +0100
+# Node ID 1878c4c1d04e1f3c6f67a19d36c35863d6b5f906
+# Parent 533473c67de6ff767710594639033c8e83523fe5
+8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning
+Reviewed-by: stefank, tschatzl
+
+diff --git openjdk.orig/hotspot/src/share/vm/prims/jni.cpp openjdk/hotspot/src/share/vm/prims/jni.cpp
+--- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp
++++ openjdk/hotspot/src/share/vm/prims/jni.cpp
+@@ -708,6 +708,7 @@
+
+ THROW_OOP_(JNIHandles::resolve(obj), JNI_OK);
+ ShouldNotReachHere();
++ return 0; // Mute compiler.
+ JNI_END
+
+ #ifndef USDT2
+@@ -734,6 +735,7 @@
+ Handle protection_domain (THREAD, k->protection_domain());
+ THROW_MSG_LOADER_(name, (char *)message, class_loader, protection_domain, JNI_OK);
+ ShouldNotReachHere();
++ return 0; // Mute compiler.
+ JNI_END
+
+
diff --git a/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_jdk.patch b/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_jdk.patch
new file mode 100644
index 0000000..f79be53
--- /dev/null
+++ b/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_jdk.patch
@@ -0,0 +1,98 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1537884792 -7200
+# Tue Sep 25 16:13:12 2018 +0200
+# Node ID fd140d7550992267e3f0f08a20b461b2ce9fa740
+# Parent 21056af0d1eabbd04d7a223c01a28320c7010bfe
+8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling
+Reviewed-by: erikj, goetz, dholmes
+
+diff --git openjdk.orig/jdk/make/lib/SoundLibraries.gmk openjdk/jdk/make/lib/SoundLibraries.gmk
+--- openjdk/jdk/make/lib/SoundLibraries.gmk Tue Jan 12 21:01:12 2016 +0000
++++ openjdk/jdk/make/lib/SoundLibraries.gmk Wed Jan 13 00:18:02 2016 +0000
+@@ -140,6 +140,10 @@
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC64
+ endif
+
++ ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
++ LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC64LE
++ endif
++
+ ifeq ($(OPENJDK_TARGET_CPU), aarch64)
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_AARCH64
+ endif
+diff -r 1fe56343ecc8 openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
+--- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Tue Jan 12 21:01:12 2016 +0000
++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Wed Jan 13 00:18:02 2016 +0000
+@@ -44,6 +44,8 @@
+ #define X_ARM 7
+ #define X_PPC 8
+ #define X_AARCH64 9
++#define X_PPC64 10
++#define X_PPC64LE 11
+
+ // **********************************
+ // Make sure you set X_PLATFORM and X_ARCH defines correctly.
+diff --git openjdk.orig/jdk/src/solaris/bin/ppc64le/jvm.cfg openjdk/jdk/src/solaris/bin/ppc64le/jvm.cfg
+new file mode 100644
+--- /dev/null
++++ openjdk/jdk/src/solaris/bin/ppc64le/jvm.cfg
+@@ -0,0 +1,34 @@
++# 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
++-client IGNORE
+diff --git openjdk.orig/test/sun/security/pkcs11/PKCS11Test.java openjdk/test/sun/security/pkcs11/PKCS11Test.java
+--- openjdk.orig/jdk/test/sun/security/pkcs11/PKCS11Test.java
++++ openjdk/jdk/test/sun/security/pkcs11/PKCS11Test.java
+@@ -505,6 +505,8 @@
+ osMap.put("Linux-amd64-64", new String[]{
+ "/usr/lib/x86_64-linux-gnu/", "/usr/lib/x86_64-linux-gnu/nss/",
+ "/usr/lib64/"});
++ osMap.put("Linux-ppc64-64", new String[]{"/usr/lib64/"});
++ osMap.put("Linux-ppc64le-64", new String[]{"/usr/lib64/"});
+ osMap.put("Windows-x86-32", new String[]{
+ PKCS11_BASE + "/nss/lib/windows-i586/".replace('/', SEP)});
+ osMap.put("Windows-amd64-64", new String[]{
+diff --git openjdk.orig/jdk/test/tools/launcher/Settings.java openjdk/jdk/test/tools/launcher/Settings.java
+--- openjdk.orig/jdk/test/tools/launcher/Settings.java
++++ openjdk/jdk/test/tools/launcher/Settings.java
+@@ -74,7 +74,7 @@
+
+ static void runTestOptionDefault() throws IOException {
+ String stackSize = "256"; // in kb
+- if (getArch().equals("ppc64")) {
++ if (getArch().equals("ppc64") || getArch().equals("ppc64le")) {
+ stackSize = "800";
+ }
+ TestResult tr = null;
diff --git a/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch b/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch
new file mode 100644
index 0000000..67fc620
--- /dev/null
+++ b/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch
@@ -0,0 +1,47 @@
+# HG changeset patch
+# User asmundak
+# Date 1537883922 -7200
+# Tue Sep 25 15:58:42 2018 +0200
+# Node ID 2fabe07c0bd8bf21400313f3bb9b8e80fcb31724
+# Parent 91867683f73de3882ef88981a79995beeeb1e980
+8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling
+Reviewed-by: erikj, goetz, dholmes
+Contributed-by: Andrew Hughes <gnu.andrew(a)redhat.com>, Alexander Smundak <asmundak(a)google.com>
+
+diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/flags.m4
+--- openjdk.orig///common/autoconf/flags.m4
++++ openjdk///common/autoconf/flags.m4
+@@ -549,6 +549,9 @@
+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN"
+ fi
+ fi
++ if test "x$OPENJDK_TARGET_CPU" = xppc64le; then
++ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DABI_ELFv2"
++ fi
+
+ # Setup target OS define. Use OS target name but in upper case.
+ OPENJDK_TARGET_OS_UPPERCASE=`$ECHO $OPENJDK_TARGET_OS | $TR 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+diff --git openjdk.orig///common/autoconf/jdk-options.m4 openjdk///common/autoconf/jdk-options.m4
+--- openjdk.orig///common/autoconf/jdk-options.m4
++++ openjdk///common/autoconf/jdk-options.m4
+@@ -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
+ AC_SUBST(INCLUDE_SA)
+diff --git openjdk.orig///common/autoconf/platform.m4 openjdk///common/autoconf/platform.m4
+--- openjdk.orig///common/autoconf/platform.m4
++++ openjdk///common/autoconf/platform.m4
+@@ -67,7 +67,7 @@
+ VAR_CPU_ENDIAN=big
+ ;;
+ powerpc64le)
+- VAR_CPU=ppc64
++ VAR_CPU=ppc64le
+ VAR_CPU_ARCH=ppc
+ VAR_CPU_BITS=64
+ VAR_CPU_ENDIAN=little
diff --git a/jdk8073139-pr2236-rh1191652--use_ppc64le_as_the_arch_directory_on_that_platform_and_report_it_in_os_arch_aarch64_forest.patch b/jdk8073139-pr2236-rh1191652--use_ppc64le_as_the_arch_directory_on_that_platform_and_report_it_in_os_arch_aarch64_forest.patch
new file mode 100644
index 0000000..a5afea0
--- /dev/null
+++ b/jdk8073139-pr2236-rh1191652--use_ppc64le_as_the_arch_directory_on_that_platform_and_report_it_in_os_arch_aarch64_forest.patch
@@ -0,0 +1,130 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1537885415 -7200
+# Tue Sep 25 16:23:35 2018 +0200
+# Node ID 5044428520866481f438bfd1375da75adbc89243
+# Parent a3df1579a8647b06559f41d345da7bea162b26e9
+8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling
+Reviewed-by: erikj, goetz, dholmes
+
+diff --git a/make/defs.make b/make/defs.make
+--- openjdk/hotspot/make/defs.make
++++ openjdk/hotspot/make/defs.make
+@@ -285,7 +285,7 @@ ifneq ($(OSNAME),windows)
+
+ # Use uname output for SRCARCH, but deal with platform differences. If ARCH
+ # is not explicitly listed below, it is treated as x86.
+- SRCARCH ?= $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 ppc ppc64 zero aarch64,$(ARCH)))
++ SRCARCH ?= $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 ppc ppc64 ppc64le zero aarch64,$(ARCH)))
+ ARCH/ = x86
+ ARCH/sparc = sparc
+ ARCH/sparc64= sparc
+@@ -293,6 +293,7 @@ ifneq ($(OSNAME),windows)
+ ARCH/amd64 = x86
+ ARCH/x86_64 = x86
+ ARCH/ppc64 = ppc
++ ARCH/ppc64le= ppc
+ ARCH/ppc = ppc
+ ARCH/zero = zero
+ ARCH/aarch64 = aarch64
+@@ -316,7 +317,12 @@
+ endif
+ endif
+
+- # LIBARCH is 1:1 mapping from BUILDARCH
++ # LIBARCH is 1:1 mapping from BUILDARCH, except for ARCH=ppc64le
++ ifeq ($(ARCH),ppc64le)
++ LIBARCH ?= ppc64le
++ else
++ LIBARCH ?= $(LIBARCH/$(BUILDARCH))
++ endif
+ LIBARCH ?= $(LIBARCH/$(BUILDARCH))
+ LIBARCH/i486 = i386
+ LIBARCH/amd64 = amd64
+diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -1956,7 +1956,7 @@
+ {EM_SPARCV9, EM_SPARCV9, ELFCLASS64, ELFDATA2MSB, (char*)"Sparc v9 64"},
+ {EM_PPC, EM_PPC, ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"},
+ #if defined(VM_LITTLE_ENDIAN)
+- {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2LSB, (char*)"Power PC 64"},
++ {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2LSB, (char*)"Power PC 64 LE"},
+ #else
+ {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"},
+ #endif
+diff --git a/src/share/tools/hsdis/Makefile b/src/share/tools/hsdis/Makefile
+--- openjdk/hotspot/src/share/tools/hsdis/Makefile
++++ openjdk/hotspot/src/share/tools/hsdis/Makefile
+@@ -97,6 +97,7 @@
+ CFLAGS/sparcv9 += -m64
+ CFLAGS/amd64 += -m64
+ CFLAGS/ppc64 += -m64
++CFLAGS/ppc64le += -m64 -DABI_ELFv2
+ else
+ ARCH=$(ARCH1:amd64=i386)
+ CFLAGS/i386 += -m32
+diff --git a/src/share/tools/hsdis/hsdis-demo.c b/src/share/tools/hsdis/hsdis-demo.c
+--- openjdk/hotspot/src/share/tools/hsdis/hsdis-demo.c
++++ openjdk/hotspot/src/share/tools/hsdis/hsdis-demo.c
+@@ -88,7 +88,7 @@
+ printf("...And now for something completely different:\n");
+ void *start = (void*) &main;
+ void *end = (void*) &end_of_file;
+-#if defined(__ia64) || defined(__powerpc__)
++#if defined(__ia64) || (defined(__powerpc__) && !defined(ABI_ELFv2))
+ /* On IA64 and PPC function pointers are pointers to function descriptors */
+ start = *((void**)start);
+ end = *((void**)end);
+diff --git a/src/share/tools/hsdis/hsdis.c b/src/share/tools/hsdis/hsdis.c
+--- openjdk/hotspot/src/share/tools/hsdis/hsdis.c
++++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c
+@@ -461,7 +461,7 @@ static const char* native_arch_name() {
+ #ifdef LIBARCH_sparcv9
+ res = "sparc:v9b";
+ #endif
+-#ifdef LIBARCH_ppc64
++#if defined(LIBARCH_ppc64) || defined(LIBARCH_ppc64le)
+ res = "powerpc:common64";
+ #endif
+ #else
+diff --git a/src/share/vm/runtime/vm_version.cpp b/src/share/vm/runtime/vm_version.cpp
+--- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
+@@ -187,11 +187,16 @@ const char* Abstract_VM_Version::jre_release_version() {
+ #ifndef CPU
+ #ifdef ZERO
+ #define CPU ZERO_LIBARCH
++#elif defined(PPC64)
++#if defined(VM_LITTLE_ENDIAN)
++#define CPU "ppc64le"
++#else
++#define CPU "ppc64"
++#endif
+ #else
+ #define CPU IA32_ONLY("x86") \
+ IA64_ONLY("ia64") \
+ AMD64_ONLY("amd64") \
+- PPC64_ONLY("ppc64") \
+ AARCH64_ONLY("aarch64") \
+ SPARC_ONLY("sparc")
+ #endif // ZERO
+diff --git a/test/test_env.sh b/test/test_env.sh
+--- openjdk/hotspot/test/test_env.sh
++++ openjdk/hotspot/test/test_env.sh
+@@ -185,6 +185,15 @@
+ if [ $? = 0 ]
+ then
+ VM_CPU="ppc"
++ if [ $VM_BITS = "64" ]
++ then
++ VM_CPU="ppc64"
++ grep "ppc64le" vm_version.out > ${NULL}
++ if [ $? = 0 ]
++ then
++ VM_CPU="ppc64le"
++ fi
++ fi
+ fi
+ grep "ia64" vm_version.out > ${NULL}
+ if [ $? = 0 ]
diff --git a/jdk8131048-pr3574-rh1498936-ppc_crc32.patch b/jdk8131048-pr3574-rh1498936-ppc_crc32.patch
new file mode 100644
index 0000000..d7b94e6
--- /dev/null
+++ b/jdk8131048-pr3574-rh1498936-ppc_crc32.patch
@@ -0,0 +1,1417 @@
+# HG changeset patch
+# User gromero
+# Date 1537823918 14400
+# Mon Sep 24 17:18:38 2018 -0400
+# Node ID 567e95df42f866b890dc3f0670e086d266915112
+# Parent 678bb67e02aedd54e32819a9011962326164274e
+8131048, PR3574, RH1498936: ppc implement CRC32 intrinsic
+Reviewed-by: goetz
+
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp openjdk/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp
+@@ -33,5 +33,7 @@
+ address generate_abstract_entry(void);
+ address generate_accessor_entry(void);
+ address generate_Reference_get_entry(void);
++ address generate_CRC32_update_entry();
++ address generate_CRC32_updateBytes_entry(AbstractInterpreter::MethodKind kind);
+
+ #endif // CPU_PPC_VM_INTERPRETERGENERATOR_PPC_HPP
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
+@@ -49,6 +49,7 @@
+ #else
+ #define BLOCK_COMMENT(str) block_comment(str)
+ #endif
++#define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
+
+ #ifdef ASSERT
+ // On RISC, there's no benefit to verifying instruction boundaries.
+@@ -3022,6 +3023,418 @@
+ bind(Ldone_false);
+ }
+
++// Helpers for Intrinsic Emitters
++//
++// Revert the byte order of a 32bit value in a register
++// src: 0x44556677
++// dst: 0x77665544
++// Three steps to obtain the result:
++// 1) Rotate src (as doubleword) left 5 bytes. That puts the leftmost byte of the src word
++// into the rightmost byte position. Afterwards, everything left of the rightmost byte is cleared.
++// This value initializes dst.
++// 2) Rotate src (as word) left 3 bytes. That puts the rightmost byte of the src word into the leftmost
++// byte position. Furthermore, byte 5 is rotated into byte 6 position where it is supposed to go.
++// This value is mask inserted into dst with a [0..23] mask of 1s.
++// 3) Rotate src (as word) left 1 byte. That puts byte 6 into byte 5 position.
++// This value is mask inserted into dst with a [8..15] mask of 1s.
++void MacroAssembler::load_reverse_32(Register dst, Register src) {
++ assert_different_registers(dst, src);
++
++ rldicl(dst, src, (4+1)*8, 56); // Rotate byte 4 into position 7 (rightmost), clear all to the left.
++ rlwimi(dst, src, 3*8, 0, 23); // Insert byte 5 into position 6, 7 into 4, leave pos 7 alone.
++ rlwimi(dst, src, 1*8, 8, 15); // Insert byte 6 into position 5, leave the rest alone.
++}
++
++// Calculate the column addresses of the crc32 lookup table into distinct registers.
++// This loop-invariant calculation is moved out of the loop body, reducing the loop
++// body size from 20 to 16 instructions.
++// Returns the offset that was used to calculate the address of column tc3.
++// Due to register shortage, setting tc3 may overwrite table. With the return offset
++// at hand, the original table address can be easily reconstructed.
++int MacroAssembler::crc32_table_columns(Register table, Register tc0, Register tc1, Register tc2, Register tc3) {
++
++#ifdef VM_LITTLE_ENDIAN
++ // This is what we implement (the DOLIT4 part):
++ // ========================================================================= */
++ // #define DOLIT4 c ^= *buf4++; \
++ // c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
++ // crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
++ // #define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
++ // ========================================================================= */
++ const int ix0 = 3*(4*CRC32_COLUMN_SIZE);
++ const int ix1 = 2*(4*CRC32_COLUMN_SIZE);
++ const int ix2 = 1*(4*CRC32_COLUMN_SIZE);
++ const int ix3 = 0*(4*CRC32_COLUMN_SIZE);
++#else
++ // This is what we implement (the DOBIG4 part):
++ // =========================================================================
++ // #define DOBIG4 c ^= *++buf4; \
++ // c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
++ // crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
++ // #define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
++ // =========================================================================
++ const int ix0 = 4*(4*CRC32_COLUMN_SIZE);
++ const int ix1 = 5*(4*CRC32_COLUMN_SIZE);
++ const int ix2 = 6*(4*CRC32_COLUMN_SIZE);
++ const int ix3 = 7*(4*CRC32_COLUMN_SIZE);
++#endif
++ assert_different_registers(table, tc0, tc1, tc2);
++ assert(table == tc3, "must be!");
++
++ if (ix0 != 0) addi(tc0, table, ix0);
++ if (ix1 != 0) addi(tc1, table, ix1);
++ if (ix2 != 0) addi(tc2, table, ix2);
++ if (ix3 != 0) addi(tc3, table, ix3);
++
++ return ix3;
++}
++
++/**
++ * uint32_t crc;
++ * timesXtoThe32[crc & 0xFF] ^ (crc >> 8);
++ */
++void MacroAssembler::fold_byte_crc32(Register crc, Register val, Register table, Register tmp) {
++ assert_different_registers(crc, table, tmp);
++ assert_different_registers(val, table);
++
++ if (crc == val) { // Must rotate first to use the unmodified value.
++ rlwinm(tmp, val, 2, 24-2, 31-2); // Insert (rightmost) byte 7 of val, shifted left by 2, into byte 6..7 of tmp, clear the rest.
++ // As we use a word (4-byte) instruction, we have to adapt the mask bit positions.
++ srwi(crc, crc, 8); // Unsigned shift, clear leftmost 8 bits.
++ } else {
++ srwi(crc, crc, 8); // Unsigned shift, clear leftmost 8 bits.
++ rlwinm(tmp, val, 2, 24-2, 31-2); // Insert (rightmost) byte 7 of val, shifted left by 2, into byte 6..7 of tmp, clear the rest.
++ }
++ lwzx(tmp, table, tmp);
++ xorr(crc, crc, tmp);
++}
++
++/**
++ * uint32_t crc;
++ * timesXtoThe32[crc & 0xFF] ^ (crc >> 8);
++ */
++void MacroAssembler::fold_8bit_crc32(Register crc, Register table, Register tmp) {
++ fold_byte_crc32(crc, crc, table, tmp);
++}
++
++/**
++ * Emits code to update CRC-32 with a byte value according to constants in table.
++ *
++ * @param [in,out]crc Register containing the crc.
++ * @param [in]val Register containing the byte to fold into the CRC.
++ * @param [in]table Register containing the table of crc constants.
++ *
++ * uint32_t crc;
++ * val = crc_table[(val ^ crc) & 0xFF];
++ * crc = val ^ (crc >> 8);
++ */
++void MacroAssembler::update_byte_crc32(Register crc, Register val, Register table) {
++ BLOCK_COMMENT("update_byte_crc32:");
++ xorr(val, val, crc);
++ fold_byte_crc32(crc, val, table, val);
++}
++
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param table register pointing to CRC table
++ */
++void MacroAssembler::update_byteLoop_crc32(Register crc, Register buf, Register len, Register table,
++ Register data, bool loopAlignment, bool invertCRC) {
++ assert_different_registers(crc, buf, len, table, data);
++
++ Label L_mainLoop, L_done;
++ const int mainLoop_stepping = 1;
++ const int mainLoop_alignment = loopAlignment ? 32 : 4; // (InputForNewCode > 4 ? InputForNewCode : 32) : 4;
++
++ // Process all bytes in a single-byte loop.
++ cmpdi(CCR0, len, 0); // Anything to do?
++ mtctr(len);
++ beq(CCR0, L_done);
++
++ if (invertCRC) {
++ nand(crc, crc, crc); // ~c
++ }
++
++ align(mainLoop_alignment);
++ BIND(L_mainLoop);
++ lbz(data, 0, buf); // Byte from buffer, zero-extended.
++ addi(buf, buf, mainLoop_stepping); // Advance buffer position.
++ update_byte_crc32(crc, data, table);
++ bdnz(L_mainLoop); // Iterate.
++
++ if (invertCRC) {
++ nand(crc, crc, crc); // ~c
++ }
++
++ bind(L_done);
++}
++
++/**
++ * Emits code to update CRC-32 with a 4-byte value according to constants in table
++ * Implementation according to jdk/src/share/native/java/util/zip/zlib-1.2.8/crc32.c
++ */
++// A not on the lookup table address(es):
++// The lookup table consists of two sets of four columns each.
++// The columns {0..3} are used for little-endian machines.
++// The columns {4..7} are used for big-endian machines.
++// To save the effort of adding the column offset to the table address each time
++// a table element is looked up, it is possible to pass the pre-calculated
++// column addresses.
++// Uses R9..R12 as work register. Must be saved/restored by caller, if necessary.
++void MacroAssembler::update_1word_crc32(Register crc, Register buf, Register table, int bufDisp, int bufInc,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3) {
++ assert_different_registers(crc, t3);
++
++ // XOR crc with next four bytes of buffer.
++ lwz(t3, bufDisp, buf);
++ if (bufInc != 0) {
++ addi(buf, buf, bufInc);
++ }
++ xorr(t3, t3, crc);
++
++ // Chop crc into 4 single-byte pieces, shifted left 2 bits, to form the table indices.
++ rlwinm(t0, t3, 2, 24-2, 31-2); // ((t1 >> 0) & 0xff) << 2
++ rlwinm(t1, t3, 32+(2- 8), 24-2, 31-2); // ((t1 >> 8) & 0xff) << 2
++ rlwinm(t2, t3, 32+(2-16), 24-2, 31-2); // ((t1 >> 16) & 0xff) << 2
++ rlwinm(t3, t3, 32+(2-24), 24-2, 31-2); // ((t1 >> 24) & 0xff) << 2
++
++ // Use the pre-calculated column addresses.
++ // Load pre-calculated table values.
++ lwzx(t0, tc0, t0);
++ lwzx(t1, tc1, t1);
++ lwzx(t2, tc2, t2);
++ lwzx(t3, tc3, t3);
++
++ // Calculate new crc from table values.
++ xorr(t0, t0, t1);
++ xorr(t2, t2, t3);
++ xorr(crc, t0, t2); // Now crc contains the final checksum value.
++}
++
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param table register pointing to CRC table
++ *
++ * Uses R9..R12 as work register. Must be saved/restored by caller!
++ */
++void MacroAssembler::kernel_crc32_2word(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3) {
++ assert_different_registers(crc, buf, len, table);
++
++ Label L_mainLoop, L_tail;
++ Register tmp = t0;
++ Register data = t0;
++ Register tmp2 = t1;
++ const int mainLoop_stepping = 8;
++ const int tailLoop_stepping = 1;
++ const int log_stepping = exact_log2(mainLoop_stepping);
++ const int mainLoop_alignment = 32; // InputForNewCode > 4 ? InputForNewCode : 32;
++ const int complexThreshold = 2*mainLoop_stepping;
++
++ // Don't test for len <= 0 here. This pathological case should not occur anyway.
++ // Optimizing for it by adding a test and a branch seems to be a waste of CPU cycles.
++ // The situation itself is detected and handled correctly by the conditional branches
++ // following aghi(len, -stepping) and aghi(len, +stepping).
++ assert(tailLoop_stepping == 1, "check tailLoop_stepping!");
++
++ BLOCK_COMMENT("kernel_crc32_2word {");
++
++ nand(crc, crc, crc); // ~c
++
++ // Check for short (<mainLoop_stepping) buffer.
++ cmpdi(CCR0, len, complexThreshold);
++ blt(CCR0, L_tail);
++
++ // Pre-mainLoop alignment did show a slight (1%) positive effect on performance.
++ // We leave the code in for reference. Maybe we need alignment when we exploit vector instructions.
++ {
++ // Align buf addr to mainLoop_stepping boundary.
++ neg(tmp2, buf); // Calculate # preLoop iterations for alignment.
++ rldicl(tmp2, tmp2, 0, 64-log_stepping); // Rotate tmp2 0 bits, insert into tmp2, anding with mask with 1s from 62..63.
++
++ if (complexThreshold > mainLoop_stepping) {
++ sub(len, len, tmp2); // Remaining bytes for main loop (>=mainLoop_stepping is guaranteed).
++ } else {
++ sub(tmp, len, tmp2); // Remaining bytes for main loop.
++ cmpdi(CCR0, tmp, mainLoop_stepping);
++ blt(CCR0, L_tail); // For less than one mainloop_stepping left, do only tail processing
++ mr(len, tmp); // remaining bytes for main loop (>=mainLoop_stepping is guaranteed).
++ }
++ update_byteLoop_crc32(crc, buf, tmp2, table, data, false, false);
++ }
++
++ srdi(tmp2, len, log_stepping); // #iterations for mainLoop
++ andi(len, len, mainLoop_stepping-1); // remaining bytes for tailLoop
++ mtctr(tmp2);
++
++#ifdef VM_LITTLE_ENDIAN
++ Register crc_rv = crc;
++#else
++ Register crc_rv = tmp; // Load_reverse needs separate registers to work on.
++ // Occupies tmp, but frees up crc.
++ load_reverse_32(crc_rv, crc); // Revert byte order because we are dealing with big-endian data.
++ tmp = crc;
++#endif
++
++ int reconstructTableOffset = crc32_table_columns(table, tc0, tc1, tc2, tc3);
++
++ align(mainLoop_alignment); // Octoword-aligned loop address. Shows 2% improvement.
++ BIND(L_mainLoop);
++ update_1word_crc32(crc_rv, buf, table, 0, 0, crc_rv, t1, t2, t3, tc0, tc1, tc2, tc3);
++ update_1word_crc32(crc_rv, buf, table, 4, mainLoop_stepping, crc_rv, t1, t2, t3, tc0, tc1, tc2, tc3);
++ bdnz(L_mainLoop);
++
++#ifndef VM_LITTLE_ENDIAN
++ load_reverse_32(crc, crc_rv); // Revert byte order because we are dealing with big-endian data.
++ tmp = crc_rv; // Tmp uses it's original register again.
++#endif
++
++ // Restore original table address for tailLoop.
++ if (reconstructTableOffset != 0) {
++ addi(table, table, -reconstructTableOffset);
++ }
++
++ // Process last few (<complexThreshold) bytes of buffer.
++ BIND(L_tail);
++ update_byteLoop_crc32(crc, buf, len, table, data, false, false);
++
++ nand(crc, crc, crc); // ~c
++ BLOCK_COMMENT("} kernel_crc32_2word");
++}
++
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param table register pointing to CRC table
++ *
++ * uses R9..R12 as work register. Must be saved/restored by caller!
++ */
++void MacroAssembler::kernel_crc32_1word(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3) {
++ assert_different_registers(crc, buf, len, table);
++
++ Label L_mainLoop, L_tail;
++ Register tmp = t0;
++ Register data = t0;
++ Register tmp2 = t1;
++ const int mainLoop_stepping = 4;
++ const int tailLoop_stepping = 1;
++ const int log_stepping = exact_log2(mainLoop_stepping);
++ const int mainLoop_alignment = 32; // InputForNewCode > 4 ? InputForNewCode : 32;
++ const int complexThreshold = 2*mainLoop_stepping;
++
++ // Don't test for len <= 0 here. This pathological case should not occur anyway.
++ // Optimizing for it by adding a test and a branch seems to be a waste of CPU cycles.
++ // The situation itself is detected and handled correctly by the conditional branches
++ // following aghi(len, -stepping) and aghi(len, +stepping).
++ assert(tailLoop_stepping == 1, "check tailLoop_stepping!");
++
++ BLOCK_COMMENT("kernel_crc32_1word {");
++
++ nand(crc, crc, crc); // ~c
++
++ // Check for short (<mainLoop_stepping) buffer.
++ cmpdi(CCR0, len, complexThreshold);
++ blt(CCR0, L_tail);
++
++ // Pre-mainLoop alignment did show a slight (1%) positive effect on performance.
++ // We leave the code in for reference. Maybe we need alignment when we exploit vector instructions.
++ {
++ // Align buf addr to mainLoop_stepping boundary.
++ neg(tmp2, buf); // Calculate # preLoop iterations for alignment.
++ rldicl(tmp2, tmp2, 0, 64-log_stepping); // Rotate tmp2 0 bits, insert into tmp2, anding with mask with 1s from 62..63.
++
++ if (complexThreshold > mainLoop_stepping) {
++ sub(len, len, tmp2); // Remaining bytes for main loop (>=mainLoop_stepping is guaranteed).
++ } else {
++ sub(tmp, len, tmp2); // Remaining bytes for main loop.
++ cmpdi(CCR0, tmp, mainLoop_stepping);
++ blt(CCR0, L_tail); // For less than one mainloop_stepping left, do only tail processing
++ mr(len, tmp); // remaining bytes for main loop (>=mainLoop_stepping is guaranteed).
++ }
++ update_byteLoop_crc32(crc, buf, tmp2, table, data, false, false);
++ }
++
++ srdi(tmp2, len, log_stepping); // #iterations for mainLoop
++ andi(len, len, mainLoop_stepping-1); // remaining bytes for tailLoop
++ mtctr(tmp2);
++
++#ifdef VM_LITTLE_ENDIAN
++ Register crc_rv = crc;
++#else
++ Register crc_rv = tmp; // Load_reverse needs separate registers to work on.
++ // Occupies tmp, but frees up crc.
++ load_reverse_32(crc_rv, crc); // evert byte order because we are dealing with big-endian data.
++ tmp = crc;
++#endif
++
++ int reconstructTableOffset = crc32_table_columns(table, tc0, tc1, tc2, tc3);
++
++ align(mainLoop_alignment); // Octoword-aligned loop address. Shows 2% improvement.
++ BIND(L_mainLoop);
++ update_1word_crc32(crc_rv, buf, table, 0, mainLoop_stepping, crc_rv, t1, t2, t3, tc0, tc1, tc2, tc3);
++ bdnz(L_mainLoop);
++
++#ifndef VM_LITTLE_ENDIAN
++ load_reverse_32(crc, crc_rv); // Revert byte order because we are dealing with big-endian data.
++ tmp = crc_rv; // Tmp uses it's original register again.
++#endif
++
++ // Restore original table address for tailLoop.
++ if (reconstructTableOffset != 0) {
++ addi(table, table, -reconstructTableOffset);
++ }
++
++ // Process last few (<complexThreshold) bytes of buffer.
++ BIND(L_tail);
++ update_byteLoop_crc32(crc, buf, len, table, data, false, false);
++
++ nand(crc, crc, crc); // ~c
++ BLOCK_COMMENT("} kernel_crc32_1word");
++}
++
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param table register pointing to CRC table
++ *
++ * Uses R7_ARG5, R8_ARG6 as work registers.
++ */
++void MacroAssembler::kernel_crc32_1byte(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3) {
++ assert_different_registers(crc, buf, len, table);
++
++ Register data = t0; // Holds the current byte to be folded into crc.
++
++ BLOCK_COMMENT("kernel_crc32_1byte {");
++
++ // Process all bytes in a single-byte loop.
++ update_byteLoop_crc32(crc, buf, len, table, data, true, true);
++
++ BLOCK_COMMENT("} kernel_crc32_1byte");
++}
++
++void MacroAssembler::kernel_crc32_singleByte(Register crc, Register buf, Register len, Register table, Register tmp) {
++ assert_different_registers(crc, buf, /* len, not used!! */ table, tmp);
++
++ BLOCK_COMMENT("kernel_crc32_singleByte:");
++ nand(crc, crc, crc); // ~c
++
++ lbz(tmp, 0, buf); // Byte from buffer, zero-extended.
++ update_byte_crc32(crc, tmp, table);
++
++ nand(crc, crc, crc); // ~c
++}
++
+
+ void MacroAssembler::asm_assert(bool check_equal, const char *msg, int id) {
+ #ifdef ASSERT
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
+@@ -637,6 +637,27 @@
+ void char_arrays_equalsImm(Register str1_reg, Register str2_reg, int cntval, Register result_reg,
+ Register tmp1_reg, Register tmp2_reg);
+
++ // CRC32 Intrinsics.
++ void load_reverse_32(Register dst, Register src);
++ int crc32_table_columns(Register table, Register tc0, Register tc1, Register tc2, Register tc3);
++ void fold_byte_crc32(Register crc, Register val, Register table, Register tmp);
++ void fold_8bit_crc32(Register crc, Register table, Register tmp);
++ void update_byte_crc32(Register crc, Register val, Register table);
++ void update_byteLoop_crc32(Register crc, Register buf, Register len, Register table,
++ Register data, bool loopAlignment, bool invertCRC);
++ void update_1word_crc32(Register crc, Register buf, Register table, int bufDisp, int bufInc,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3);
++ void kernel_crc32_2word(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3);
++ void kernel_crc32_1word(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3);
++ void kernel_crc32_1byte(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3);
++ void kernel_crc32_singleByte(Register crc, Register buf, Register len, Register table, Register tmp);
++
+ //
+ // Debugging
+ //
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
+@@ -2473,6 +2473,54 @@
+ __ blr();
+ }
+
++ /**
++ * Arguments:
++ *
++ * Inputs:
++ * R3_ARG1 - int crc
++ * R4_ARG2 - byte* buf
++ * R5_ARG3 - int length (of buffer)
++ *
++ * scratch:
++ * R6_ARG4 - crc table address
++ * R7_ARG5 - tmp1
++ * R8_ARG6 - tmp2
++ *
++ * Ouput:
++ * R3_RET - int crc result
++ */
++ // Compute CRC32 function.
++ address generate_CRC32_updateBytes(const char* name) {
++ __ align(CodeEntryAlignment);
++ StubCodeMark mark(this, "StubRoutines", name);
++ address start = __ function_entry(); // Remember stub start address (is rtn value).
++
++ // arguments to kernel_crc32:
++ Register crc = R3_ARG1; // Current checksum, preset by caller or result from previous call.
++ Register data = R4_ARG2; // source byte array
++ Register dataLen = R5_ARG3; // #bytes to process
++ Register table = R6_ARG4; // crc table address
++
++ Register t0 = R9; // work reg for kernel* emitters
++ Register t1 = R10; // work reg for kernel* emitters
++ Register t2 = R11; // work reg for kernel* emitters
++ Register t3 = R12; // work reg for kernel* emitters
++
++ BLOCK_COMMENT("Stub body {");
++ assert_different_registers(crc, data, dataLen, table);
++
++ StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
++
++ __ kernel_crc32_1byte(crc, data, dataLen, table, t0, t1, t2, t3);
++
++ BLOCK_COMMENT("return");
++ __ mr_if_needed(R3_RET, crc); // Updated crc is function result. No copying required (R3_ARG1 == R3_RET).
++ __ blr();
++
++ BLOCK_COMMENT("} Stub body");
++ return start;
++ }
++
+ // Initialization
+ void generate_initial() {
+ // Generates all stubs and initializes the entry points
+@@ -2491,6 +2539,12 @@
+ StubRoutines::_throw_StackOverflowError_entry =
+ generate_throw_exception("StackOverflowError throw_exception",
+ CAST_FROM_FN_PTR(address, SharedRuntime::throw_StackOverflowError), false);
++
++ // CRC32 Intrinsics.
++ if (UseCRC32Intrinsics) {
++ StubRoutines::_crc_table_adr = (address)StubRoutines::ppc64::_crc_table;
++ StubRoutines::_updateBytesCRC32 = generate_CRC32_updateBytes("CRC32_updateBytes");
++ }
+ }
+
+ void generate_all() {
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
+@@ -1,6 +1,6 @@
+ /*
+- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+- * Copyright 2012, 2014 SAP AG. All rights reserved.
++ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 2018 SAP SE. 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
+@@ -23,7 +23,457 @@
+ *
+ */
+
++#include "asm/macroAssembler.inline.hpp"
++#include "runtime/stubRoutines.hpp"
++
+ // Implementation of the platform-specific part of StubRoutines - for
+ // a description of how to extend it, see the stubRoutines.hpp file.
+
+
++#define __ masm->
++
++// CRC32 Intrinsics.
++void StubRoutines::ppc64::generate_load_crc_table_addr(MacroAssembler* masm, Register table) {
++ __ load_const(table, StubRoutines::_crc_table_adr);
++}
++
++// CRC32 Intrinsics.
++/**
++ * crc_table[] from jdk/src/share/native/java/util/zip/zlib-1.2.8/crc32.h
++ */
++juint StubRoutines::ppc64::_crc_table[CRC32_TABLES][CRC32_COLUMN_SIZE] = {
++ {
++ 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
++ 0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
++ 0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
++ 0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
++ 0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
++ 0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
++ 0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
++ 0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
++ 0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
++ 0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
++ 0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
++ 0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
++ 0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
++ 0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
++ 0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
++ 0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
++ 0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
++ 0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
++ 0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
++ 0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
++ 0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
++ 0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
++ 0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
++ 0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
++ 0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
++ 0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
++ 0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
++ 0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
++ 0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
++ 0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
++ 0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
++ 0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
++ 0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
++ 0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
++ 0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
++ 0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
++ 0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
++ 0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
++ 0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
++ 0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
++ 0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
++ 0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
++ 0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
++ 0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
++ 0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
++ 0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
++ 0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
++ 0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
++ 0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
++ 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
++ 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
++ 0x2d02ef8dUL
++#ifdef CRC32_BYFOUR
++ },
++ {
++ 0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
++ 0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
++ 0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
++ 0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
++ 0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
++ 0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
++ 0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
++ 0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
++ 0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
++ 0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
++ 0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
++ 0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
++ 0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
++ 0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
++ 0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
++ 0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
++ 0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
++ 0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
++ 0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
++ 0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
++ 0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
++ 0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
++ 0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
++ 0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
++ 0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
++ 0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
++ 0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
++ 0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
++ 0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
++ 0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
++ 0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
++ 0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
++ 0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
++ 0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
++ 0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
++ 0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
++ 0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
++ 0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
++ 0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
++ 0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
++ 0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
++ 0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
++ 0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
++ 0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
++ 0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
++ 0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
++ 0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
++ 0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
++ 0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
++ 0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
++ 0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
++ 0x9324fd72UL
++ },
++ {
++ 0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
++ 0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
++ 0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
++ 0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
++ 0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
++ 0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
++ 0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
++ 0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
++ 0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
++ 0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
++ 0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
++ 0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
++ 0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
++ 0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
++ 0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
++ 0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
++ 0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
++ 0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
++ 0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
++ 0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
++ 0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
++ 0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
++ 0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
++ 0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
++ 0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
++ 0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
++ 0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
++ 0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
++ 0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
++ 0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
++ 0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
++ 0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
++ 0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
++ 0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
++ 0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
++ 0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
++ 0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
++ 0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
++ 0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
++ 0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
++ 0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
++ 0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
++ 0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
++ 0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
++ 0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
++ 0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
++ 0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
++ 0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
++ 0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
++ 0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
++ 0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
++ 0xbe9834edUL
++ },
++ {
++ 0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
++ 0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
++ 0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
++ 0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
++ 0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
++ 0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
++ 0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
++ 0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
++ 0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
++ 0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
++ 0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
++ 0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
++ 0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
++ 0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
++ 0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
++ 0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
++ 0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
++ 0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
++ 0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
++ 0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
++ 0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
++ 0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
++ 0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
++ 0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
++ 0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
++ 0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
++ 0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
++ 0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
++ 0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
++ 0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
++ 0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
++ 0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
++ 0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
++ 0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
++ 0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
++ 0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
++ 0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
++ 0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
++ 0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
++ 0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
++ 0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
++ 0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
++ 0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
++ 0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
++ 0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
++ 0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
++ 0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
++ 0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
++ 0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
++ 0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
++ 0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
++ 0xde0506f1UL
++ },
++ {
++ 0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
++ 0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
++ 0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
++ 0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
++ 0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
++ 0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
++ 0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
++ 0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
++ 0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
++ 0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
++ 0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
++ 0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
++ 0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
++ 0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
++ 0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
++ 0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
++ 0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
++ 0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
++ 0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
++ 0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
++ 0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
++ 0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
++ 0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
++ 0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
++ 0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
++ 0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
++ 0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
++ 0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
++ 0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
++ 0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
++ 0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
++ 0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
++ 0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
++ 0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
++ 0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
++ 0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
++ 0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
++ 0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
++ 0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
++ 0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
++ 0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
++ 0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
++ 0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
++ 0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
++ 0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
++ 0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
++ 0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
++ 0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
++ 0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
++ 0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
++ 0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
++ 0x8def022dUL
++ },
++ {
++ 0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
++ 0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
++ 0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
++ 0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
++ 0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
++ 0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
++ 0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
++ 0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
++ 0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
++ 0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
++ 0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
++ 0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
++ 0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
++ 0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
++ 0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
++ 0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
++ 0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
++ 0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
++ 0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
++ 0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
++ 0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
++ 0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
++ 0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
++ 0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
++ 0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
++ 0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
++ 0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
++ 0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
++ 0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
++ 0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
++ 0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
++ 0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
++ 0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
++ 0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
++ 0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
++ 0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
++ 0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
++ 0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
++ 0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
++ 0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
++ 0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
++ 0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
++ 0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
++ 0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
++ 0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
++ 0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
++ 0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
++ 0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
++ 0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
++ 0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
++ 0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
++ 0x72fd2493UL
++ },
++ {
++ 0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
++ 0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
++ 0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
++ 0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
++ 0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
++ 0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
++ 0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
++ 0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
++ 0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
++ 0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
++ 0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
++ 0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
++ 0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
++ 0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
++ 0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
++ 0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
++ 0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
++ 0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
++ 0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
++ 0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
++ 0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
++ 0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
++ 0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
++ 0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
++ 0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
++ 0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
++ 0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
++ 0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
++ 0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
++ 0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
++ 0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
++ 0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
++ 0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
++ 0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
++ 0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
++ 0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
++ 0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
++ 0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
++ 0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
++ 0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
++ 0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
++ 0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
++ 0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
++ 0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
++ 0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
++ 0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
++ 0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
++ 0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
++ 0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
++ 0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
++ 0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
++ 0xed3498beUL
++ },
++ {
++ 0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
++ 0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
++ 0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
++ 0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
++ 0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
++ 0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
++ 0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
++ 0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
++ 0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
++ 0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
++ 0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
++ 0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
++ 0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
++ 0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
++ 0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
++ 0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
++ 0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
++ 0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
++ 0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
++ 0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
++ 0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
++ 0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
++ 0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
++ 0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
++ 0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
++ 0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
++ 0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
++ 0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
++ 0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
++ 0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
++ 0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
++ 0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
++ 0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
++ 0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
++ 0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
++ 0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
++ 0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
++ 0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
++ 0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
++ 0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
++ 0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
++ 0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
++ 0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
++ 0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
++ 0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
++ 0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
++ 0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
++ 0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
++ 0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
++ 0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
++ 0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
++ 0xf10605deUL
++#endif
++ }
++};
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
+@@ -1,6 +1,6 @@
+ /*
+- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+- * Copyright 2012, 2013 SAP AG. All rights reserved.
++ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 2018 SAP SE. 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
+@@ -30,11 +30,35 @@
+ // definition. See stubRoutines.hpp for a description on how to
+ // extend it.
+
+-static bool returns_to_call_stub(address return_pc) { return return_pc == _call_stub_return_address; }
++static bool returns_to_call_stub(address return_pc) { return return_pc == _call_stub_return_address; }
+
+ enum platform_dependent_constants {
+ code_size1 = 20000, // simply increase if too small (assembler will crash if too small)
+ code_size2 = 20000 // simply increase if too small (assembler will crash if too small)
+ };
+
++// CRC32 Intrinsics.
++#define CRC32_COLUMN_SIZE 256
++#define CRC32_BYFOUR
++#ifdef CRC32_BYFOUR
++ #define CRC32_TABLES 8
++#else
++ #define CRC32_TABLES 1
++#endif
++
++class ppc64 {
++ friend class StubGenerator;
++
++ private:
++
++ // CRC32 Intrinsics.
++ static juint _crc_table[CRC32_TABLES][CRC32_COLUMN_SIZE];
++
++ public:
++
++ // CRC32 Intrinsics.
++ static void generate_load_crc_table_addr(MacroAssembler* masm, Register table);
++
++};
++
+ #endif // CPU_PPC_VM_STUBROUTINES_PPC_64_HPP
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp
+@@ -57,7 +57,7 @@
+ #define BLOCK_COMMENT(str) __ block_comment(str)
+ #endif
+
+-#define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
++#define BIND(label) __ bind(label); BLOCK_COMMENT(#label ":")
+
+ //-----------------------------------------------------------------------------
+
+@@ -783,7 +783,7 @@
+ }
+ generate_counter_incr(&invocation_counter_overflow, NULL, NULL);
+
+- __ BIND(continue_after_compile);
++ BIND(continue_after_compile);
+ // Reset the _do_not_unlock_if_synchronized flag.
+ if (synchronized) {
+ __ li(R0, 0);
+@@ -843,7 +843,7 @@
+ __ ld(signature_handler_fd, method_(signature_handler));
+ __ twi_0(signature_handler_fd); // Order wrt. load of klass mirror and entry point (isync is below).
+
+- __ BIND(call_signature_handler);
++ BIND(call_signature_handler);
+
+ // Before we call the signature handler we push a new frame to
+ // protect the interpreter frame volatile registers when we return
+@@ -913,7 +913,7 @@
+ __ std(R0/*mirror*/, _ijava_state_neg(oop_tmp), R11_scratch1);
+ // R4_ARG2 = &state->_oop_temp;
+ __ addi(R4_ARG2, R11_scratch1, _ijava_state_neg(oop_tmp));
+- __ BIND(method_is_not_static);
++ BIND(method_is_not_static);
+ }
+
+ // At this point, arguments have been copied off the stack into
+@@ -1126,14 +1126,14 @@
+ // interpreter will do the correct thing. If it isn't interpreted
+ // (call stub/compiled code) we will change our return and continue.
+
+- __ BIND(exception_return_sync_check);
++ BIND(exception_return_sync_check);
+
+ if (synchronized) {
+ // Don't check for exceptions since we're still in the i2n frame. Do that
+ // manually afterwards.
+ unlock_method(false);
+ }
+- __ BIND(exception_return_sync_check_already_unlocked);
++ BIND(exception_return_sync_check_already_unlocked);
+
+ const Register return_pc = R31;
+
+@@ -1327,6 +1327,12 @@
+ case Interpreter::java_lang_math_exp : entry_point = ((InterpreterGenerator*) this)->generate_math_entry(kind); break;
+ case Interpreter::java_lang_ref_reference_get
+ : entry_point = ((InterpreterGenerator*)this)->generate_Reference_get_entry(); break;
++ case Interpreter::java_util_zip_CRC32_update
++ : entry_point = ((InterpreterGenerator*)this)->generate_CRC32_update_entry(); break;
++ case Interpreter::java_util_zip_CRC32_updateBytes
++ : // fall thru
++ case Interpreter::java_util_zip_CRC32_updateByteBuffer
++ : entry_point = ((InterpreterGenerator*)this)->generate_CRC32_updateBytes_entry(kind); break;
+ default : ShouldNotReachHere(); break;
+ }
+
+@@ -1337,6 +1343,179 @@
+ return ((InterpreterGenerator*) this)->generate_normal_entry(synchronized);
+ }
+
++// CRC32 Intrinsics.
++//
++// Contract on scratch and work registers.
++// =======================================
++//
++// On ppc, the register set {R2..R12} is available in the interpreter as scratch/work registers.
++// You should, however, keep in mind that {R3_ARG1..R10_ARG8} is the C-ABI argument register set.
++// You can't rely on these registers across calls.
++//
++// The generators for CRC32_update and for CRC32_updateBytes use the
++// scratch/work register set internally, passing the work registers
++// as arguments to the MacroAssembler emitters as required.
++//
++// R3_ARG1..R6_ARG4 are preset to hold the incoming java arguments.
++// Their contents is not constant but may change according to the requirements
++// of the emitted code.
++//
++// All other registers from the scratch/work register set are used "internally"
++// and contain garbage (i.e. unpredictable values) once blr() is reached.
++// Basically, only R3_RET contains a defined value which is the function result.
++//
++/**
++ * Method entry for static native methods:
++ * int java.util.zip.CRC32.update(int crc, int b)
++ */
++address InterpreterGenerator::generate_CRC32_update_entry() {
++ address start = __ pc(); // Remember stub start address (is rtn value).
++
++ if (UseCRC32Intrinsics) {
++ Label slow_path;
++
++ // Safepoint check
++ const Register sync_state = R11_scratch1;
++ int sync_state_offs = __ load_const_optimized(sync_state, SafepointSynchronize::address_of_state(), /*temp*/R0, true);
++ __ lwz(sync_state, sync_state_offs, sync_state);
++ __ cmpwi(CCR0, sync_state, SafepointSynchronize::_not_synchronized);
++ __ bne(CCR0, slow_path);
++
++ // We don't generate local frame and don't align stack because
++ // we not even call stub code (we generate the code inline)
++ // and there is no safepoint on this path.
++
++ // Load java parameters.
++ // R15_esp is callers operand stack pointer, i.e. it points to the parameters.
++ const Register argP = R15_esp;
++ const Register crc = R3_ARG1; // crc value
++ const Register data = R4_ARG2; // address of java byte value (kernel_crc32 needs address)
++ const Register dataLen = R5_ARG3; // source data len (1 byte). Not used because calling the single-byte emitter.
++ const Register table = R6_ARG4; // address of crc32 table
++ const Register tmp = dataLen; // Reuse unused len register to show we don't actually need a separate tmp here.
++
++ BLOCK_COMMENT("CRC32_update {");
++
++ // Arguments are reversed on java expression stack
++#ifdef VM_LITTLE_ENDIAN
++ __ addi(data, argP, 0+1*wordSize); // (stack) address of byte value. Emitter expects address, not value.
++ // Being passed as an int, the single byte is at offset +0.
++#else
++ __ addi(data, argP, 3+1*wordSize); // (stack) address of byte value. Emitter expects address, not value.
++ // Being passed from java as an int, the single byte is at offset +3.
++#endif
++ __ lwz(crc, 2*wordSize, argP); // Current crc state, zero extend to 64 bit to have a clean register.
++
++ StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
++ __ kernel_crc32_singleByte(crc, data, dataLen, table, tmp);
++
++ // Restore caller sp for c2i case and return.
++ __ mr(R1_SP, R21_sender_SP); // Cut the stack back to where the caller started.
++ __ blr();
++
++ // Generate a vanilla native entry as the slow path.
++ BLOCK_COMMENT("} CRC32_update");
++ BIND(slow_path);
++ }
++
++ (void) generate_native_entry(false);
++
++ return start;
++}
++
++// CRC32 Intrinsics.
++/**
++ * Method entry for static native methods:
++ * int java.util.zip.CRC32.updateBytes( int crc, byte[] b, int off, int len)
++ * int java.util.zip.CRC32.updateByteBuffer(int crc, long* buf, int off, int len)
++ */
++address InterpreterGenerator::generate_CRC32_updateBytes_entry(AbstractInterpreter::MethodKind kind) {
++ address start = __ pc(); // Remember stub start address (is rtn value).
++
++ if (UseCRC32Intrinsics) {
++ Label slow_path;
++
++ // Safepoint check
++ const Register sync_state = R11_scratch1;
++ int sync_state_offs = __ load_const_optimized(sync_state, SafepointSynchronize::address_of_state(), /*temp*/R0, true);
++ __ lwz(sync_state, sync_state_offs, sync_state);
++ __ cmpwi(CCR0, sync_state, SafepointSynchronize::_not_synchronized);
++ __ bne(CCR0, slow_path);
++
++ // We don't generate local frame and don't align stack because
++ // we not even call stub code (we generate the code inline)
++ // and there is no safepoint on this path.
++
++ // Load parameters.
++ // Z_esp is callers operand stack pointer, i.e. it points to the parameters.
++ const Register argP = R15_esp;
++ const Register crc = R3_ARG1; // crc value
++ const Register data = R4_ARG2; // address of java byte array
++ const Register dataLen = R5_ARG3; // source data len
++ const Register table = R6_ARG4; // address of crc32 table
++
++ const Register t0 = R9; // scratch registers for crc calculation
++ const Register t1 = R10;
++ const Register t2 = R11;
++ const Register t3 = R12;
++
++ const Register tc0 = R2; // registers to hold pre-calculated column addresses
++ const Register tc1 = R7;
++ const Register tc2 = R8;
++ const Register tc3 = table; // table address is reconstructed at the end of kernel_crc32_* emitters
++
++ const Register tmp = t0; // Only used very locally to calculate byte buffer address.
++
++ // Arguments are reversed on java expression stack.
++ // Calculate address of start element.
++ if (kind == Interpreter::java_util_zip_CRC32_updateByteBuffer) { // Used for "updateByteBuffer direct".
++ BLOCK_COMMENT("CRC32_updateByteBuffer {");
++ // crc @ (SP + 5W) (32bit)
++ // buf @ (SP + 3W) (64bit ptr to long array)
++ // off @ (SP + 2W) (32bit)
++ // dataLen @ (SP + 1W) (32bit)
++ // data = buf + off
++ __ ld( data, 3*wordSize, argP); // start of byte buffer
++ __ lwa( tmp, 2*wordSize, argP); // byte buffer offset
++ __ lwa( dataLen, 1*wordSize, argP); // #bytes to process
++ __ lwz( crc, 5*wordSize, argP); // current crc state
++ __ add( data, data, tmp); // Add byte buffer offset.
++ } else { // Used for "updateBytes update".
++ BLOCK_COMMENT("CRC32_updateBytes {");
++ // crc @ (SP + 4W) (32bit)
++ // buf @ (SP + 3W) (64bit ptr to byte array)
++ // off @ (SP + 2W) (32bit)
++ // dataLen @ (SP + 1W) (32bit)
++ // data = buf + off + base_offset
++ __ ld( data, 3*wordSize, argP); // start of byte buffer
++ __ lwa( tmp, 2*wordSize, argP); // byte buffer offset
++ __ lwa( dataLen, 1*wordSize, argP); // #bytes to process
++ __ add( data, data, tmp); // add byte buffer offset
++ __ lwz( crc, 4*wordSize, argP); // current crc state
++ __ addi(data, data, arrayOopDesc::base_offset_in_bytes(T_BYTE));
++ }
++
++ StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
++
++ // Performance measurements show the 1word and 2word variants to be almost equivalent,
++ // with very light advantages for the 1word variant. We chose the 1word variant for
++ // code compactness.
++ __ kernel_crc32_1word(crc, data, dataLen, table, t0, t1, t2, t3, tc0, tc1, tc2, tc3);
++
++ // Restore caller sp for c2i case and return.
++ __ mr(R1_SP, R21_sender_SP); // Cut the stack back to where the caller started.
++ __ blr();
++
++ // Generate a vanilla native entry as the slow path.
++ BLOCK_COMMENT("} CRC32_updateBytes(Buffer)");
++ BIND(slow_path);
++ }
++
++ (void) generate_native_entry(false);
++
++ return start;
++}
++
+ // These should never be compiled since the interpreter will prefer
+ // the compiled version to the intrinsic version.
+ bool AbstractInterpreter::can_be_compiled(methodHandle m) {
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
+@@ -150,10 +150,12 @@
+
+ assert(AllocatePrefetchStyle >= 0, "AllocatePrefetchStyle should be positive");
+
+- if (UseCRC32Intrinsics) {
+- if (!FLAG_IS_DEFAULT(UseCRC32Intrinsics))
+- warning("CRC32 intrinsics are not available on this CPU");
+- FLAG_SET_DEFAULT(UseCRC32Intrinsics, false);
++ // Implementation does not use any of the vector instructions
++ // available with Power8. Their exploitation is still pending.
++ if (!UseCRC32Intrinsics) {
++ if (FLAG_IS_DEFAULT(UseCRC32Intrinsics)) {
++ FLAG_SET_DEFAULT(UseCRC32Intrinsics, true);
++ }
+ }
+
+ // The AES intrinsic stubs require AES instruction support.
+diff --git openjdk.orig/hotspot/src/share/vm/opto/library_call.cpp openjdk/hotspot/src/share/vm/opto/library_call.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/library_call.cpp
++++ openjdk/hotspot/src/share/vm/opto/library_call.cpp
+@@ -6225,10 +6225,16 @@
+ // Call the stub.
+ address stubAddr = StubRoutines::updateBytesCRC32();
+ const char *stubName = "updateBytesCRC32";
+-
+- Node* call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
+- stubAddr, stubName, TypePtr::BOTTOM,
+- crc, src_start, length);
++ Node* call;
++ if (CCallingConventionRequiresIntsAsLongs) {
++ call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
++ stubAddr, stubName, TypePtr::BOTTOM,
++ crc XTOP, src_start, length XTOP);
++ } else {
++ call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
++ stubAddr, stubName, TypePtr::BOTTOM,
++ crc, src_start, length);
++ }
+ Node* result = _gvn.transform(new (C) ProjNode(call, TypeFunc::Parms));
+ set_result(result);
+ return true;
+@@ -6257,10 +6263,16 @@
+ // Call the stub.
+ address stubAddr = StubRoutines::updateBytesCRC32();
+ const char *stubName = "updateBytesCRC32";
+-
+- Node* call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
+- stubAddr, stubName, TypePtr::BOTTOM,
+- crc, src_start, length);
++ Node* call;
++ if (CCallingConventionRequiresIntsAsLongs) {
++ call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
++ stubAddr, stubName, TypePtr::BOTTOM,
++ crc XTOP, src_start, length XTOP);
++ } else {
++ call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
++ stubAddr, stubName, TypePtr::BOTTOM,
++ crc, src_start, length);
++ }
+ Node* result = _gvn.transform(new (C) ProjNode(call, TypeFunc::Parms));
+ set_result(result);
+ return true;
+diff --git openjdk.orig/hotspot/src/share/vm/opto/runtime.cpp openjdk/hotspot/src/share/vm/opto/runtime.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/runtime.cpp
++++ openjdk/hotspot/src/share/vm/opto/runtime.cpp
+@@ -848,13 +848,24 @@
+ */
+ const TypeFunc* OptoRuntime::updateBytesCRC32_Type() {
+ // create input type (domain)
+- int num_args = 3;
++ int num_args = 3;
+ int argcnt = num_args;
++ if (CCallingConventionRequiresIntsAsLongs) {
++ argcnt += 2;
++ }
+ const Type** fields = TypeTuple::fields(argcnt);
+ int argp = TypeFunc::Parms;
+- fields[argp++] = TypeInt::INT; // crc
+- fields[argp++] = TypePtr::NOTNULL; // src
+- fields[argp++] = TypeInt::INT; // len
++ if (CCallingConventionRequiresIntsAsLongs) {
++ fields[argp++] = TypeLong::LONG; // crc
++ fields[argp++] = Type::HALF;
++ fields[argp++] = TypePtr::NOTNULL; // src
++ fields[argp++] = TypeLong::LONG; // len
++ fields[argp++] = Type::HALF;
++ } else {
++ fields[argp++] = TypeInt::INT; // crc
++ fields[argp++] = TypePtr::NOTNULL; // src
++ fields[argp++] = TypeInt::INT; // len
++ }
+ assert(argp == TypeFunc::Parms+argcnt, "correct decoding");
+ const TypeTuple* domain = TypeTuple::make(TypeFunc::Parms+argcnt, fields);
+
diff --git a/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch b/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch
new file mode 100644
index 0000000..f1e3215
--- /dev/null
+++ b/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch
@@ -0,0 +1,55 @@
+# HG changeset patch
+# User coleenp
+# Date 1525713256 -3600
+# Mon May 07 18:14:16 2018 +0100
+# Node ID bcbc64dfb629c5f188bbf59b8f986ad95963ed60
+# Parent 07a1135a327362f157955d470fad5df07cc35164
+8141570, PR3548: Fix Zero interpreter build for --disable-precompiled-headers
+Summary: change to include atomic.inline.hpp and allocation.inline.hpp only in .cpp files and some build fixes from Kim to build on ubuntu without devkits
+Reviewed-by: kbarrett, sgehwolf, erikj
+
+diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
+--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ # Copyright 2007, 2008 Red Hat, Inc.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+@@ -25,8 +25,15 @@
+
+ # Setup common to Zero (non-Shark) and Shark versions of VM
+
+-# override this from the main file because some version of llvm do not like -Wundef
+-WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wunused-function -Wunused-value
++# Some versions of llvm do not like -Wundef
++ifeq ($(USE_CLANG), true)
++ WARNING_FLAGS += -Wno-undef
++endif
++# Suppress some warning flags that are normally turned on for hotspot,
++# because some of the zero code has not been updated accordingly.
++WARNING_FLAGS += -Wno-return-type \
++ -Wno-format-nonliteral -Wno-format-security \
++ -Wno-maybe-uninitialized
+
+ # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+@@ -42,5 +49,3 @@
+ ifeq ($(ARCH_DATA_MODEL), 64)
+ CFLAGS += -D_LP64=1
+ endif
+-
+-OPT_CFLAGS/compactingPermGenGen.o = -O1
+diff --git openjdk.orig/hotspot/src/share/vm/runtime/java.cpp openjdk/hotspot/src/share/vm/runtime/java.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/java.cpp
++++ openjdk/hotspot/src/share/vm/runtime/java.cpp
+@@ -45,6 +45,7 @@
+ #include "runtime/arguments.hpp"
+ #include "runtime/biasedLocking.hpp"
+ #include "runtime/compilationPolicy.hpp"
++#include "runtime/deoptimization.hpp"
+ #include "runtime/fprofiler.hpp"
+ #include "runtime/init.hpp"
+ #include "runtime/interfaceSupport.hpp"
diff --git a/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch b/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
new file mode 100644
index 0000000..b0a88ea
--- /dev/null
+++ b/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
@@ -0,0 +1,146 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1525714161 -3600
+# Mon May 07 18:29:21 2018 +0100
+# Node ID afb31413c73cbc06420fdb447aa90a7a38258904
+# Parent bcbc64dfb629c5f188bbf59b8f986ad95963ed60
+8143245, PR3548: Zero build requires disabled warnings
+Reviewed-by: dholmes, coleenp
+
+diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
+--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ # Copyright 2007, 2008 Red Hat, Inc.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+@@ -29,11 +29,6 @@
+ ifeq ($(USE_CLANG), true)
+ WARNING_FLAGS += -Wno-undef
+ endif
+-# Suppress some warning flags that are normally turned on for hotspot,
+-# because some of the zero code has not been updated accordingly.
+-WARNING_FLAGS += -Wno-return-type \
+- -Wno-format-nonliteral -Wno-format-security \
+- -Wno-maybe-uninitialized
+
+ # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+diff --git openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+--- openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
++++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+@@ -100,7 +100,7 @@
+ case T_DOUBLE:
+ case T_VOID:
+ return result;
+- default : ShouldNotReachHere();
++ default : ShouldNotReachHere(); return NULL_WORD;
+ }
+ }
+
+diff --git openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
+--- openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
++++ openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2007, 2008, 2010 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+@@ -62,7 +62,7 @@
+ }
+
+ void InterpreterRuntime::SignatureHandlerGeneratorBase::push(BasicType type) {
+- ffi_type *ftype;
++ ffi_type *ftype = NULL;
+ switch (type) {
+ case T_VOID:
+ ftype = &ffi_type_void;
+diff --git a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+@@ -1,6 +1,6 @@
+ /*
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+- * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
++ * Copyright 2016 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
+@@ -61,6 +61,7 @@
+
+ frame os::get_sender_for_C_frame(frame* fr) {
+ ShouldNotCallThis();
++ return frame(NULL, NULL); // silence compile warning.
+ }
+
+ frame os::current_frame() {
+@@ -98,16 +99,19 @@
+
+ address os::Linux::ucontext_get_pc(ucontext_t* uc) {
+ ShouldNotCallThis();
++ return NULL; // silence compile warnings
+ }
+
+ ExtendedPC os::fetch_frame_from_context(void* ucVoid,
+ intptr_t** ret_sp,
+ intptr_t** ret_fp) {
+ ShouldNotCallThis();
++ return NULL; // silence compile warnings
+ }
+
+ frame os::fetch_frame_from_context(void* ucVoid) {
+ ShouldNotCallThis();
++ return frame(NULL, NULL); // silence compile warnings
+ }
+
+ extern "C" JNIEXPORT int
+@@ -247,11 +251,16 @@
+ }
+ #endif // !PRODUCT
+
+- const char *fmt = "caught unhandled signal %d";
+ char buf[64];
+
+- sprintf(buf, fmt, sig);
++ sprintf(buf, "caught unhandled signal %d", sig);
++
++// Silence -Wformat-security warning for fatal()
++PRAGMA_DIAG_PUSH
++PRAGMA_FORMAT_NONLITERAL_IGNORED
+ fatal(buf);
++PRAGMA_DIAG_POP
++ return true; // silence compiler warnings
+ }
+
+ void os::Linux::init_thread_fpu_state(void) {
+@@ -260,6 +269,7 @@
+
+ int os::Linux::get_fpu_control_word() {
+ ShouldNotCallThis();
++ return -1; // silence compile warnings
+ }
+
+ void os::Linux::set_fpu_control_word(int fpu) {
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+@@ -110,6 +110,7 @@
+ void* ucontext,
+ bool isInJava) {
+ ShouldNotCallThis();
++ return false; // silence compile warning
+ }
+
+ // These routines are only used on cpu architectures that
diff --git a/jdk8145096-pr3693-undefined_behaviour.patch b/jdk8145096-pr3693-undefined_behaviour.patch
new file mode 100644
index 0000000..51aed3c
--- /dev/null
+++ b/jdk8145096-pr3693-undefined_behaviour.patch
@@ -0,0 +1,280 @@
+# HG changeset patch
+# User aph
+# Date 1549014450 -3600
+# Fri Feb 01 10:47:30 2019 +0100
+# Node ID f43f77de876acfbf29c02803418d4d06d83e7dc3
+# Parent 28f68e5c6fb323c521a489cfc92e8a129379378f
+8145096: Undefined behaviour in HotSpot
+Summary: Fix some integer overflows
+Reviewed-by: jrose, kvn, kbarrett, adinn, iklam
+
+diff --git openjdk.orig/hotspot/src/os/posix/vm/os_posix.cpp openjdk/hotspot/src/os/posix/vm/os_posix.cpp
+--- openjdk.orig/hotspot/src/os/posix/vm/os_posix.cpp
++++ openjdk/hotspot/src/os/posix/vm/os_posix.cpp
+@@ -604,7 +604,11 @@
+ strncpy(buffer, "none", size);
+
+ const struct {
+- int i;
++ // NB: i is an unsigned int here because SA_RESETHAND is on some
++ // systems 0x80000000, which is implicitly unsigned. Assignining
++ // it to an int field would be an overflow in unsigned-to-signed
++ // conversion.
++ unsigned int i;
+ const char* s;
+ } flaginfo [] = {
+ { SA_NOCLDSTOP, "SA_NOCLDSTOP" },
+diff --git openjdk.orig/hotspot/src/share/vm/opto/addnode.cpp openjdk/hotspot/src/share/vm/opto/addnode.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/addnode.cpp
++++ openjdk/hotspot/src/share/vm/opto/addnode.cpp
+@@ -344,8 +344,8 @@
+ const Type *AddINode::add_ring( const Type *t0, const Type *t1 ) const {
+ const TypeInt *r0 = t0->is_int(); // Handy access
+ const TypeInt *r1 = t1->is_int();
+- int lo = r0->_lo + r1->_lo;
+- int hi = r0->_hi + r1->_hi;
++ int lo = java_add(r0->_lo, r1->_lo);
++ int hi = java_add(r0->_hi, r1->_hi);
+ if( !(r0->is_con() && r1->is_con()) ) {
+ // Not both constants, compute approximate result
+ if( (r0->_lo & r1->_lo) < 0 && lo >= 0 ) {
+@@ -462,8 +462,8 @@
+ const Type *AddLNode::add_ring( const Type *t0, const Type *t1 ) const {
+ const TypeLong *r0 = t0->is_long(); // Handy access
+ const TypeLong *r1 = t1->is_long();
+- jlong lo = r0->_lo + r1->_lo;
+- jlong hi = r0->_hi + r1->_hi;
++ jlong lo = java_add(r0->_lo, r1->_lo);
++ jlong hi = java_add(r0->_hi, r1->_hi);
+ if( !(r0->is_con() && r1->is_con()) ) {
+ // Not both constants, compute approximate result
+ if( (r0->_lo & r1->_lo) < 0 && lo >= 0 ) {
+diff --git openjdk.orig/hotspot/src/share/vm/opto/loopTransform.cpp openjdk/hotspot/src/share/vm/opto/loopTransform.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/loopTransform.cpp
++++ openjdk/hotspot/src/share/vm/opto/loopTransform.cpp
+@@ -1310,8 +1310,8 @@
+ limit = new (C) Opaque2Node( C, limit );
+ register_new_node( limit, opaq_ctrl );
+ }
+- if (stride_con > 0 && ((limit_type->_lo - stride_con) < limit_type->_lo) ||
+- stride_con < 0 && ((limit_type->_hi - stride_con) > limit_type->_hi)) {
++ if (stride_con > 0 && (java_subtract(limit_type->_lo, stride_con) < limit_type->_lo) ||
++ stride_con < 0 && (java_subtract(limit_type->_hi, stride_con) > limit_type->_hi)) {
+ // No underflow.
+ new_limit = new (C) SubINode(limit, stride);
+ } else {
+diff --git openjdk.orig/hotspot/src/share/vm/opto/mulnode.cpp openjdk/hotspot/src/share/vm/opto/mulnode.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/mulnode.cpp
++++ openjdk/hotspot/src/share/vm/opto/mulnode.cpp
+@@ -244,13 +244,13 @@
+ double d = (double)hi1;
+
+ // Compute all endpoints & check for overflow
+- int32 A = lo0*lo1;
++ int32 A = java_multiply(lo0, lo1);
+ if( (double)A != a*c ) return TypeInt::INT; // Overflow?
+- int32 B = lo0*hi1;
++ int32 B = java_multiply(lo0, hi1);
+ if( (double)B != a*d ) return TypeInt::INT; // Overflow?
+- int32 C = hi0*lo1;
++ int32 C = java_multiply(hi0, lo1);
+ if( (double)C != b*c ) return TypeInt::INT; // Overflow?
+- int32 D = hi0*hi1;
++ int32 D = java_multiply(hi0, hi1);
+ if( (double)D != b*d ) return TypeInt::INT; // Overflow?
+
+ if( A < B ) { lo0 = A; hi0 = B; } // Sort range endpoints
+@@ -340,13 +340,13 @@
+ double d = (double)hi1;
+
+ // Compute all endpoints & check for overflow
+- jlong A = lo0*lo1;
++ jlong A = java_multiply(lo0, lo1);
+ if( (double)A != a*c ) return TypeLong::LONG; // Overflow?
+- jlong B = lo0*hi1;
++ jlong B = java_multiply(lo0, hi1);
+ if( (double)B != a*d ) return TypeLong::LONG; // Overflow?
+- jlong C = hi0*lo1;
++ jlong C = java_multiply(hi0, lo1);
+ if( (double)C != b*c ) return TypeLong::LONG; // Overflow?
+- jlong D = hi0*hi1;
++ jlong D = java_multiply(hi0, hi1);
+ if( (double)D != b*d ) return TypeLong::LONG; // Overflow?
+
+ if( A < B ) { lo0 = A; hi0 = B; } // Sort range endpoints
+@@ -573,7 +573,8 @@
+ // Masking off high bits which are always zero is useless.
+ const TypeLong* t1 = phase->type( in(1) )->isa_long();
+ if (t1 != NULL && t1->_lo >= 0) {
+- jlong t1_support = ((jlong)1 << (1 + log2_long(t1->_hi))) - 1;
++ int bit_count = log2_long(t1->_hi) + 1;
++ jlong t1_support = jlong(max_julong >> (BitsPerJavaLong - bit_count));
+ if ((t1_support & con) == t1_support)
+ return usr;
+ }
+@@ -801,7 +802,7 @@
+
+ // Check for ((x & ((CONST64(1)<<(64-c0))-1)) << c0) which ANDs off high bits
+ // before shifting them away.
+- const jlong bits_mask = ((jlong)CONST64(1) << (jlong)(BitsPerJavaLong - con)) - CONST64(1);
++ const jlong bits_mask = jlong(max_julong >> con);
+ if( add1_op == Op_AndL &&
+ phase->type(add1->in(2)) == TypeLong::make( bits_mask ) )
+ return new (phase->C) LShiftLNode( add1->in(1), in(2) );
+@@ -1253,7 +1254,7 @@
+ if ( con == 0 ) return NULL; // let Identity() handle a 0 shift count
+ // note: mask computation below does not work for 0 shift count
+ // We'll be wanting the right-shift amount as a mask of that many bits
+- const jlong mask = (((jlong)CONST64(1) << (jlong)(BitsPerJavaLong - con)) -1);
++ const jlong mask = jlong(max_julong >> con);
+
+ // Check for ((x << z) + Y) >>> z. Replace with x + con>>>z
+ // The idiom for rounding to a power of 2 is "(Q+(2^z-1)) >>> z".
+diff --git openjdk.orig/hotspot/src/share/vm/opto/subnode.cpp openjdk/hotspot/src/share/vm/opto/subnode.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/subnode.cpp
++++ openjdk/hotspot/src/share/vm/opto/subnode.cpp
+@@ -252,8 +252,8 @@
+ const Type *SubINode::sub( const Type *t1, const Type *t2 ) const {
+ const TypeInt *r0 = t1->is_int(); // Handy access
+ const TypeInt *r1 = t2->is_int();
+- int32 lo = r0->_lo - r1->_hi;
+- int32 hi = r0->_hi - r1->_lo;
++ int32 lo = java_subtract(r0->_lo, r1->_hi);
++ int32 hi = java_subtract(r0->_hi, r1->_lo);
+
+ // We next check for 32-bit overflow.
+ // If that happens, we just assume all integers are possible.
+@@ -361,8 +361,8 @@
+ const Type *SubLNode::sub( const Type *t1, const Type *t2 ) const {
+ const TypeLong *r0 = t1->is_long(); // Handy access
+ const TypeLong *r1 = t2->is_long();
+- jlong lo = r0->_lo - r1->_hi;
+- jlong hi = r0->_hi - r1->_lo;
++ jlong lo = java_subtract(r0->_lo, r1->_hi);
++ jlong hi = java_subtract(r0->_hi, r1->_lo);
+
+ // We next check for 32-bit overflow.
+ // If that happens, we just assume all integers are possible.
+diff --git openjdk.orig/hotspot/src/share/vm/opto/type.cpp openjdk/hotspot/src/share/vm/opto/type.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/type.cpp
++++ openjdk/hotspot/src/share/vm/opto/type.cpp
+@@ -1329,8 +1329,8 @@
+
+ // The new type narrows the old type, so look for a "death march".
+ // See comments on PhaseTransform::saturate.
+- juint nrange = _hi - _lo;
+- juint orange = ohi - olo;
++ juint nrange = (juint)_hi - _lo;
++ juint orange = (juint)ohi - olo;
+ if (nrange < max_juint - 1 && nrange > (orange >> 1) + (SMALLINT*2)) {
+ // Use the new type only if the range shrinks a lot.
+ // We do not want the optimizer computing 2^31 point by point.
+@@ -1363,7 +1363,7 @@
+ //------------------------------hash-------------------------------------------
+ // Type-specific hashing function.
+ int TypeInt::hash(void) const {
+- return _lo+_hi+_widen+(int)Type::Int;
++ return java_add(java_add(_lo, _hi), java_add(_widen, (int)Type::Int));
+ }
+
+ //------------------------------is_finite--------------------------------------
+@@ -1544,7 +1544,7 @@
+ // If neither endpoint is extremal yet, push out the endpoint
+ // which is closer to its respective limit.
+ if (_lo >= 0 || // easy common case
+- (julong)(_lo - min) >= (julong)(max - _hi)) {
++ ((julong)_lo - min) >= ((julong)max - _hi)) {
+ // Try to widen to an unsigned range type of 32/63 bits:
+ if (max >= max_juint && _hi < max_juint)
+ return make(_lo, max_juint, WidenMax);
+@@ -2314,7 +2314,7 @@
+ //------------------------------hash-------------------------------------------
+ // Type-specific hashing function.
+ int TypePtr::hash(void) const {
+- return _ptr + _offset;
++ return java_add(_ptr, _offset);
+ }
+
+ //------------------------------dump2------------------------------------------
+@@ -2904,12 +2904,8 @@
+ // Type-specific hashing function.
+ int TypeOopPtr::hash(void) const {
+ return
+- (const_oop() ? const_oop()->hash() : 0) +
+- _klass_is_exact +
+- _instance_id +
+- hash_speculative() +
+- _inline_depth +
+- TypePtr::hash();
++ java_add(java_add(java_add(const_oop() ? const_oop()->hash() : 0, _klass_is_exact),
++ java_add(_instance_id , hash_speculative())), java_add(_inline_depth , TypePtr::hash()));
+ }
+
+ //------------------------------dump2------------------------------------------
+@@ -3635,7 +3631,7 @@
+ //------------------------------hash-------------------------------------------
+ // Type-specific hashing function.
+ int TypeInstPtr::hash(void) const {
+- int hash = klass()->hash() + TypeOopPtr::hash();
++ int hash = java_add(klass()->hash(), TypeOopPtr::hash());
+ return hash;
+ }
+
+@@ -4530,7 +4526,7 @@
+ //------------------------------hash-------------------------------------------
+ // Type-specific hashing function.
+ int TypeKlassPtr::hash(void) const {
+- return klass()->hash() + TypePtr::hash();
++ return java_add(klass()->hash(), TypePtr::hash());
+ }
+
+ //------------------------------singleton--------------------------------------
+diff --git openjdk.orig/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp openjdk/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
++++ openjdk/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
+@@ -131,7 +131,8 @@
+ }
+
+ double AdvancedThresholdPolicy::weight(Method* method) {
+- return (method->rate() + 1) * ((method->invocation_count() + 1) * (method->backedge_count() + 1));
++ return (double)(method->rate() + 1) *
++ (method->invocation_count() + 1) * (method->backedge_count() + 1);
+ }
+
+ // Apply heuristics and return true if x should be compiled before y
+diff --git openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp
++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+@@ -1403,6 +1403,32 @@
+
+ #define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0]))
+
++//----------------------------------------------------------------------------------------------------
++// Sum and product which can never overflow: they wrap, just like the
++// Java operations. Note that we don't intend these to be used for
++// general-purpose arithmetic: their purpose is to emulate Java
++// operations.
++
++// The goal of this code to avoid undefined or implementation-defined
++// behaviour. The use of an lvalue to reference cast is explicitly
++// permitted by Lvalues and rvalues [basic.lval]. [Section 3.10 Para
++// 15 in C++03]
++#define JAVA_INTEGER_OP(OP, NAME, TYPE, UNSIGNED_TYPE) \
++inline TYPE NAME (TYPE in1, TYPE in2) { \
++ UNSIGNED_TYPE ures = static_cast<UNSIGNED_TYPE>(in1); \
++ ures OP ## = static_cast<UNSIGNED_TYPE>(in2); \
++ return reinterpret_cast<TYPE&>(ures); \
++}
++
++JAVA_INTEGER_OP(+, java_add, jint, juint)
++JAVA_INTEGER_OP(-, java_subtract, jint, juint)
++JAVA_INTEGER_OP(*, java_multiply, jint, juint)
++JAVA_INTEGER_OP(+, java_add, jlong, julong)
++JAVA_INTEGER_OP(-, java_subtract, jlong, julong)
++JAVA_INTEGER_OP(*, java_multiply, jlong, julong)
++
++#undef JAVA_INTEGER_OP
++
+ // Dereference vptr
+ // All C++ compilers that we know of have the vtbl pointer in the first
+ // word. If there are exceptions, this function needs to be made compiler
diff --git a/jdk8154313-generated_javadoc_scattered_all_over_the_place.patch b/jdk8154313-generated_javadoc_scattered_all_over_the_place.patch
new file mode 100644
index 0000000..3a43c5f
--- /dev/null
+++ b/jdk8154313-generated_javadoc_scattered_all_over_the_place.patch
@@ -0,0 +1,68 @@
+--- jdk8/make/Javadoc.gmk 2016-04-01 16:53:41.069477682 +0200
++++ jdk8/make/Javadoc.gmk 2016-04-01 16:53:41.014477059 +0200
+@@ -220,6 +220,12 @@
+ JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
+ PLATFORM_DOCSDIR = $(DOCSDIR)/platform
+
++
++JAVADOC_ARCHIVE_NAME := jdk-$(FULL_VERSION)-docs.zip
++JAVADOC_ARCHIVE_ASSEMBLY_DIR := $(DOCSTMPDIR)/zip-docs
++JAVADOC_ARCHIVE_DIR := $(OUTPUT_ROOT)/bundles
++JAVADOC_ARCHIVE := $(JAVADOC_ARCHIVE_DIR)/$(JAVADOC_ARCHIVE_NAME)
++
+ # The non-core api javadocs need to be able to access the root of the core
+ # api directory, so for jdk/api or jre/api to get to the core api/
+ # directory we would use this:
+@@ -319,6 +325,37 @@
+ all: docs
+ docs: coredocs otherdocs
+
++#
++# Optional target which bundles all generated javadocs into a zip
++# archive. The dependency on docs is handled in Main.gmk. Incremental
++# building of docs is currently broken so if you invoke zip-docs after
++# docs, the docs are always rebuilt.
++#
++
++zip-docs: $(JAVADOC_ARCHIVE)
++
++#
++# Add the core docs as prerequisite to the archive to trigger a rebuild
++# if the core docs were rebuilt. Ideally any doc rebuild should trigger
++# this, but the way prerequisites are currently setup in this file, that
++# is hard to achieve.
++#
++
++$(JAVADOC_ARCHIVE): $(COREAPI_INDEX_FILE)
++ @$(ECHO) "Compressing javadoc to single $(JAVADOC_ARCHIVE_NAME)" ;
++ $(MKDIR) -p $(JAVADOC_ARCHIVE_DIR) ;
++ $(RM) -r $(JAVADOC_ARCHIVE_ASSEMBLY_DIR) ;
++ $(MKDIR) -p $(JAVADOC_ARCHIVE_ASSEMBLY_DIR);
++ all_roots=`$(FIND) $(DOCSDIR) | $(GREP) index.html `; \
++ pushd $(JAVADOC_ARCHIVE_ASSEMBLY_DIR); \
++ for index_file in $${all_roots} ; do \
++ target_dir=`dirname $${index_file}`; \
++ name=`$(ECHO) $${target_dir} | $(SED) "s;/spec;;" | $(SED) "s;.*/;;"`; \
++ $(LN) -s $${target_dir} $${name}; \
++ done; \
++ $(ZIP) -q -r $(JAVADOC_ARCHIVE) * ; \
++ popd ;
++
+ #################################################################
+ # Production Targets -- USE THESE TARGETS WHEN:
+ # a) You're generating docs outside of release engineering's
+--- jdk8/make/Main.gmk 2016-04-01 16:53:41.311480424 +0200
++++ jdk8/make/Main.gmk 2016-04-01 16:53:41.266479914 +0200
+@@ -165,6 +165,12 @@
+ @($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
+ @$(call TargetExit)
+
++zip-docs: docs zip-docs-only
++zip-docs-only: start-make
++ @$(call TargetEnter)
++ @($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk zip-docs)
++ @$(call TargetExit)
++
+ sign-jars: jdk sign-jars-only
+ sign-jars-only: start-make
+ @$(call TargetEnter)
diff --git a/jdk8160748-aarch64_ideal_reg.patch b/jdk8160748-aarch64_ideal_reg.patch
new file mode 100644
index 0000000..b3e6ea6
--- /dev/null
+++ b/jdk8160748-aarch64_ideal_reg.patch
@@ -0,0 +1,39 @@
+# HG changeset patch
+# User kbarrett
+# Date 1547614745 0
+# Wed Jan 16 04:59:05 2019 +0000
+# Node ID bca8195a3bc70df281a73d9a40032c673971676c
+# Parent 09abae195e9a7e134a1cfd9b375a6f4d95091de7
+8160748: [AArch64] Inconsistent types for ideal_reg
+Summary: Made ideal_reg consistently uint.
+Reviewed-by: kvn, iveresov
+
+diff --git openjdk.orig/hotspot/src/cpu/aarch64/vm/aarch64.ad openjdk/hotspot/src/cpu/aarch64/vm/aarch64.ad
+--- openjdk.orig/hotspot/src/cpu/aarch64/vm/aarch64.ad
++++ openjdk/hotspot/src/cpu/aarch64/vm/aarch64.ad
+@@ -1,6 +1,6 @@
+ //
++// Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ // Copyright (c) 2013, Red Hat Inc.
+-// Copyright (c) 2003, 2012, Oracle and/or its affiliates.
+ // All rights reserved.
+ // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ //
+@@ -3449,7 +3449,7 @@
+ }
+
+ // Vector ideal reg.
+-const int Matcher::vector_ideal_reg(int len) {
++const uint Matcher::vector_ideal_reg(int len) {
+ switch(len) {
+ case 8: return Op_VecD;
+ case 16: return Op_VecX;
+@@ -3458,7 +3458,7 @@
+ return 0;
+ }
+
+-const int Matcher::vector_shift_count_ideal_reg(int size) {
++const uint Matcher::vector_shift_count_ideal_reg(int size) {
+ return Op_VecX;
+ }
+
diff --git a/jdk8164920-pr3574-rh1498936-ppc_crc32_enhancement.patch b/jdk8164920-pr3574-rh1498936-ppc_crc32_enhancement.patch
new file mode 100644
index 0000000..27a2ed4
--- /dev/null
+++ b/jdk8164920-pr3574-rh1498936-ppc_crc32_enhancement.patch
@@ -0,0 +1,1152 @@
+# HG changeset patch
+# User mdoerr
+# Date 1474539444 -7200
+# Thu Sep 22 12:17:24 2016 +0200
+# Node ID de4f1f9fbcc5b7b30e1a796b7cf88a16943e785f
+# Parent 567e95df42f866b890dc3f0670e086d266915112
+8164920, PR3574, RH1498936: ppc: enhancement of CRC32 intrinsic
+Reviewed-by: goetz, mdoerr
+Contributed-by: Hiroshi H Horii <horii(a)jp.ibm.com>
+
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp openjdk/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
+@@ -468,6 +468,10 @@
+ LVSL_OPCODE = (31u << OPCODE_SHIFT | 6u << 1),
+ LVSR_OPCODE = (31u << OPCODE_SHIFT | 38u << 1),
+
++ // Vector-Scalar (VSX) instruction support.
++ MTVSRD_OPCODE = (31u << OPCODE_SHIFT | 179u << 1),
++ MFVSRD_OPCODE = (31u << OPCODE_SHIFT | 51u << 1),
++
+ // Vector Permute and Formatting
+ VPKPX_OPCODE = (4u << OPCODE_SHIFT | 782u ),
+ VPKSHSS_OPCODE = (4u << OPCODE_SHIFT | 398u ),
+@@ -1938,6 +1942,10 @@
+ inline void mtvscr( VectorRegister b);
+ inline void mfvscr( VectorRegister d);
+
++ // Vector-Scalar (VSX) instructions.
++ inline void mtvrd( VectorRegister d, Register a);
++ inline void mfvrd( Register a, VectorRegister d);
++
+ // AES (introduced with Power 8)
+ inline void vcipher( VectorRegister d, VectorRegister a, VectorRegister b);
+ inline void vcipherlast( VectorRegister d, VectorRegister a, VectorRegister b);
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp openjdk/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp
+@@ -623,6 +623,10 @@
+ inline void Assembler::lvsl( VectorRegister d, Register s1, Register s2) { emit_int32( LVSL_OPCODE | vrt(d) | ra0mem(s1) | rb(s2)); }
+ inline void Assembler::lvsr( VectorRegister d, Register s1, Register s2) { emit_int32( LVSR_OPCODE | vrt(d) | ra0mem(s1) | rb(s2)); }
+
++// Vector-Scalar (VSX) instructions.
++inline void Assembler::mtvrd( VectorRegister d, Register a) { emit_int32( MTVSRD_OPCODE | vrt(d) | ra(a) | 1u); } // 1u: d is treated as Vector (VMX/Altivec).
++inline void Assembler::mfvrd( Register a, VectorRegister d) { emit_int32( MFVSRD_OPCODE | vrt(d) | ra(a) | 1u); } // 1u: d is treated as Vector (VMX/Altivec).
++
+ inline void Assembler::vpkpx( VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VPKPX_OPCODE | vrt(d) | vra(a) | vrb(b)); }
+ inline void Assembler::vpkshss( VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VPKSHSS_OPCODE | vrt(d) | vra(a) | vrb(b)); }
+ inline void Assembler::vpkswss( VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VPKSWSS_OPCODE | vrt(d) | vra(a) | vrb(b)); }
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
+@@ -3423,6 +3423,565 @@
+ BLOCK_COMMENT("} kernel_crc32_1byte");
+ }
+
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param table register pointing to CRC table
++ * @param constants register pointing to CRC table for 128-bit aligned memory
++ * @param barretConstants register pointing to table for barrett reduction
++ * @param t0 volatile register
++ * @param t1 volatile register
++ * @param t2 volatile register
++ * @param t3 volatile register
++ */
++void MacroAssembler::kernel_crc32_1word_vpmsumd(Register crc, Register buf, Register len, Register table,
++ Register constants, Register barretConstants,
++ Register t0, Register t1, Register t2, Register t3, Register t4) {
++ assert_different_registers(crc, buf, len, table);
++
++ Label L_alignedHead, L_tail, L_alignTail, L_start, L_end;
++
++ Register prealign = t0;
++ Register postalign = t0;
++
++ BLOCK_COMMENT("kernel_crc32_1word_vpmsumb {");
++
++ // 1. use kernel_crc32_1word for shorter than 384bit
++ clrldi(len, len, 32);
++ cmpdi(CCR0, len, 384);
++ bge(CCR0, L_start);
++
++ Register tc0 = t4;
++ Register tc1 = constants;
++ Register tc2 = barretConstants;
++ kernel_crc32_1word(crc, buf, len, table,t0, t1, t2, t3, tc0, tc1, tc2, table);
++ b(L_end);
++
++ BIND(L_start);
++
++ // 2. ~c
++ nand(crc, crc, crc);
++
++ // 3. calculate from 0 to first 128bit-aligned address
++ clrldi_(prealign, buf, 57);
++ beq(CCR0, L_alignedHead);
++
++ subfic(prealign, prealign, 128);
++
++ subf(len, prealign, len);
++ update_byteLoop_crc32(crc, buf, prealign, table, t2, false, false);
++
++ // 4. calculate from first 128bit-aligned address to last 128bit-aligned address
++ BIND(L_alignedHead);
++
++ clrldi(postalign, len, 57);
++ subf(len, postalign, len);
++
++ // len must be more than 256bit
++ kernel_crc32_1word_aligned(crc, buf, len, constants, barretConstants, t1, t2, t3);
++
++ // 5. calculate remaining
++ cmpdi(CCR0, postalign, 0);
++ beq(CCR0, L_tail);
++
++ update_byteLoop_crc32(crc, buf, postalign, table, t2, false, false);
++
++ BIND(L_tail);
++
++ // 6. ~c
++ nand(crc, crc, crc);
++
++ BIND(L_end);
++
++ BLOCK_COMMENT("} kernel_crc32_1word_vpmsumb");
++}
++
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param constants register pointing to CRC table for 128-bit aligned memory
++ * @param barretConstants register pointing to table for barrett reduction
++ * @param t0 volatile register
++ * @param t1 volatile register
++ * @param t2 volatile register
++ */
++void MacroAssembler::kernel_crc32_1word_aligned(Register crc, Register buf, Register len,
++ Register constants, Register barretConstants, Register t0, Register t1, Register t2) {
++ Label L_mainLoop, L_tail, L_alignTail, L_barrett_reduction, L_end, L_first_warm_up_done, L_first_cool_down, L_second_cool_down, L_XOR, L_test;
++ Label L_lv0, L_lv1, L_lv2, L_lv3, L_lv4, L_lv5, L_lv6, L_lv7, L_lv8, L_lv9, L_lv10, L_lv11, L_lv12, L_lv13, L_lv14, L_lv15;
++ Label L_1, L_2, L_3, L_4;
++
++ Register rLoaded = t0;
++ Register rTmp1 = t1;
++ Register rTmp2 = t2;
++ Register off16 = R22;
++ Register off32 = R23;
++ Register off48 = R24;
++ Register off64 = R25;
++ Register off80 = R26;
++ Register off96 = R27;
++ Register off112 = R28;
++ Register rIdx = R29;
++ Register rMax = R30;
++ Register constantsPos = R31;
++
++ VectorRegister mask_32bit = VR24;
++ VectorRegister mask_64bit = VR25;
++ VectorRegister zeroes = VR26;
++ VectorRegister const1 = VR27;
++ VectorRegister const2 = VR28;
++
++ // Save non-volatile vector registers (frameless).
++ Register offset = t1; int offsetInt = 0;
++ offsetInt -= 16; li(offset, -16); stvx(VR20, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR21, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR22, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR23, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR24, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR25, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR26, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR27, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR28, offset, R1_SP);
++ offsetInt -= 8; std(R22, offsetInt, R1_SP);
++ offsetInt -= 8; std(R23, offsetInt, R1_SP);
++ offsetInt -= 8; std(R24, offsetInt, R1_SP);
++ offsetInt -= 8; std(R25, offsetInt, R1_SP);
++ offsetInt -= 8; std(R26, offsetInt, R1_SP);
++ offsetInt -= 8; std(R27, offsetInt, R1_SP);
++ offsetInt -= 8; std(R28, offsetInt, R1_SP);
++ offsetInt -= 8; std(R29, offsetInt, R1_SP);
++ offsetInt -= 8; std(R30, offsetInt, R1_SP);
++ offsetInt -= 8; std(R31, offsetInt, R1_SP);
++
++ // Set constants
++ li(off16, 16);
++ li(off32, 32);
++ li(off48, 48);
++ li(off64, 64);
++ li(off80, 80);
++ li(off96, 96);
++ li(off112, 112);
++
++ clrldi(crc, crc, 32);
++
++ vxor(zeroes, zeroes, zeroes);
++ vspltisw(VR0, -1);
++
++ vsldoi(mask_32bit, zeroes, VR0, 4);
++ vsldoi(mask_64bit, zeroes, VR0, -8);
++
++ // Get the initial value into v8
++ vxor(VR8, VR8, VR8);
++ mtvrd(VR8, crc);
++ vsldoi(VR8, zeroes, VR8, -8); // shift into bottom 32 bits
++
++ li (rLoaded, 0);
++
++ rldicr(rIdx, len, 0, 56);
++
++ {
++ BIND(L_1);
++ // Checksum in blocks of MAX_SIZE (32768)
++ lis(rMax, 0);
++ ori(rMax, rMax, 32768);
++ mr(rTmp2, rMax);
++ cmpd(CCR0, rIdx, rMax);
++ bgt(CCR0, L_2);
++ mr(rMax, rIdx);
++
++ BIND(L_2);
++ subf(rIdx, rMax, rIdx);
++
++ // our main loop does 128 bytes at a time
++ srdi(rMax, rMax, 7);
++
++ /*
++ * Work out the offset into the constants table to start at. Each
++ * constant is 16 bytes, and it is used against 128 bytes of input
++ * data - 128 / 16 = 8
++ */
++ sldi(rTmp1, rMax, 4);
++ srdi(rTmp2, rTmp2, 3);
++ subf(rTmp1, rTmp1, rTmp2);
++
++ // We reduce our final 128 bytes in a separate step
++ addi(rMax, rMax, -1);
++ mtctr(rMax);
++
++ // Find the start of our constants
++ add(constantsPos, constants, rTmp1);
++
++ // zero VR0-v7 which will contain our checksums
++ vxor(VR0, VR0, VR0);
++ vxor(VR1, VR1, VR1);
++ vxor(VR2, VR2, VR2);
++ vxor(VR3, VR3, VR3);
++ vxor(VR4, VR4, VR4);
++ vxor(VR5, VR5, VR5);
++ vxor(VR6, VR6, VR6);
++ vxor(VR7, VR7, VR7);
++
++ lvx(const1, constantsPos);
++
++ /*
++ * If we are looping back to consume more data we use the values
++ * already in VR16-v23.
++ */
++ cmpdi(CCR0, rLoaded, 1);
++ beq(CCR0, L_3);
++ {
++
++ // First warm up pass
++ lvx(VR16, buf);
++ lvx(VR17, off16, buf);
++ lvx(VR18, off32, buf);
++ lvx(VR19, off48, buf);
++ lvx(VR20, off64, buf);
++ lvx(VR21, off80, buf);
++ lvx(VR22, off96, buf);
++ lvx(VR23, off112, buf);
++ addi(buf, buf, 8*16);
++
++ // xor in initial value
++ vxor(VR16, VR16, VR8);
++ }
++
++ BIND(L_3);
++ bdz(L_first_warm_up_done);
++
++ addi(constantsPos, constantsPos, 16);
++ lvx(const2, constantsPos);
++
++ // Second warm up pass
++ vpmsumd(VR8, VR16, const1);
++ lvx(VR16, buf);
++
++ vpmsumd(VR9, VR17, const1);
++ lvx(VR17, off16, buf);
++
++ vpmsumd(VR10, VR18, const1);
++ lvx(VR18, off32, buf);
++
++ vpmsumd(VR11, VR19, const1);
++ lvx(VR19, off48, buf);
++
++ vpmsumd(VR12, VR20, const1);
++ lvx(VR20, off64, buf);
++
++ vpmsumd(VR13, VR21, const1);
++ lvx(VR21, off80, buf);
++
++ vpmsumd(VR14, VR22, const1);
++ lvx(VR22, off96, buf);
++
++ vpmsumd(VR15, VR23, const1);
++ lvx(VR23, off112, buf);
++
++ addi(buf, buf, 8 * 16);
++
++ bdz(L_first_cool_down);
++
++ /*
++ * main loop. We modulo schedule it such that it takes three iterations
++ * to complete - first iteration load, second iteration vpmsum, third
++ * iteration xor.
++ */
++ {
++ BIND(L_4);
++ lvx(const1, constantsPos); addi(constantsPos, constantsPos, 16);
++
++ vxor(VR0, VR0, VR8);
++ vpmsumd(VR8, VR16, const2);
++ lvx(VR16, buf);
++
++ vxor(VR1, VR1, VR9);
++ vpmsumd(VR9, VR17, const2);
++ lvx(VR17, off16, buf);
++
++ vxor(VR2, VR2, VR10);
++ vpmsumd(VR10, VR18, const2);
++ lvx(VR18, off32, buf);
++
++ vxor(VR3, VR3, VR11);
++ vpmsumd(VR11, VR19, const2);
++ lvx(VR19, off48, buf);
++ lvx(const2, constantsPos);
++
++ vxor(VR4, VR4, VR12);
++ vpmsumd(VR12, VR20, const1);
++ lvx(VR20, off64, buf);
++
++ vxor(VR5, VR5, VR13);
++ vpmsumd(VR13, VR21, const1);
++ lvx(VR21, off80, buf);
++
++ vxor(VR6, VR6, VR14);
++ vpmsumd(VR14, VR22, const1);
++ lvx(VR22, off96, buf);
++
++ vxor(VR7, VR7, VR15);
++ vpmsumd(VR15, VR23, const1);
++ lvx(VR23, off112, buf);
++
++ addi(buf, buf, 8 * 16);
++
++ bdnz(L_4);
++ }
++
++ BIND(L_first_cool_down);
++
++ // First cool down pass
++ lvx(const1, constantsPos);
++ addi(constantsPos, constantsPos, 16);
++
++ vxor(VR0, VR0, VR8);
++ vpmsumd(VR8, VR16, const1);
++
++ vxor(VR1, VR1, VR9);
++ vpmsumd(VR9, VR17, const1);
++
++ vxor(VR2, VR2, VR10);
++ vpmsumd(VR10, VR18, const1);
++
++ vxor(VR3, VR3, VR11);
++ vpmsumd(VR11, VR19, const1);
++
++ vxor(VR4, VR4, VR12);
++ vpmsumd(VR12, VR20, const1);
++
++ vxor(VR5, VR5, VR13);
++ vpmsumd(VR13, VR21, const1);
++
++ vxor(VR6, VR6, VR14);
++ vpmsumd(VR14, VR22, const1);
++
++ vxor(VR7, VR7, VR15);
++ vpmsumd(VR15, VR23, const1);
++
++ BIND(L_second_cool_down);
++ // Second cool down pass
++ vxor(VR0, VR0, VR8);
++ vxor(VR1, VR1, VR9);
++ vxor(VR2, VR2, VR10);
++ vxor(VR3, VR3, VR11);
++ vxor(VR4, VR4, VR12);
++ vxor(VR5, VR5, VR13);
++ vxor(VR6, VR6, VR14);
++ vxor(VR7, VR7, VR15);
++
++ /*
++ * vpmsumd produces a 96 bit result in the least significant bits
++ * of the register. Since we are bit reflected we have to shift it
++ * left 32 bits so it occupies the least significant bits in the
++ * bit reflected domain.
++ */
++ vsldoi(VR0, VR0, zeroes, 4);
++ vsldoi(VR1, VR1, zeroes, 4);
++ vsldoi(VR2, VR2, zeroes, 4);
++ vsldoi(VR3, VR3, zeroes, 4);
++ vsldoi(VR4, VR4, zeroes, 4);
++ vsldoi(VR5, VR5, zeroes, 4);
++ vsldoi(VR6, VR6, zeroes, 4);
++ vsldoi(VR7, VR7, zeroes, 4);
++
++ // xor with last 1024 bits
++ lvx(VR8, buf);
++ lvx(VR9, off16, buf);
++ lvx(VR10, off32, buf);
++ lvx(VR11, off48, buf);
++ lvx(VR12, off64, buf);
++ lvx(VR13, off80, buf);
++ lvx(VR14, off96, buf);
++ lvx(VR15, off112, buf);
++ addi(buf, buf, 8 * 16);
++
++ vxor(VR16, VR0, VR8);
++ vxor(VR17, VR1, VR9);
++ vxor(VR18, VR2, VR10);
++ vxor(VR19, VR3, VR11);
++ vxor(VR20, VR4, VR12);
++ vxor(VR21, VR5, VR13);
++ vxor(VR22, VR6, VR14);
++ vxor(VR23, VR7, VR15);
++
++ li(rLoaded, 1);
++ cmpdi(CCR0, rIdx, 0);
++ addi(rIdx, rIdx, 128);
++ bne(CCR0, L_1);
++ }
++
++ // Work out how many bytes we have left
++ andi_(len, len, 127);
++
++ // Calculate where in the constant table we need to start
++ subfic(rTmp1, len, 128);
++ add(constantsPos, constantsPos, rTmp1);
++
++ // How many 16 byte chunks are in the tail
++ srdi(rIdx, len, 4);
++ mtctr(rIdx);
++
++ /*
++ * Reduce the previously calculated 1024 bits to 64 bits, shifting
++ * 32 bits to include the trailing 32 bits of zeros
++ */
++ lvx(VR0, constantsPos);
++ lvx(VR1, off16, constantsPos);
++ lvx(VR2, off32, constantsPos);
++ lvx(VR3, off48, constantsPos);
++ lvx(VR4, off64, constantsPos);
++ lvx(VR5, off80, constantsPos);
++ lvx(VR6, off96, constantsPos);
++ lvx(VR7, off112, constantsPos);
++ addi(constantsPos, constantsPos, 8 * 16);
++
++ vpmsumw(VR0, VR16, VR0);
++ vpmsumw(VR1, VR17, VR1);
++ vpmsumw(VR2, VR18, VR2);
++ vpmsumw(VR3, VR19, VR3);
++ vpmsumw(VR4, VR20, VR4);
++ vpmsumw(VR5, VR21, VR5);
++ vpmsumw(VR6, VR22, VR6);
++ vpmsumw(VR7, VR23, VR7);
++
++ // Now reduce the tail (0 - 112 bytes)
++ cmpdi(CCR0, rIdx, 0);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off16, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off32, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off48,constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off64, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off80, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off96, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++
++ // Now xor all the parallel chunks together
++ BIND(L_XOR);
++ vxor(VR0, VR0, VR1);
++ vxor(VR2, VR2, VR3);
++ vxor(VR4, VR4, VR5);
++ vxor(VR6, VR6, VR7);
++
++ vxor(VR0, VR0, VR2);
++ vxor(VR4, VR4, VR6);
++
++ vxor(VR0, VR0, VR4);
++
++ b(L_barrett_reduction);
++
++ BIND(L_first_warm_up_done);
++ lvx(const1, constantsPos);
++ addi(constantsPos, constantsPos, 16);
++ vpmsumd(VR8, VR16, const1);
++ vpmsumd(VR9, VR17, const1);
++ vpmsumd(VR10, VR18, const1);
++ vpmsumd(VR11, VR19, const1);
++ vpmsumd(VR12, VR20, const1);
++ vpmsumd(VR13, VR21, const1);
++ vpmsumd(VR14, VR22, const1);
++ vpmsumd(VR15, VR23, const1);
++ b(L_second_cool_down);
++
++ BIND(L_barrett_reduction);
++
++ lvx(const1, barretConstants);
++ addi(barretConstants, barretConstants, 16);
++ lvx(const2, barretConstants);
++
++ vsldoi(VR1, VR0, VR0, -8);
++ vxor(VR0, VR0, VR1); // xor two 64 bit results together
++
++ // shift left one bit
++ vspltisb(VR1, 1);
++ vsl(VR0, VR0, VR1);
++
++ vand(VR0, VR0, mask_64bit);
++
++ /*
++ * The reflected version of Barrett reduction. Instead of bit
++ * reflecting our data (which is expensive to do), we bit reflect our
++ * constants and our algorithm, which means the intermediate data in
++ * our vector registers goes from 0-63 instead of 63-0. We can reflect
++ * the algorithm because we don't carry in mod 2 arithmetic.
++ */
++ vand(VR1, VR0, mask_32bit); // bottom 32 bits of a
++ vpmsumd(VR1, VR1, const1); // ma
++ vand(VR1, VR1, mask_32bit); // bottom 32bits of ma
++ vpmsumd(VR1, VR1, const2); // qn */
++ vxor(VR0, VR0, VR1); // a - qn, subtraction is xor in GF(2)
++
++ /*
++ * Since we are bit reflected, the result (ie the low 32 bits) is in
++ * the high 32 bits. We just need to shift it left 4 bytes
++ * V0 [ 0 1 X 3 ]
++ * V0 [ 0 X 2 3 ]
++ */
++ vsldoi(VR0, VR0, zeroes, 4); // shift result into top 64 bits of
++
++ // Get it into r3
++ mfvrd(crc, VR0);
++
++ BIND(L_end);
++
++ offsetInt = 0;
++ // Restore non-volatile Vector registers (frameless).
++ offsetInt -= 16; li(offset, -16); lvx(VR20, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR21, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR22, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR23, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR24, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR25, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR26, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR27, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR28, offset, R1_SP);
++ offsetInt -= 8; ld(R22, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R23, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R24, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R25, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R26, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R27, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R28, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R29, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R30, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R31, offsetInt, R1_SP);
++}
++
+ void MacroAssembler::kernel_crc32_singleByte(Register crc, Register buf, Register len, Register table, Register tmp) {
+ assert_different_registers(crc, buf, /* len, not used!! */ table, tmp);
+
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
+@@ -656,6 +656,13 @@
+ Register tc0, Register tc1, Register tc2, Register tc3);
+ void kernel_crc32_1byte(Register crc, Register buf, Register len, Register table,
+ Register t0, Register t1, Register t2, Register t3);
++ void kernel_crc32_1word_vpmsumd(Register crc, Register buf, Register len, Register table,
++ Register constants, Register barretConstants,
++ Register t0, Register t1, Register t2, Register t3, Register t4);
++ void kernel_crc32_1word_aligned(Register crc, Register buf, Register len,
++ Register constants, Register barretConstants,
++ Register t0, Register t1, Register t2);
++
+ void kernel_crc32_singleByte(Register crc, Register buf, Register len, Register table, Register tmp);
+
+ //
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
+@@ -2482,9 +2482,7 @@
+ * R5_ARG3 - int length (of buffer)
+ *
+ * scratch:
+- * R6_ARG4 - crc table address
+- * R7_ARG5 - tmp1
+- * R8_ARG6 - tmp2
++ * R2, R6-R12
+ *
+ * Ouput:
+ * R3_RET - int crc result
+@@ -2496,28 +2494,62 @@
+ address start = __ function_entry(); // Remember stub start address (is rtn value).
+
+ // arguments to kernel_crc32:
+- Register crc = R3_ARG1; // Current checksum, preset by caller or result from previous call.
+- Register data = R4_ARG2; // source byte array
+- Register dataLen = R5_ARG3; // #bytes to process
+- Register table = R6_ARG4; // crc table address
+-
+- Register t0 = R9; // work reg for kernel* emitters
+- Register t1 = R10; // work reg for kernel* emitters
+- Register t2 = R11; // work reg for kernel* emitters
+- Register t3 = R12; // work reg for kernel* emitters
+-
+- BLOCK_COMMENT("Stub body {");
+- assert_different_registers(crc, data, dataLen, table);
+-
+- StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
+-
+- __ kernel_crc32_1byte(crc, data, dataLen, table, t0, t1, t2, t3);
+-
+- BLOCK_COMMENT("return");
+- __ mr_if_needed(R3_RET, crc); // Updated crc is function result. No copying required (R3_ARG1 == R3_RET).
+- __ blr();
+-
+- BLOCK_COMMENT("} Stub body");
++ const Register crc = R3_ARG1; // Current checksum, preset by caller or result from previous call.
++ const Register data = R4_ARG2; // source byte array
++ const Register dataLen = R5_ARG3; // #bytes to process
++
++ const Register table = R6; // crc table address
++
++#ifdef VM_LITTLE_ENDIAN
++ if (VM_Version::has_vpmsumb()) {
++ const Register constants = R2; // constants address
++ const Register bconstants = R8; // barret table address
++
++ const Register t0 = R9;
++ const Register t1 = R10;
++ const Register t2 = R11;
++ const Register t3 = R12;
++ const Register t4 = R7;
++
++ BLOCK_COMMENT("Stub body {");
++ assert_different_registers(crc, data, dataLen, table);
++
++ StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
++ StubRoutines::ppc64::generate_load_crc_constants_addr(_masm, constants);
++ StubRoutines::ppc64::generate_load_crc_barret_constants_addr(_masm, bconstants);
++
++ __ kernel_crc32_1word_vpmsumd(crc, data, dataLen, table, constants, bconstants, t0, t1, t2, t3, t4);
++
++ BLOCK_COMMENT("return");
++ __ mr_if_needed(R3_RET, crc); // Updated crc is function result. No copying required (R3_ARG1 == R3_RET).
++ __ blr();
++
++ BLOCK_COMMENT("} Stub body");
++ } else
++#endif
++ {
++ const Register t0 = R2;
++ const Register t1 = R7;
++ const Register t2 = R8;
++ const Register t3 = R9;
++ const Register tc0 = R10;
++ const Register tc1 = R11;
++ const Register tc2 = R12;
++
++ BLOCK_COMMENT("Stub body {");
++ assert_different_registers(crc, data, dataLen, table);
++
++ StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
++
++ __ kernel_crc32_1word(crc, data, dataLen, table, t0, t1, t2, t3, tc0, tc1, tc2, table);
++
++ BLOCK_COMMENT("return");
++ __ mr_if_needed(R3_RET, crc); // Updated crc is function result. No copying required (R3_ARG1 == R3_RET).
++ __ blr();
++
++ BLOCK_COMMENT("} Stub body");
++ }
++
+ return start;
+ }
+
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
+@@ -37,6 +37,311 @@
+ __ load_const(table, StubRoutines::_crc_table_adr);
+ }
+
++void StubRoutines::ppc64::generate_load_crc_constants_addr(MacroAssembler* masm, Register table) {
++ __ load_const_optimized(table, (address)StubRoutines::ppc64::_constants, R0);
++}
++
++void StubRoutines::ppc64::generate_load_crc_barret_constants_addr(MacroAssembler* masm, Register table) {
++ __ load_const_optimized(table, (address)StubRoutines::ppc64::_barret_constants, R0);
++}
++
++juint* StubRoutines::ppc64::generate_crc_constants() {
++ juint constants[CRC32_CONSTANTS_SIZE] = {
++ // Reduce 262144 kbits to 1024 bits
++ 0x99ea94a8UL, 0x00000000UL, 0x651797d2UL, 0x00000001UL, // x^261120 mod p(x)` << 1, x^261184 mod p(x)` << 1
++ 0x945a8420UL, 0x00000000UL, 0x21e0d56cUL, 0x00000000UL, // x^260096 mod p(x)` << 1, x^260160 mod p(x)` << 1
++ 0x30762706UL, 0x00000000UL, 0x0f95ecaaUL, 0x00000000UL, // x^259072 mod p(x)` << 1, x^259136 mod p(x)` << 1
++ 0xa52fc582UL, 0x00000001UL, 0xebd224acUL, 0x00000001UL, // x^258048 mod p(x)` << 1, x^258112 mod p(x)` << 1
++ 0xa4a7167aUL, 0x00000001UL, 0x0ccb97caUL, 0x00000000UL, // x^257024 mod p(x)` << 1, x^257088 mod p(x)` << 1
++ 0x0c18249aUL, 0x00000000UL, 0x006ec8a8UL, 0x00000001UL, // x^256000 mod p(x)` << 1, x^256064 mod p(x)` << 1
++ 0xa924ae7cUL, 0x00000000UL, 0x4f58f196UL, 0x00000001UL, // x^254976 mod p(x)` << 1, x^255040 mod p(x)` << 1
++ 0xe12ccc12UL, 0x00000001UL, 0xa7192ca6UL, 0x00000001UL, // x^253952 mod p(x)` << 1, x^254016 mod p(x)` << 1
++ 0xa0b9d4acUL, 0x00000000UL, 0x9a64bab2UL, 0x00000001UL, // x^252928 mod p(x)` << 1, x^252992 mod p(x)` << 1
++ 0x95e8ddfeUL, 0x00000000UL, 0x14f4ed2eUL, 0x00000000UL, // x^251904 mod p(x)` << 1, x^251968 mod p(x)` << 1
++ 0x233fddc4UL, 0x00000000UL, 0x1092b6a2UL, 0x00000001UL, // x^250880 mod p(x)` << 1, x^250944 mod p(x)` << 1
++ 0xb4529b62UL, 0x00000001UL, 0xc8a1629cUL, 0x00000000UL, // x^249856 mod p(x)` << 1, x^249920 mod p(x)` << 1
++ 0xa7fa0e64UL, 0x00000001UL, 0x7bf32e8eUL, 0x00000001UL, // x^248832 mod p(x)` << 1, x^248896 mod p(x)` << 1
++ 0xb5334592UL, 0x00000001UL, 0xf8cc6582UL, 0x00000001UL, // x^247808 mod p(x)` << 1, x^247872 mod p(x)` << 1
++ 0x1f8ee1b4UL, 0x00000001UL, 0x8631ddf0UL, 0x00000000UL, // x^246784 mod p(x)` << 1, x^246848 mod p(x)` << 1
++ 0x6252e632UL, 0x00000000UL, 0x7e5a76d0UL, 0x00000000UL, // x^245760 mod p(x)` << 1, x^245824 mod p(x)` << 1
++ 0xab973e84UL, 0x00000000UL, 0x2b09b31cUL, 0x00000000UL, // x^244736 mod p(x)` << 1, x^244800 mod p(x)` << 1
++ 0x7734f5ecUL, 0x00000000UL, 0xb2df1f84UL, 0x00000001UL, // x^243712 mod p(x)` << 1, x^243776 mod p(x)` << 1
++ 0x7c547798UL, 0x00000000UL, 0xd6f56afcUL, 0x00000001UL, // x^242688 mod p(x)` << 1, x^242752 mod p(x)` << 1
++ 0x7ec40210UL, 0x00000000UL, 0xb9b5e70cUL, 0x00000001UL, // x^241664 mod p(x)` << 1, x^241728 mod p(x)` << 1
++ 0xab1695a8UL, 0x00000001UL, 0x34b626d2UL, 0x00000000UL, // x^240640 mod p(x)` << 1, x^240704 mod p(x)` << 1
++ 0x90494bbaUL, 0x00000000UL, 0x4c53479aUL, 0x00000001UL, // x^239616 mod p(x)` << 1, x^239680 mod p(x)` << 1
++ 0x123fb816UL, 0x00000001UL, 0xa6d179a4UL, 0x00000001UL, // x^238592 mod p(x)` << 1, x^238656 mod p(x)` << 1
++ 0xe188c74cUL, 0x00000001UL, 0x5abd16b4UL, 0x00000001UL, // x^237568 mod p(x)` << 1, x^237632 mod p(x)` << 1
++ 0xc2d3451cUL, 0x00000001UL, 0x018f9852UL, 0x00000000UL, // x^236544 mod p(x)` << 1, x^236608 mod p(x)` << 1
++ 0xf55cf1caUL, 0x00000000UL, 0x1fb3084aUL, 0x00000000UL, // x^235520 mod p(x)` << 1, x^235584 mod p(x)` << 1
++ 0xa0531540UL, 0x00000001UL, 0xc53dfb04UL, 0x00000000UL, // x^234496 mod p(x)` << 1, x^234560 mod p(x)` << 1
++ 0x32cd7ebcUL, 0x00000001UL, 0xe10c9ad6UL, 0x00000000UL, // x^233472 mod p(x)` << 1, x^233536 mod p(x)` << 1
++ 0x73ab7f36UL, 0x00000000UL, 0x25aa994aUL, 0x00000000UL, // x^232448 mod p(x)` << 1, x^232512 mod p(x)` << 1
++ 0x41aed1c2UL, 0x00000000UL, 0xfa3a74c4UL, 0x00000000UL, // x^231424 mod p(x)` << 1, x^231488 mod p(x)` << 1
++ 0x36c53800UL, 0x00000001UL, 0x33eb3f40UL, 0x00000000UL, // x^230400 mod p(x)` << 1, x^230464 mod p(x)` << 1
++ 0x26835a30UL, 0x00000001UL, 0x7193f296UL, 0x00000001UL, // x^229376 mod p(x)` << 1, x^229440 mod p(x)` << 1
++ 0x6241b502UL, 0x00000000UL, 0x43f6c86aUL, 0x00000000UL, // x^228352 mod p(x)` << 1, x^228416 mod p(x)` << 1
++ 0xd5196ad4UL, 0x00000000UL, 0x6b513ec6UL, 0x00000001UL, // x^227328 mod p(x)` << 1, x^227392 mod p(x)` << 1
++ 0x9cfa769aUL, 0x00000000UL, 0xc8f25b4eUL, 0x00000000UL, // x^226304 mod p(x)` << 1, x^226368 mod p(x)` << 1
++ 0x920e5df4UL, 0x00000000UL, 0xa45048ecUL, 0x00000001UL, // x^225280 mod p(x)` << 1, x^225344 mod p(x)` << 1
++ 0x69dc310eUL, 0x00000001UL, 0x0c441004UL, 0x00000000UL, // x^224256 mod p(x)` << 1, x^224320 mod p(x)` << 1
++ 0x09fc331cUL, 0x00000000UL, 0x0e17cad6UL, 0x00000000UL, // x^223232 mod p(x)` << 1, x^223296 mod p(x)` << 1
++ 0x0d94a81eUL, 0x00000001UL, 0x253ae964UL, 0x00000001UL, // x^222208 mod p(x)` << 1, x^222272 mod p(x)` << 1
++ 0x27a20ab2UL, 0x00000000UL, 0xd7c88ebcUL, 0x00000001UL, // x^221184 mod p(x)` << 1, x^221248 mod p(x)` << 1
++ 0x14f87504UL, 0x00000001UL, 0xe7ca913aUL, 0x00000001UL, // x^220160 mod p(x)` << 1, x^220224 mod p(x)` << 1
++ 0x4b076d96UL, 0x00000000UL, 0x33ed078aUL, 0x00000000UL, // x^219136 mod p(x)` << 1, x^219200 mod p(x)` << 1
++ 0xda4d1e74UL, 0x00000000UL, 0xe1839c78UL, 0x00000000UL, // x^218112 mod p(x)` << 1, x^218176 mod p(x)` << 1
++ 0x1b81f672UL, 0x00000000UL, 0x322b267eUL, 0x00000001UL, // x^217088 mod p(x)` << 1, x^217152 mod p(x)` << 1
++ 0x9367c988UL, 0x00000000UL, 0x638231b6UL, 0x00000000UL, // x^216064 mod p(x)` << 1, x^216128 mod p(x)` << 1
++ 0x717214caUL, 0x00000001UL, 0xee7f16f4UL, 0x00000001UL, // x^215040 mod p(x)` << 1, x^215104 mod p(x)` << 1
++ 0x9f47d820UL, 0x00000000UL, 0x17d9924aUL, 0x00000001UL, // x^214016 mod p(x)` << 1, x^214080 mod p(x)` << 1
++ 0x0d9a47d2UL, 0x00000001UL, 0xe1a9e0c4UL, 0x00000000UL, // x^212992 mod p(x)` << 1, x^213056 mod p(x)` << 1
++ 0xa696c58cUL, 0x00000000UL, 0x403731dcUL, 0x00000001UL, // x^211968 mod p(x)` << 1, x^212032 mod p(x)` << 1
++ 0x2aa28ec6UL, 0x00000000UL, 0xa5ea9682UL, 0x00000001UL, // x^210944 mod p(x)` << 1, x^211008 mod p(x)` << 1
++ 0xfe18fd9aUL, 0x00000001UL, 0x01c5c578UL, 0x00000001UL, // x^209920 mod p(x)` << 1, x^209984 mod p(x)` << 1
++ 0x9d4fc1aeUL, 0x00000001UL, 0xdddf6494UL, 0x00000000UL, // x^208896 mod p(x)` << 1, x^208960 mod p(x)` << 1
++ 0xba0e3deaUL, 0x00000001UL, 0xf1c3db28UL, 0x00000000UL, // x^207872 mod p(x)` << 1, x^207936 mod p(x)` << 1
++ 0x74b59a5eUL, 0x00000000UL, 0x3112fb9cUL, 0x00000001UL, // x^206848 mod p(x)` << 1, x^206912 mod p(x)` << 1
++ 0xf2b5ea98UL, 0x00000000UL, 0xb680b906UL, 0x00000000UL, // x^205824 mod p(x)` << 1, x^205888 mod p(x)` << 1
++ 0x87132676UL, 0x00000001UL, 0x1a282932UL, 0x00000000UL, // x^204800 mod p(x)` << 1, x^204864 mod p(x)` << 1
++ 0x0a8c6ad4UL, 0x00000001UL, 0x89406e7eUL, 0x00000000UL, // x^203776 mod p(x)` << 1, x^203840 mod p(x)` << 1
++ 0xe21dfe70UL, 0x00000001UL, 0xdef6be8cUL, 0x00000001UL, // x^202752 mod p(x)` << 1, x^202816 mod p(x)` << 1
++ 0xda0050e4UL, 0x00000001UL, 0x75258728UL, 0x00000000UL, // x^201728 mod p(x)` << 1, x^201792 mod p(x)` << 1
++ 0x772172aeUL, 0x00000000UL, 0x9536090aUL, 0x00000001UL, // x^200704 mod p(x)` << 1, x^200768 mod p(x)` << 1
++ 0xe47724aaUL, 0x00000000UL, 0xf2455bfcUL, 0x00000000UL, // x^199680 mod p(x)` << 1, x^199744 mod p(x)` << 1
++ 0x3cd63ac4UL, 0x00000000UL, 0x8c40baf4UL, 0x00000001UL, // x^198656 mod p(x)` << 1, x^198720 mod p(x)` << 1
++ 0xbf47d352UL, 0x00000001UL, 0x4cd390d4UL, 0x00000000UL, // x^197632 mod p(x)` << 1, x^197696 mod p(x)` << 1
++ 0x8dc1d708UL, 0x00000001UL, 0xe4ece95aUL, 0x00000001UL, // x^196608 mod p(x)` << 1, x^196672 mod p(x)` << 1
++ 0x2d4620a4UL, 0x00000000UL, 0x1a3ee918UL, 0x00000000UL, // x^195584 mod p(x)` << 1, x^195648 mod p(x)` << 1
++ 0x58fd1740UL, 0x00000000UL, 0x7c652fb8UL, 0x00000000UL, // x^194560 mod p(x)` << 1, x^194624 mod p(x)` << 1
++ 0xdadd9bfcUL, 0x00000000UL, 0x1c67842cUL, 0x00000001UL, // x^193536 mod p(x)` << 1, x^193600 mod p(x)` << 1
++ 0xea2140beUL, 0x00000001UL, 0x254f759cUL, 0x00000000UL, // x^192512 mod p(x)` << 1, x^192576 mod p(x)` << 1
++ 0x9de128baUL, 0x00000000UL, 0x7ece94caUL, 0x00000000UL, // x^191488 mod p(x)` << 1, x^191552 mod p(x)` << 1
++ 0x3ac3aa8eUL, 0x00000001UL, 0x38f258c2UL, 0x00000000UL, // x^190464 mod p(x)` << 1, x^190528 mod p(x)` << 1
++ 0x99980562UL, 0x00000000UL, 0xcdf17b00UL, 0x00000001UL, // x^189440 mod p(x)` << 1, x^189504 mod p(x)` << 1
++ 0xc1579c86UL, 0x00000001UL, 0x1f882c16UL, 0x00000001UL, // x^188416 mod p(x)` << 1, x^188480 mod p(x)` << 1
++ 0x68dbbf94UL, 0x00000000UL, 0x00093fc8UL, 0x00000001UL, // x^187392 mod p(x)` << 1, x^187456 mod p(x)` << 1
++ 0x4509fb04UL, 0x00000000UL, 0xcd684f16UL, 0x00000001UL, // x^186368 mod p(x)` << 1, x^186432 mod p(x)` << 1
++ 0x202f6398UL, 0x00000001UL, 0x4bc6a70aUL, 0x00000000UL, // x^185344 mod p(x)` << 1, x^185408 mod p(x)` << 1
++ 0x3aea243eUL, 0x00000001UL, 0x4fc7e8e4UL, 0x00000000UL, // x^184320 mod p(x)` << 1, x^184384 mod p(x)` << 1
++ 0xb4052ae6UL, 0x00000001UL, 0x30103f1cUL, 0x00000001UL, // x^183296 mod p(x)` << 1, x^183360 mod p(x)` << 1
++ 0xcd2a0ae8UL, 0x00000001UL, 0x11b0024cUL, 0x00000001UL, // x^182272 mod p(x)` << 1, x^182336 mod p(x)` << 1
++ 0xfe4aa8b4UL, 0x00000001UL, 0x0b3079daUL, 0x00000001UL, // x^181248 mod p(x)` << 1, x^181312 mod p(x)` << 1
++ 0xd1559a42UL, 0x00000001UL, 0x0192bcc2UL, 0x00000001UL, // x^180224 mod p(x)` << 1, x^180288 mod p(x)` << 1
++ 0xf3e05eccUL, 0x00000001UL, 0x74838d50UL, 0x00000000UL, // x^179200 mod p(x)` << 1, x^179264 mod p(x)` << 1
++ 0x04ddd2ccUL, 0x00000001UL, 0x1b20f520UL, 0x00000000UL, // x^178176 mod p(x)` << 1, x^178240 mod p(x)` << 1
++ 0x5393153cUL, 0x00000001UL, 0x50c3590aUL, 0x00000000UL, // x^177152 mod p(x)` << 1, x^177216 mod p(x)` << 1
++ 0x57e942c6UL, 0x00000000UL, 0xb41cac8eUL, 0x00000000UL, // x^176128 mod p(x)` << 1, x^176192 mod p(x)` << 1
++ 0x2c633850UL, 0x00000001UL, 0x0c72cc78UL, 0x00000000UL, // x^175104 mod p(x)` << 1, x^175168 mod p(x)` << 1
++ 0xebcaae4cUL, 0x00000000UL, 0x30cdb032UL, 0x00000000UL, // x^174080 mod p(x)` << 1, x^174144 mod p(x)` << 1
++ 0x3ee532a6UL, 0x00000001UL, 0x3e09fc32UL, 0x00000001UL, // x^173056 mod p(x)` << 1, x^173120 mod p(x)` << 1
++ 0xbf0cbc7eUL, 0x00000001UL, 0x1ed624d2UL, 0x00000000UL, // x^172032 mod p(x)` << 1, x^172096 mod p(x)` << 1
++ 0xd50b7a5aUL, 0x00000000UL, 0x781aee1aUL, 0x00000000UL, // x^171008 mod p(x)` << 1, x^171072 mod p(x)` << 1
++ 0x02fca6e8UL, 0x00000000UL, 0xc4d8348cUL, 0x00000001UL, // x^169984 mod p(x)` << 1, x^170048 mod p(x)` << 1
++ 0x7af40044UL, 0x00000000UL, 0x57a40336UL, 0x00000000UL, // x^168960 mod p(x)` << 1, x^169024 mod p(x)` << 1
++ 0x16178744UL, 0x00000000UL, 0x85544940UL, 0x00000000UL, // x^167936 mod p(x)` << 1, x^168000 mod p(x)` << 1
++ 0x4c177458UL, 0x00000001UL, 0x9cd21e80UL, 0x00000001UL, // x^166912 mod p(x)` << 1, x^166976 mod p(x)` << 1
++ 0x1b6ddf04UL, 0x00000001UL, 0x3eb95bc0UL, 0x00000001UL, // x^165888 mod p(x)` << 1, x^165952 mod p(x)` << 1
++ 0xf3e29cccUL, 0x00000001UL, 0xdfc9fdfcUL, 0x00000001UL, // x^164864 mod p(x)` << 1, x^164928 mod p(x)` << 1
++ 0x35ae7562UL, 0x00000001UL, 0xcd028bc2UL, 0x00000000UL, // x^163840 mod p(x)` << 1, x^163904 mod p(x)` << 1
++ 0x90ef812cUL, 0x00000001UL, 0x90db8c44UL, 0x00000000UL, // x^162816 mod p(x)` << 1, x^162880 mod p(x)` << 1
++ 0x67a2c786UL, 0x00000000UL, 0x0010a4ceUL, 0x00000001UL, // x^161792 mod p(x)` << 1, x^161856 mod p(x)` << 1
++ 0x48b9496cUL, 0x00000000UL, 0xc8f4c72cUL, 0x00000001UL, // x^160768 mod p(x)` << 1, x^160832 mod p(x)` << 1
++ 0x5a422de6UL, 0x00000001UL, 0x1c26170cUL, 0x00000000UL, // x^159744 mod p(x)` << 1, x^159808 mod p(x)` << 1
++ 0xef0e3640UL, 0x00000001UL, 0xe3fccf68UL, 0x00000000UL, // x^158720 mod p(x)` << 1, x^158784 mod p(x)` << 1
++ 0x006d2d26UL, 0x00000001UL, 0xd513ed24UL, 0x00000000UL, // x^157696 mod p(x)` << 1, x^157760 mod p(x)` << 1
++ 0x170d56d6UL, 0x00000001UL, 0x141beadaUL, 0x00000000UL, // x^156672 mod p(x)` << 1, x^156736 mod p(x)` << 1
++ 0xa5fb613cUL, 0x00000000UL, 0x1071aea0UL, 0x00000001UL, // x^155648 mod p(x)` << 1, x^155712 mod p(x)` << 1
++ 0x40bbf7fcUL, 0x00000000UL, 0x2e19080aUL, 0x00000001UL, // x^154624 mod p(x)` << 1, x^154688 mod p(x)` << 1
++ 0x6ac3a5b2UL, 0x00000001UL, 0x00ecf826UL, 0x00000001UL, // x^153600 mod p(x)` << 1, x^153664 mod p(x)` << 1
++ 0xabf16230UL, 0x00000000UL, 0x69b09412UL, 0x00000000UL, // x^152576 mod p(x)` << 1, x^152640 mod p(x)` << 1
++ 0xebe23facUL, 0x00000001UL, 0x22297bacUL, 0x00000001UL, // x^151552 mod p(x)` << 1, x^151616 mod p(x)` << 1
++ 0x8b6a0894UL, 0x00000000UL, 0xe9e4b068UL, 0x00000000UL, // x^150528 mod p(x)` << 1, x^150592 mod p(x)` << 1
++ 0x288ea478UL, 0x00000001UL, 0x4b38651aUL, 0x00000000UL, // x^149504 mod p(x)` << 1, x^149568 mod p(x)` << 1
++ 0x6619c442UL, 0x00000001UL, 0x468360e2UL, 0x00000001UL, // x^148480 mod p(x)` << 1, x^148544 mod p(x)` << 1
++ 0x86230038UL, 0x00000000UL, 0x121c2408UL, 0x00000000UL, // x^147456 mod p(x)` << 1, x^147520 mod p(x)` << 1
++ 0x7746a756UL, 0x00000001UL, 0xda7e7d08UL, 0x00000000UL, // x^146432 mod p(x)` << 1, x^146496 mod p(x)` << 1
++ 0x91b8f8f8UL, 0x00000001UL, 0x058d7652UL, 0x00000001UL, // x^145408 mod p(x)` << 1, x^145472 mod p(x)` << 1
++ 0x8e167708UL, 0x00000000UL, 0x4a098a90UL, 0x00000001UL, // x^144384 mod p(x)` << 1, x^144448 mod p(x)` << 1
++ 0x48b22d54UL, 0x00000001UL, 0x20dbe72eUL, 0x00000000UL, // x^143360 mod p(x)` << 1, x^143424 mod p(x)` << 1
++ 0x44ba2c3cUL, 0x00000000UL, 0x1e7323e8UL, 0x00000001UL, // x^142336 mod p(x)` << 1, x^142400 mod p(x)` << 1
++ 0xb54d2b52UL, 0x00000000UL, 0xd5d4bf94UL, 0x00000000UL, // x^141312 mod p(x)` << 1, x^141376 mod p(x)` << 1
++ 0x05a4fd8aUL, 0x00000000UL, 0x99d8746cUL, 0x00000001UL, // x^140288 mod p(x)` << 1, x^140352 mod p(x)` << 1
++ 0x39f9fc46UL, 0x00000001UL, 0xce9ca8a0UL, 0x00000000UL, // x^139264 mod p(x)` << 1, x^139328 mod p(x)` << 1
++ 0x5a1fa824UL, 0x00000001UL, 0x136edeceUL, 0x00000000UL, // x^138240 mod p(x)` << 1, x^138304 mod p(x)` << 1
++ 0x0a61ae4cUL, 0x00000000UL, 0x9b92a068UL, 0x00000001UL, // x^137216 mod p(x)` << 1, x^137280 mod p(x)` << 1
++ 0x45e9113eUL, 0x00000001UL, 0x71d62206UL, 0x00000000UL, // x^136192 mod p(x)` << 1, x^136256 mod p(x)` << 1
++ 0x6a348448UL, 0x00000000UL, 0xdfc50158UL, 0x00000000UL, // x^135168 mod p(x)` << 1, x^135232 mod p(x)` << 1
++ 0x4d80a08cUL, 0x00000000UL, 0x517626bcUL, 0x00000001UL, // x^134144 mod p(x)` << 1, x^134208 mod p(x)` << 1
++ 0x4b6837a0UL, 0x00000001UL, 0x48d1e4faUL, 0x00000001UL, // x^133120 mod p(x)` << 1, x^133184 mod p(x)` << 1
++ 0x6896a7fcUL, 0x00000001UL, 0x94d8266eUL, 0x00000000UL, // x^132096 mod p(x)` << 1, x^132160 mod p(x)` << 1
++ 0x4f187140UL, 0x00000001UL, 0x606c5e34UL, 0x00000000UL, // x^131072 mod p(x)` << 1, x^131136 mod p(x)` << 1
++ 0x9581b9daUL, 0x00000001UL, 0x9766beaaUL, 0x00000001UL, // x^130048 mod p(x)` << 1, x^130112 mod p(x)` << 1
++ 0x091bc984UL, 0x00000001UL, 0xd80c506cUL, 0x00000001UL, // x^129024 mod p(x)` << 1, x^129088 mod p(x)` << 1
++ 0x1067223cUL, 0x00000000UL, 0x1e73837cUL, 0x00000000UL, // x^128000 mod p(x)` << 1, x^128064 mod p(x)` << 1
++ 0xab16ea02UL, 0x00000001UL, 0x64d587deUL, 0x00000000UL, // x^126976 mod p(x)` << 1, x^127040 mod p(x)` << 1
++ 0x3c4598a8UL, 0x00000001UL, 0xf4a507b0UL, 0x00000000UL, // x^125952 mod p(x)` << 1, x^126016 mod p(x)` << 1
++ 0xb3735430UL, 0x00000000UL, 0x40e342fcUL, 0x00000000UL, // x^124928 mod p(x)` << 1, x^124992 mod p(x)` << 1
++ 0xbb3fc0c0UL, 0x00000001UL, 0xd5ad9c3aUL, 0x00000001UL, // x^123904 mod p(x)` << 1, x^123968 mod p(x)` << 1
++ 0x570ae19cUL, 0x00000001UL, 0x94a691a4UL, 0x00000000UL, // x^122880 mod p(x)` << 1, x^122944 mod p(x)` << 1
++ 0xea910712UL, 0x00000001UL, 0x271ecdfaUL, 0x00000001UL, // x^121856 mod p(x)` << 1, x^121920 mod p(x)` << 1
++ 0x67127128UL, 0x00000001UL, 0x9e54475aUL, 0x00000000UL, // x^120832 mod p(x)` << 1, x^120896 mod p(x)` << 1
++ 0x19e790a2UL, 0x00000000UL, 0xc9c099eeUL, 0x00000000UL, // x^119808 mod p(x)` << 1, x^119872 mod p(x)` << 1
++ 0x3788f710UL, 0x00000000UL, 0x9a2f736cUL, 0x00000000UL, // x^118784 mod p(x)` << 1, x^118848 mod p(x)` << 1
++ 0x682a160eUL, 0x00000001UL, 0xbb9f4996UL, 0x00000000UL, // x^117760 mod p(x)` << 1, x^117824 mod p(x)` << 1
++ 0x7f0ebd2eUL, 0x00000000UL, 0xdb688050UL, 0x00000001UL, // x^116736 mod p(x)` << 1, x^116800 mod p(x)` << 1
++ 0x2b032080UL, 0x00000000UL, 0xe9b10af4UL, 0x00000000UL, // x^115712 mod p(x)` << 1, x^115776 mod p(x)` << 1
++ 0xcfd1664aUL, 0x00000000UL, 0x2d4545e4UL, 0x00000001UL, // x^114688 mod p(x)` << 1, x^114752 mod p(x)` << 1
++ 0xaa1181c2UL, 0x00000000UL, 0x0361139cUL, 0x00000000UL, // x^113664 mod p(x)` << 1, x^113728 mod p(x)` << 1
++ 0xddd08002UL, 0x00000000UL, 0xa5a1a3a8UL, 0x00000001UL, // x^112640 mod p(x)` << 1, x^112704 mod p(x)` << 1
++ 0xe8dd0446UL, 0x00000000UL, 0x6844e0b0UL, 0x00000000UL, // x^111616 mod p(x)` << 1, x^111680 mod p(x)` << 1
++ 0xbbd94a00UL, 0x00000001UL, 0xc3762f28UL, 0x00000000UL, // x^110592 mod p(x)` << 1, x^110656 mod p(x)` << 1
++ 0xab6cd180UL, 0x00000000UL, 0xd26287a2UL, 0x00000001UL, // x^109568 mod p(x)` << 1, x^109632 mod p(x)` << 1
++ 0x31803ce2UL, 0x00000000UL, 0xf6f0bba8UL, 0x00000001UL, // x^108544 mod p(x)` << 1, x^108608 mod p(x)` << 1
++ 0x24f40b0cUL, 0x00000000UL, 0x2ffabd62UL, 0x00000000UL, // x^107520 mod p(x)` << 1, x^107584 mod p(x)` << 1
++ 0xba1d9834UL, 0x00000001UL, 0xfb4516b8UL, 0x00000000UL, // x^106496 mod p(x)` << 1, x^106560 mod p(x)` << 1
++ 0x04de61aaUL, 0x00000001UL, 0x8cfa961cUL, 0x00000001UL, // x^105472 mod p(x)` << 1, x^105536 mod p(x)` << 1
++ 0x13e40d46UL, 0x00000001UL, 0x9e588d52UL, 0x00000001UL, // x^104448 mod p(x)` << 1, x^104512 mod p(x)` << 1
++ 0x415598a0UL, 0x00000001UL, 0x180f0bbcUL, 0x00000001UL, // x^103424 mod p(x)` << 1, x^103488 mod p(x)` << 1
++ 0xbf6c8c90UL, 0x00000000UL, 0xe1d9177aUL, 0x00000000UL, // x^102400 mod p(x)` << 1, x^102464 mod p(x)` << 1
++ 0x788b0504UL, 0x00000001UL, 0x05abc27cUL, 0x00000001UL, // x^101376 mod p(x)` << 1, x^101440 mod p(x)` << 1
++ 0x38385d02UL, 0x00000000UL, 0x972e4a58UL, 0x00000000UL, // x^100352 mod p(x)` << 1, x^100416 mod p(x)` << 1
++ 0xb6c83844UL, 0x00000001UL, 0x83499a5eUL, 0x00000001UL, // x^99328 mod p(x)` << 1, x^99392 mod p(x)` << 1
++ 0x51061a8aUL, 0x00000000UL, 0xc96a8ccaUL, 0x00000001UL, // x^98304 mod p(x)` << 1, x^98368 mod p(x)` << 1
++ 0x7351388aUL, 0x00000001UL, 0xa1a5b60cUL, 0x00000001UL, // x^97280 mod p(x)` << 1, x^97344 mod p(x)` << 1
++ 0x32928f92UL, 0x00000001UL, 0xe4b6ac9cUL, 0x00000000UL, // x^96256 mod p(x)` << 1, x^96320 mod p(x)` << 1
++ 0xe6b4f48aUL, 0x00000000UL, 0x807e7f5aUL, 0x00000001UL, // x^95232 mod p(x)` << 1, x^95296 mod p(x)` << 1
++ 0x39d15e90UL, 0x00000000UL, 0x7a7e3bc8UL, 0x00000001UL, // x^94208 mod p(x)` << 1, x^94272 mod p(x)` << 1
++ 0x312d6074UL, 0x00000000UL, 0xd73975daUL, 0x00000000UL, // x^93184 mod p(x)` << 1, x^93248 mod p(x)` << 1
++ 0x7bbb2cc4UL, 0x00000001UL, 0x7375d038UL, 0x00000001UL, // x^92160 mod p(x)` << 1, x^92224 mod p(x)` << 1
++ 0x6ded3e18UL, 0x00000001UL, 0x193680bcUL, 0x00000000UL, // x^91136 mod p(x)` << 1, x^91200 mod p(x)` << 1
++ 0xf1638b16UL, 0x00000000UL, 0x999b06f6UL, 0x00000000UL, // x^90112 mod p(x)` << 1, x^90176 mod p(x)` << 1
++ 0xd38b9eccUL, 0x00000001UL, 0xf685d2b8UL, 0x00000001UL, // x^89088 mod p(x)` << 1, x^89152 mod p(x)` << 1
++ 0x8b8d09dcUL, 0x00000001UL, 0xf4ecbed2UL, 0x00000001UL, // x^88064 mod p(x)` << 1, x^88128 mod p(x)` << 1
++ 0xe7bc27d2UL, 0x00000000UL, 0xba16f1a0UL, 0x00000000UL, // x^87040 mod p(x)` << 1, x^87104 mod p(x)` << 1
++ 0x275e1e96UL, 0x00000000UL, 0x15aceac4UL, 0x00000001UL, // x^86016 mod p(x)` << 1, x^86080 mod p(x)` << 1
++ 0xe2e3031eUL, 0x00000000UL, 0xaeff6292UL, 0x00000001UL, // x^84992 mod p(x)` << 1, x^85056 mod p(x)` << 1
++ 0x041c84d8UL, 0x00000001UL, 0x9640124cUL, 0x00000000UL, // x^83968 mod p(x)` << 1, x^84032 mod p(x)` << 1
++ 0x706ce672UL, 0x00000000UL, 0x14f41f02UL, 0x00000001UL, // x^82944 mod p(x)` << 1, x^83008 mod p(x)` << 1
++ 0x5d5070daUL, 0x00000001UL, 0x9c5f3586UL, 0x00000000UL, // x^81920 mod p(x)` << 1, x^81984 mod p(x)` << 1
++ 0x38f9493aUL, 0x00000000UL, 0x878275faUL, 0x00000001UL, // x^80896 mod p(x)` << 1, x^80960 mod p(x)` << 1
++ 0xa3348a76UL, 0x00000000UL, 0xddc42ce8UL, 0x00000000UL, // x^79872 mod p(x)` << 1, x^79936 mod p(x)` << 1
++ 0xad0aab92UL, 0x00000001UL, 0x81d2c73aUL, 0x00000001UL, // x^78848 mod p(x)` << 1, x^78912 mod p(x)` << 1
++ 0x9e85f712UL, 0x00000001UL, 0x41c9320aUL, 0x00000001UL, // x^77824 mod p(x)` << 1, x^77888 mod p(x)` << 1
++ 0x5a871e76UL, 0x00000000UL, 0x5235719aUL, 0x00000001UL, // x^76800 mod p(x)` << 1, x^76864 mod p(x)` << 1
++ 0x7249c662UL, 0x00000001UL, 0xbe27d804UL, 0x00000000UL, // x^75776 mod p(x)` << 1, x^75840 mod p(x)` << 1
++ 0x3a084712UL, 0x00000000UL, 0x6242d45aUL, 0x00000000UL, // x^74752 mod p(x)` << 1, x^74816 mod p(x)` << 1
++ 0xed438478UL, 0x00000000UL, 0x9a53638eUL, 0x00000000UL, // x^73728 mod p(x)` << 1, x^73792 mod p(x)` << 1
++ 0xabac34ccUL, 0x00000000UL, 0x001ecfb6UL, 0x00000001UL, // x^72704 mod p(x)` << 1, x^72768 mod p(x)` << 1
++ 0x5f35ef3eUL, 0x00000000UL, 0x6d7c2d64UL, 0x00000001UL, // x^71680 mod p(x)` << 1, x^71744 mod p(x)` << 1
++ 0x47d6608cUL, 0x00000000UL, 0xd0ce46c0UL, 0x00000001UL, // x^70656 mod p(x)` << 1, x^70720 mod p(x)` << 1
++ 0x2d01470eUL, 0x00000000UL, 0x24c907b4UL, 0x00000001UL, // x^69632 mod p(x)` << 1, x^69696 mod p(x)` << 1
++ 0x58bbc7b0UL, 0x00000001UL, 0x18a555caUL, 0x00000000UL, // x^68608 mod p(x)` << 1, x^68672 mod p(x)` << 1
++ 0xc0a23e8eUL, 0x00000000UL, 0x6b0980bcUL, 0x00000000UL, // x^67584 mod p(x)` << 1, x^67648 mod p(x)` << 1
++ 0xebd85c88UL, 0x00000001UL, 0x8bbba964UL, 0x00000000UL, // x^66560 mod p(x)` << 1, x^66624 mod p(x)` << 1
++ 0x9ee20bb2UL, 0x00000001UL, 0x070a5a1eUL, 0x00000001UL, // x^65536 mod p(x)` << 1, x^65600 mod p(x)` << 1
++ 0xacabf2d6UL, 0x00000001UL, 0x2204322aUL, 0x00000000UL, // x^64512 mod p(x)` << 1, x^64576 mod p(x)` << 1
++ 0xb7963d56UL, 0x00000001UL, 0xa27524d0UL, 0x00000000UL, // x^63488 mod p(x)` << 1, x^63552 mod p(x)` << 1
++ 0x7bffa1feUL, 0x00000001UL, 0x20b1e4baUL, 0x00000000UL, // x^62464 mod p(x)` << 1, x^62528 mod p(x)` << 1
++ 0x1f15333eUL, 0x00000000UL, 0x32cc27fcUL, 0x00000000UL, // x^61440 mod p(x)` << 1, x^61504 mod p(x)` << 1
++ 0x8593129eUL, 0x00000001UL, 0x44dd22b8UL, 0x00000000UL, // x^60416 mod p(x)` << 1, x^60480 mod p(x)` << 1
++ 0x9cb32602UL, 0x00000001UL, 0xdffc9e0aUL, 0x00000000UL, // x^59392 mod p(x)` << 1, x^59456 mod p(x)` << 1
++ 0x42b05cc8UL, 0x00000001UL, 0xb7a0ed14UL, 0x00000001UL, // x^58368 mod p(x)` << 1, x^58432 mod p(x)` << 1
++ 0xbe49e7a4UL, 0x00000001UL, 0xc7842488UL, 0x00000000UL, // x^57344 mod p(x)` << 1, x^57408 mod p(x)` << 1
++ 0x08f69d6cUL, 0x00000001UL, 0xc02a4feeUL, 0x00000001UL, // x^56320 mod p(x)` << 1, x^56384 mod p(x)` << 1
++ 0x6c0971f0UL, 0x00000000UL, 0x3c273778UL, 0x00000000UL, // x^55296 mod p(x)` << 1, x^55360 mod p(x)` << 1
++ 0x5b16467aUL, 0x00000000UL, 0xd63f8894UL, 0x00000001UL, // x^54272 mod p(x)` << 1, x^54336 mod p(x)` << 1
++ 0x551a628eUL, 0x00000001UL, 0x6be557d6UL, 0x00000000UL, // x^53248 mod p(x)` << 1, x^53312 mod p(x)` << 1
++ 0x9e42ea92UL, 0x00000001UL, 0x6a7806eaUL, 0x00000000UL, // x^52224 mod p(x)` << 1, x^52288 mod p(x)` << 1
++ 0x2fa83ff2UL, 0x00000001UL, 0x6155aa0cUL, 0x00000001UL, // x^51200 mod p(x)` << 1, x^51264 mod p(x)` << 1
++ 0x1ca9cde0UL, 0x00000001UL, 0x908650acUL, 0x00000000UL, // x^50176 mod p(x)` << 1, x^50240 mod p(x)` << 1
++ 0xc8e5cd74UL, 0x00000000UL, 0xaa5a8084UL, 0x00000000UL, // x^49152 mod p(x)` << 1, x^49216 mod p(x)` << 1
++ 0x96c27f0cUL, 0x00000000UL, 0x91bb500aUL, 0x00000001UL, // x^48128 mod p(x)` << 1, x^48192 mod p(x)` << 1
++ 0x2baed926UL, 0x00000000UL, 0x64e9bed0UL, 0x00000000UL, // x^47104 mod p(x)` << 1, x^47168 mod p(x)` << 1
++ 0x7c8de8d2UL, 0x00000001UL, 0x9444f302UL, 0x00000000UL, // x^46080 mod p(x)` << 1, x^46144 mod p(x)` << 1
++ 0xd43d6068UL, 0x00000000UL, 0x9db07d3cUL, 0x00000001UL, // x^45056 mod p(x)` << 1, x^45120 mod p(x)` << 1
++ 0xcb2c4b26UL, 0x00000000UL, 0x359e3e6eUL, 0x00000001UL, // x^44032 mod p(x)` << 1, x^44096 mod p(x)` << 1
++ 0x45b8da26UL, 0x00000001UL, 0xe4f10dd2UL, 0x00000001UL, // x^43008 mod p(x)` << 1, x^43072 mod p(x)` << 1
++ 0x8fff4b08UL, 0x00000001UL, 0x24f5735eUL, 0x00000001UL, // x^41984 mod p(x)` << 1, x^42048 mod p(x)` << 1
++ 0x50b58ed0UL, 0x00000001UL, 0x24760a4cUL, 0x00000001UL, // x^40960 mod p(x)` << 1, x^41024 mod p(x)` << 1
++ 0x549f39bcUL, 0x00000001UL, 0x0f1fc186UL, 0x00000000UL, // x^39936 mod p(x)` << 1, x^40000 mod p(x)` << 1
++ 0xef4d2f42UL, 0x00000000UL, 0x150e4cc4UL, 0x00000000UL, // x^38912 mod p(x)` << 1, x^38976 mod p(x)` << 1
++ 0xb1468572UL, 0x00000001UL, 0x2a6204e8UL, 0x00000000UL, // x^37888 mod p(x)` << 1, x^37952 mod p(x)` << 1
++ 0x3d7403b2UL, 0x00000001UL, 0xbeb1d432UL, 0x00000000UL, // x^36864 mod p(x)` << 1, x^36928 mod p(x)` << 1
++ 0xa4681842UL, 0x00000001UL, 0x35f3f1f0UL, 0x00000001UL, // x^35840 mod p(x)` << 1, x^35904 mod p(x)` << 1
++ 0x67714492UL, 0x00000001UL, 0x74fe2232UL, 0x00000000UL, // x^34816 mod p(x)` << 1, x^34880 mod p(x)` << 1
++ 0xe599099aUL, 0x00000001UL, 0x1ac6e2baUL, 0x00000000UL, // x^33792 mod p(x)` << 1, x^33856 mod p(x)` << 1
++ 0xfe128194UL, 0x00000000UL, 0x13fca91eUL, 0x00000000UL, // x^32768 mod p(x)` << 1, x^32832 mod p(x)` << 1
++ 0x77e8b990UL, 0x00000000UL, 0x83f4931eUL, 0x00000001UL, // x^31744 mod p(x)` << 1, x^31808 mod p(x)` << 1
++ 0xa267f63aUL, 0x00000001UL, 0xb6d9b4e4UL, 0x00000000UL, // x^30720 mod p(x)` << 1, x^30784 mod p(x)` << 1
++ 0x945c245aUL, 0x00000001UL, 0xb5188656UL, 0x00000000UL, // x^29696 mod p(x)` << 1, x^29760 mod p(x)` << 1
++ 0x49002e76UL, 0x00000001UL, 0x27a81a84UL, 0x00000000UL, // x^28672 mod p(x)` << 1, x^28736 mod p(x)` << 1
++ 0xbb8310a4UL, 0x00000001UL, 0x25699258UL, 0x00000001UL, // x^27648 mod p(x)` << 1, x^27712 mod p(x)` << 1
++ 0x9ec60bccUL, 0x00000001UL, 0xb23de796UL, 0x00000001UL, // x^26624 mod p(x)` << 1, x^26688 mod p(x)` << 1
++ 0x2d8590aeUL, 0x00000001UL, 0xfe4365dcUL, 0x00000000UL, // x^25600 mod p(x)` << 1, x^25664 mod p(x)` << 1
++ 0x65b00684UL, 0x00000000UL, 0xc68f497aUL, 0x00000000UL, // x^24576 mod p(x)` << 1, x^24640 mod p(x)` << 1
++ 0x5e5aeadcUL, 0x00000001UL, 0xfbf521eeUL, 0x00000000UL, // x^23552 mod p(x)` << 1, x^23616 mod p(x)` << 1
++ 0xb77ff2b0UL, 0x00000000UL, 0x5eac3378UL, 0x00000001UL, // x^22528 mod p(x)` << 1, x^22592 mod p(x)` << 1
++ 0x88da2ff6UL, 0x00000001UL, 0x34914b90UL, 0x00000001UL, // x^21504 mod p(x)` << 1, x^21568 mod p(x)` << 1
++ 0x63da929aUL, 0x00000000UL, 0x16335cfeUL, 0x00000000UL, // x^20480 mod p(x)` << 1, x^20544 mod p(x)` << 1
++ 0x389caa80UL, 0x00000001UL, 0x0372d10cUL, 0x00000001UL, // x^19456 mod p(x)` << 1, x^19520 mod p(x)` << 1
++ 0x3db599d2UL, 0x00000001UL, 0x5097b908UL, 0x00000001UL, // x^18432 mod p(x)` << 1, x^18496 mod p(x)` << 1
++ 0x22505a86UL, 0x00000001UL, 0x227a7572UL, 0x00000001UL, // x^17408 mod p(x)` << 1, x^17472 mod p(x)` << 1
++ 0x6bd72746UL, 0x00000001UL, 0x9a8f75c0UL, 0x00000000UL, // x^16384 mod p(x)` << 1, x^16448 mod p(x)` << 1
++ 0xc3faf1d4UL, 0x00000001UL, 0x682c77a2UL, 0x00000000UL, // x^15360 mod p(x)` << 1, x^15424 mod p(x)` << 1
++ 0x111c826cUL, 0x00000001UL, 0x231f091cUL, 0x00000000UL, // x^14336 mod p(x)` << 1, x^14400 mod p(x)` << 1
++ 0x153e9fb2UL, 0x00000000UL, 0x7d4439f2UL, 0x00000000UL, // x^13312 mod p(x)` << 1, x^13376 mod p(x)` << 1
++ 0x2b1f7b60UL, 0x00000000UL, 0x7e221efcUL, 0x00000001UL, // x^12288 mod p(x)` << 1, x^12352 mod p(x)` << 1
++ 0xb1dba570UL, 0x00000000UL, 0x67457c38UL, 0x00000001UL, // x^11264 mod p(x)` << 1, x^11328 mod p(x)` << 1
++ 0xf6397b76UL, 0x00000001UL, 0xbdf081c4UL, 0x00000000UL, // x^10240 mod p(x)` << 1, x^10304 mod p(x)` << 1
++ 0x56335214UL, 0x00000001UL, 0x6286d6b0UL, 0x00000001UL, // x^9216 mod p(x)` << 1, x^9280 mod p(x)` << 1
++ 0xd70e3986UL, 0x00000001UL, 0xc84f001cUL, 0x00000000UL, // x^8192 mod p(x)` << 1, x^8256 mod p(x)` << 1
++ 0x3701a774UL, 0x00000000UL, 0x64efe7c0UL, 0x00000000UL, // x^7168 mod p(x)` << 1, x^7232 mod p(x)` << 1
++ 0xac81ef72UL, 0x00000000UL, 0x0ac2d904UL, 0x00000000UL, // x^6144 mod p(x)` << 1, x^6208 mod p(x)` << 1
++ 0x33212464UL, 0x00000001UL, 0xfd226d14UL, 0x00000000UL, // x^5120 mod p(x)` << 1, x^5184 mod p(x)` << 1
++ 0xe4e45610UL, 0x00000000UL, 0x1cfd42e0UL, 0x00000001UL, // x^4096 mod p(x)` << 1, x^4160 mod p(x)` << 1
++ 0x0c1bd370UL, 0x00000000UL, 0x6e5a5678UL, 0x00000001UL, // x^3072 mod p(x)` << 1, x^3136 mod p(x)` << 1
++ 0xa7b9e7a6UL, 0x00000001UL, 0xd888fe22UL, 0x00000001UL, // x^2048 mod p(x)` << 1, x^2112 mod p(x)` << 1
++ 0x7d657a10UL, 0x00000000UL, 0xaf77fcd4UL, 0x00000001UL, // x^1024 mod p(x)` << 1, x^1088 mod p(x)` << 1
++
++ // Reduce final 1024-2048 bits to 64 bits, shifting 32 bits to include the trailing 32 bits of zeros
++ 0xec447f11UL, 0x99168a18UL, 0x13e8221eUL, 0xed837b26UL, // x^2048 mod p(x)`, x^2016 mod p(x)`, x^1984 mod p(x)`, x^1952 mod p(x)`
++ 0x8fd2cd3cUL, 0xe23e954eUL, 0x47b9ce5aUL, 0xc8acdd81UL, // x^1920 mod p(x)`, x^1888 mod p(x)`, x^1856 mod p(x)`, x^1824 mod p(x)`
++ 0x6b1d2b53UL, 0x92f8befeUL, 0xd4277e25UL, 0xd9ad6d87UL, // x^1792 mod p(x)`, x^1760 mod p(x)`, x^1728 mod p(x)`, x^1696 mod p(x)`
++ 0x291ea462UL, 0xf38a3556UL, 0x33fbca3bUL, 0xc10ec5e0UL, // x^1664 mod p(x)`, x^1632 mod p(x)`, x^1600 mod p(x)`, x^1568 mod p(x)`
++ 0x62b6ca4bUL, 0x974ac562UL, 0x82e02e2fUL, 0xc0b55b0eUL, // x^1536 mod p(x)`, x^1504 mod p(x)`, x^1472 mod p(x)`, x^1440 mod p(x)`
++ 0x784d2a56UL, 0x855712b3UL, 0xe172334dUL, 0x71aa1df0UL, // x^1408 mod p(x)`, x^1376 mod p(x)`, x^1344 mod p(x)`, x^1312 mod p(x)`
++ 0x0eaee722UL, 0xa5abe9f8UL, 0x3969324dUL, 0xfee3053eUL, // x^1280 mod p(x)`, x^1248 mod p(x)`, x^1216 mod p(x)`, x^1184 mod p(x)`
++ 0xdb54814cUL, 0x1fa0943dUL, 0x3eb2bd08UL, 0xf44779b9UL, // x^1152 mod p(x)`, x^1120 mod p(x)`, x^1088 mod p(x)`, x^1056 mod p(x)`
++ 0xd7bbfe6aUL, 0xa53ff440UL, 0x00cc3374UL, 0xf5449b3fUL, // x^1024 mod p(x)`, x^992 mod p(x)`, x^960 mod p(x)`, x^928 mod p(x)`
++ 0x6325605cUL, 0xebe7e356UL, 0xd777606eUL, 0x6f8346e1UL, // x^896 mod p(x)`, x^864 mod p(x)`, x^832 mod p(x)`, x^800 mod p(x)`
++ 0xe5b592b8UL, 0xc65a272cUL, 0xc0b95347UL, 0xe3ab4f2aUL, // x^768 mod p(x)`, x^736 mod p(x)`, x^704 mod p(x)`, x^672 mod p(x)`
++ 0x4721589fUL, 0x5705a9caUL, 0x329ecc11UL, 0xaa2215eaUL, // x^640 mod p(x)`, x^608 mod p(x)`, x^576 mod p(x)`, x^544 mod p(x)`
++ 0x88d14467UL, 0xe3720acbUL, 0xd95efd26UL, 0x1ed8f66eUL, // x^512 mod p(x)`, x^480 mod p(x)`, x^448 mod p(x)`, x^416 mod p(x)`
++ 0x15141c31UL, 0xba1aca03UL, 0xa700e96aUL, 0x78ed02d5UL, // x^384 mod p(x)`, x^352 mod p(x)`, x^320 mod p(x)`, x^288 mod p(x)`
++ 0xed627daeUL, 0xad2a31b3UL, 0x32b39da3UL, 0xba8ccbe8UL, // x^256 mod p(x)`, x^224 mod p(x)`, x^192 mod p(x)`, x^160 mod p(x)`
++ 0xa06a2517UL, 0x6655004fUL, 0xb1e6b092UL, 0xedb88320UL // x^128 mod p(x)`, x^96 mod p(x)`, x^64 mod p(x)`, x^32 mod p(x)`
++ };
++
++ juint* ptr = (juint*) malloc(sizeof(juint) * CRC32_CONSTANTS_SIZE);
++ guarantee(((intptr_t)ptr & 0xF) == 0, "16-byte alignment needed");
++ guarantee(ptr != NULL, "allocation error of a crc table");
++ memcpy((void*)ptr, constants, sizeof(juint) * CRC32_CONSTANTS_SIZE);
++ return ptr;
++}
++
++juint* StubRoutines::ppc64::generate_crc_barret_constants() {
++ juint barret_constants[CRC32_BARRET_CONSTANTS] = {
++ 0xf7011641UL, 0x00000001UL, 0x00000000UL, 0x00000000UL,
++ 0xdb710641UL, 0x00000001UL, 0x00000000UL, 0x00000000UL
++ };
++ juint* ptr = (juint*) malloc(sizeof(juint) * CRC32_CONSTANTS_SIZE);
++ guarantee(((intptr_t)ptr & 0xF) == 0, "16-byte alignment needed");
++ guarantee(ptr != NULL, "allocation error of a crc table");
++ memcpy((void*) ptr, barret_constants, sizeof(juint) * CRC32_BARRET_CONSTANTS);
++ return ptr;
++}
++
+ // CRC32 Intrinsics.
+ /**
+ * crc_table[] from jdk/src/share/native/java/util/zip/zlib-1.2.8/crc32.h
+@@ -477,3 +782,7 @@
+ #endif
+ }
+ };
++
++juint* StubRoutines::ppc64::_constants = StubRoutines::ppc64::generate_crc_constants();
++
++juint* StubRoutines::ppc64::_barret_constants = StubRoutines::ppc64::generate_crc_barret_constants();
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
+@@ -45,6 +45,8 @@
+ #else
+ #define CRC32_TABLES 1
+ #endif
++#define CRC32_CONSTANTS_SIZE 1084
++#define CRC32_BARRET_CONSTANTS 10
+
+ class ppc64 {
+ friend class StubGenerator;
+@@ -53,11 +55,17 @@
+
+ // CRC32 Intrinsics.
+ static juint _crc_table[CRC32_TABLES][CRC32_COLUMN_SIZE];
++ static juint* _constants;
++ static juint* _barret_constants;
+
+ public:
+
+ // CRC32 Intrinsics.
+ static void generate_load_crc_table_addr(MacroAssembler* masm, Register table);
++ static void generate_load_crc_constants_addr(MacroAssembler* masm, Register table);
++ static void generate_load_crc_barret_constants_addr(MacroAssembler* masm, Register table);
++ static juint* generate_crc_constants();
++ static juint* generate_crc_barret_constants();
+
+ };
+
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
+@@ -102,7 +102,7 @@
+ // Create and print feature-string.
+ char buf[(num_features+1) * 16]; // Max 16 chars per feature.
+ jio_snprintf(buf, sizeof(buf),
+- "ppc64%s%s%s%s%s%s%s%s%s",
++ "ppc64%s%s%s%s%s%s%s%s%s%s",
+ (has_fsqrt() ? " fsqrt" : ""),
+ (has_isel() ? " isel" : ""),
+ (has_lxarxeh() ? " lxarxeh" : ""),
+@@ -112,7 +112,8 @@
+ (has_popcntw() ? " popcntw" : ""),
+ (has_fcfids() ? " fcfids" : ""),
+ (has_vand() ? " vand" : ""),
+- (has_vcipher() ? " aes" : "")
++ (has_vcipher() ? " aes" : ""),
++ (has_vpmsumb() ? " vpmsumb" : "")
+ // Make sure number of %s matches num_features!
+ );
+ _features_str = strdup(buf);
+@@ -490,6 +491,7 @@
+ a->fcfids(F3, F4); // code[8] -> fcfids
+ a->vand(VR0, VR0, VR0); // code[9] -> vand
+ a->vcipher(VR0, VR1, VR2); // code[10] -> vcipher
++ a->vpmsumb(VR0, VR1, VR2); // code[11] -> vpmsumb
+ a->blr();
+
+ // Emit function to set one cache line to zero. Emit function descriptor and get pointer to it.
+@@ -534,6 +536,7 @@
+ if (code[feature_cntr++]) features |= fcfids_m;
+ if (code[feature_cntr++]) features |= vand_m;
+ if (code[feature_cntr++]) features |= vcipher_m;
++ if (code[feature_cntr++]) features |= vpmsumb_m;
+
+ // Print the detection code.
+ if (PrintAssembly) {
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp
+@@ -43,6 +43,7 @@
+ vand,
+ dcba,
+ vcipher,
++ vpmsumb,
+ num_features // last entry to count features
+ };
+ enum Feature_Flag_Set {
+@@ -58,6 +59,7 @@
+ vand_m = (1 << vand ),
+ dcba_m = (1 << dcba ),
+ vcipher_m = (1 << vcipher),
++ vpmsumb_m = (1 << vpmsumb),
+ all_features_m = -1
+ };
+ static int _features;
+@@ -86,6 +88,7 @@
+ static bool has_vand() { return (_features & vand_m) != 0; }
+ static bool has_dcba() { return (_features & dcba_m) != 0; }
+ static bool has_vcipher() { return (_features & vcipher_m) != 0; }
++ static bool has_vpmsumb() { return (_features & vpmsumb_m) != 0; }
+
+ static const char* cpu_features() { return _features_str; }
+
diff --git a/jdk8165852-pr3468-mount_point_not_found_for_a_file_which_is_present_in_overlayfs.patch b/jdk8165852-pr3468-mount_point_not_found_for_a_file_which_is_present_in_overlayfs.patch
new file mode 100644
index 0000000..6be87a7
--- /dev/null
+++ b/jdk8165852-pr3468-mount_point_not_found_for_a_file_which_is_present_in_overlayfs.patch
@@ -0,0 +1,87 @@
+
+# HG changeset patch
+# User bpb
+# Date 1515783982 28800
+# Node ID b8843bca95b5e0eed5bbb4dc195c89c727c7aede
+# Parent 61d7ce442d95f5f30c84037a50cf6361bf7c37e1
+8165852: (fs) Mount point not found for a file which is present in overlayfs
+Summary: Check /proc/mounts when the device ID boundary is reached
+Reviewed-by: alanb
+
+diff -r 61d7ce442d95 -r b8843bca95b5 src/solaris/classes/sun/nio/fs/LinuxFileStore.java
+--- openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java Tue Jul 24 05:10:45 2018 -0400
++++ openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java Fri Jan 12 11:06:22 2018 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2008, 2018, 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
+@@ -66,6 +66,8 @@
+ }
+
+ // step 2: find mount point
++ List<UnixMountEntry> procMountsEntries =
++ fs.getMountEntries("/proc/mounts");
+ UnixPath parent = path.getParent();
+ while (parent != null) {
+ UnixFileAttributes attrs = null;
+@@ -74,16 +76,23 @@
+ } catch (UnixException x) {
+ x.rethrowAsIOException(parent);
+ }
+- if (attrs.dev() != dev())
+- break;
++ if (attrs.dev() != dev()) {
++ // step 3: lookup mounted file systems (use /proc/mounts to
++ // ensure we find the file system even when not in /etc/mtab)
++ byte[] dir = path.asByteArray();
++ for (UnixMountEntry entry : procMountsEntries) {
++ if (Arrays.equals(dir, entry.dir()))
++ return entry;
++ }
++ }
+ path = parent;
+ parent = parent.getParent();
+ }
+
+- // step 3: lookup mounted file systems (use /proc/mounts to ensure we
+- // find the file system even when not in /etc/mtab)
++ // step 3: lookup mounted file systems (use /proc/mounts to
++ // ensure we find the file system even when not in /etc/mtab)
+ byte[] dir = path.asByteArray();
+- for (UnixMountEntry entry: fs.getMountEntries("/proc/mounts")) {
++ for (UnixMountEntry entry : procMountsEntries) {
+ if (Arrays.equals(dir, entry.dir()))
+ return entry;
+ }
+diff -r 61d7ce442d95 -r b8843bca95b5 src/solaris/classes/sun/nio/fs/LinuxFileSystem.java
+--- openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java Tue Jul 24 05:10:45 2018 -0400
++++ openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java Fri Jan 12 11:06:22 2018 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2008, 2018, 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
+@@ -75,7 +75,7 @@
+ /**
+ * Returns object to iterate over the mount entries in the given fstab file.
+ */
+- Iterable<UnixMountEntry> getMountEntries(String fstab) {
++ List<UnixMountEntry> getMountEntries(String fstab) {
+ ArrayList<UnixMountEntry> entries = new ArrayList<>();
+ try {
+ long fp = setmntent(Util.toBytes(fstab), Util.toBytes("r"));
+@@ -101,7 +101,7 @@
+ * Returns object to iterate over the mount entries in /etc/mtab
+ */
+ @Override
+- Iterable<UnixMountEntry> getMountEntries() {
++ List<UnixMountEntry> getMountEntries() {
+ return getMountEntries("/etc/mtab");
+ }
+
+
diff --git a/jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch b/jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch
new file mode 100644
index 0000000..d831aa9
--- /dev/null
+++ b/jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch
@@ -0,0 +1,121 @@
+# HG changeset patch
+# User kaddepalli
+# Date 1517818481 -19800
+# Mon Feb 05 13:44:41 2018 +0530
+# Node ID b77308735540644d4710244e3c88865067f2905a
+# Parent 39bfc94b1f4265b645c2970a58389acc779dafe9
+8171000, PR3542, RH1402819: Robot.createScreenCapture() crashes in wayland mode
+Reviewed-by: serb, mhalder
+
+diff --git openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
+--- openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c
++++ openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
+@@ -394,77 +394,48 @@
+ XRectangle bbox; /* bounding box of grabbed area */
+ list_ptr regions;/* list of regions to read from */
+ {
+- image_region_type *reg;
+- int32_t dst_x, dst_y; /* where in pixmap to write (UL) */
+- int32_t diff;
+-
+- XImage *reg_image,*ximage ;
+- int32_t srcRect_x,srcRect_y,srcRect_width,srcRect_height ;
+- int32_t rem ;
+- int32_t bytes_per_line;
+- int32_t bitmap_unit;
+-
+- bitmap_unit = sizeof (long);
+- if (format == ZPixmap)
+- bytes_per_line = width*depth/8;
+- else
+- bytes_per_line = width/8;
+-
+-
+- /* Find out how many more bytes are required for padding so that
+- ** bytes per scan line will be multiples of bitmap_unit bits */
+- if (format == ZPixmap) {
+- rem = (bytes_per_line*8)%bitmap_unit;
+- if (rem)
+- bytes_per_line += (rem/8 + 1);
+- }
++ XImage *ximage ;
+
+ ximage = XCreateImage(disp,fakeVis,(uint32_t) depth,format,0,NULL,
+ (uint32_t)width,(uint32_t)height,8,0);
+
+- bytes_per_line = ximage->bytes_per_line;
+-
+- if (format == ZPixmap)
+- ximage->data = malloc(height*bytes_per_line);
+- else
+- ximage->data = malloc(height*bytes_per_line*depth);
+-
++ ximage->data = calloc(ximage->bytes_per_line*height*((format==ZPixmap)? 1 : depth), sizeof(char));
+ ximage->bits_per_pixel = depth; /** Valid only if format is ZPixmap ***/
+
+- for (reg = (image_region_type *) first_in_list( regions); reg;
++ for (image_region_type* reg = (image_region_type *) first_in_list( regions); reg;
+ reg = (image_region_type *) next_in_list( regions))
+ {
+- int32_t rect;
+- struct my_XRegion *vis_reg;
+- vis_reg = (struct my_XRegion *)(reg->visible_region);
+- for (rect = 0;
+- rect < vis_reg->numRects;
+- rect++)
++ struct my_XRegion *vis_reg = (struct my_XRegion *)(reg->visible_region);
++ for (int32_t rect = 0; rect < vis_reg->numRects; rect++)
+ {
+- /** ------------------------------------------------------------------------
+- Intersect bbox with visible part of region giving src rect & output
+- location. Width is the min right side minus the max left side.
+- Similar for height. Offset src rect so x,y are relative to
+- origin of win, not the root-relative visible rect of win.
+- ------------------------------------------------------------------------ **/
+- srcRect_width = MIN( vis_reg->rects[rect].x2, bbox.width + bbox.x)
+- - MAX( vis_reg->rects[rect].x1, bbox.x);
++ /** ------------------------------------------------------------------------
++ Intersect bbox with visible part of region giving src rect & output
++ location. Width is the min right side minus the max left side.
++ Similar for height. Offset src rect so x,y are relative to
++ origin of win, not the root-relative visible rect of win.
++ ------------------------------------------------------------------------ **/
++ int32_t srcRect_width = MIN( vis_reg->rects[rect].x2, bbox.width + bbox.x)
++ - MAX( vis_reg->rects[rect].x1, bbox.x);
++
++ int32_t srcRect_height = MIN( vis_reg->rects[rect].y2, bbox.height + bbox.y)
++ - MAX( vis_reg->rects[rect].y1, bbox.y);
+
+- srcRect_height = MIN( vis_reg->rects[rect].y2, bbox.height + bbox.y)
+- - MAX( vis_reg->rects[rect].y1, bbox.y);
++ int32_t diff = bbox.x - vis_reg->rects[rect].x1;
++ int32_t srcRect_x = MAX( 0, diff) + (vis_reg->rects[rect].x1 - reg->x_rootrel - reg->border);
++ int32_t dst_x = MAX( 0, -diff) ;
+
+- diff = bbox.x - vis_reg->rects[rect].x1;
+- srcRect_x = MAX( 0, diff) + (vis_reg->rects[rect].x1 - reg->x_rootrel - reg->border);
+- dst_x = MAX( 0, -diff) ;
+- diff = bbox.y - vis_reg->rects[rect].y1;
+- srcRect_y = MAX( 0, diff) + (vis_reg->rects[rect].y1 - reg->y_rootrel - reg->border);
+- dst_y = MAX( 0, -diff) ;
+- reg_image = XGetImage(disp,reg->win,srcRect_x,srcRect_y,
+- (uint32_t) srcRect_width, (uint32_t) srcRect_height,AllPlanes,format) ;
+- TransferImage(disp,reg_image,srcRect_width,
+- srcRect_height,reg,ximage,dst_x,dst_y) ;
+- XDestroyImage(reg_image);
+- }
++ diff = bbox.y - vis_reg->rects[rect].y1;
++ int32_t srcRect_y = MAX( 0, diff) + (vis_reg->rects[rect].y1 - reg->y_rootrel - reg->border);
++ int32_t dst_y = MAX( 0, -diff) ;
++ XImage* reg_image = XGetImage(disp,reg->win,srcRect_x,srcRect_y,
++ (uint32_t) srcRect_width, (uint32_t) srcRect_height,AllPlanes,format) ;
++
++ if (reg_image) {
++ TransferImage(disp,reg_image,srcRect_width,
++ srcRect_height,reg,ximage,dst_x,dst_y) ;
++ XDestroyImage(reg_image);
++ }
++ }
+ }
+ return ximage ;
+ }
diff --git a/jdk8172850-rh1640127-01-register_allocator_crash.patch b/jdk8172850-rh1640127-01-register_allocator_crash.patch
new file mode 100644
index 0000000..294e313
--- /dev/null
+++ b/jdk8172850-rh1640127-01-register_allocator_crash.patch
@@ -0,0 +1,213 @@
+
+# HG changeset patch
+# User thartmann
+# Date 1539594027 -7200
+# Node ID e044997c2edaeae97866394a7f8e2ddebbd41392
+# Parent 99212080341058548d449a22d1381e79353ec5b5
+8172850: Anti-dependency on membar causes crash in register allocator due to invalid instruction scheduling
+Summary: Regression test and additional asserts. The problem is fixed by 8087341.
+Reviewed-by: kvn
+
+diff -r 992120803410 -r e044997c2eda src/share/vm/opto/cfgnode.cpp
+--- openjdk/hotspot/src/share/vm/opto/cfgnode.cpp Mon Oct 22 05:26:38 2018 -0400
++++ openjdk/hotspot/src/share/vm/opto/cfgnode.cpp Mon Oct 15 11:00:27 2018 +0200
+@@ -2016,6 +2016,7 @@
+ uint ideal_reg = _type->ideal_reg();
+ assert( ideal_reg != Node::NotAMachineReg, "invalid type at Phi" );
+ if( ideal_reg == 0 ) return RegMask::Empty;
++ assert(ideal_reg != Op_RegFlags, "flags register is not spillable");
+ return *(Compile::current()->matcher()->idealreg2spillmask[ideal_reg]);
+ }
+
+diff -r 992120803410 -r e044997c2eda src/share/vm/opto/coalesce.cpp
+--- openjdk/hotspot/src/share/vm/opto/coalesce.cpp Mon Oct 22 05:26:38 2018 -0400
++++ openjdk/hotspot/src/share/vm/opto/coalesce.cpp Mon Oct 15 11:00:27 2018 +0200
+@@ -292,7 +292,14 @@
+ // Copy any flags as well
+ _phc.clone_projs(pred, pred->end_idx(), m, copy, _phc._lrg_map);
+ } else {
+- const RegMask *rm = C->matcher()->idealreg2spillmask[m->ideal_reg()];
++ int ireg = m->ideal_reg();
++ if (ireg == 0 || ireg == Op_RegFlags) {
++ assert(false, err_msg("attempted to spill a non-spillable item: %d: %s, ireg = %d",
++ m->_idx, m->Name(), ireg));
++ C->record_method_not_compilable("attempted to spill a non-spillable item");
++ return;
++ }
++ const RegMask *rm = C->matcher()->idealreg2spillmask[ireg];
+ copy = new (C) MachSpillCopyNode(m, *rm, *rm);
+ // Find a good place to insert. Kinda tricky, use a subroutine
+ insert_copy_with_overlap(pred,copy,phi_name,src_name);
+@@ -326,7 +333,14 @@
+ b->insert_node(copy, l++);
+ l += _phc.clone_projs(b, l, m, copy, _phc._lrg_map);
+ } else {
+- const RegMask *rm = C->matcher()->idealreg2spillmask[m->ideal_reg()];
++ int ireg = m->ideal_reg();
++ if (ireg == 0 || ireg == Op_RegFlags) {
++ assert(false, err_msg("attempted to spill a non-spillable item: %d: %s, ireg = %d",
++ m->_idx, m->Name(), ireg));
++ C->record_method_not_compilable("attempted to spill a non-spillable item");
++ return;
++ }
++ const RegMask *rm = C->matcher()->idealreg2spillmask[ireg];
+ copy = new (C) MachSpillCopyNode(m, *rm, *rm);
+ // Insert the copy in the basic block, just before us
+ b->insert_node(copy, l++);
+@@ -373,7 +387,14 @@
+ if( k < b->_num_succs )
+ continue; // Live out; do not pre-split
+ // Split the lrg at this use
+- const RegMask *rm = C->matcher()->idealreg2spillmask[inp->ideal_reg()];
++ int ireg = inp->ideal_reg();
++ if (ireg == 0 || ireg == Op_RegFlags) {
++ assert(false, err_msg("attempted to spill a non-spillable item: %d: %s, ireg = %d",
++ inp->_idx, inp->Name(), ireg));
++ C->record_method_not_compilable("attempted to spill a non-spillable item");
++ return;
++ }
++ const RegMask *rm = C->matcher()->idealreg2spillmask[ireg];
+ Node *copy = new (C) MachSpillCopyNode( inp, *rm, *rm );
+ // Insert the copy in the use-def chain
+ n->set_req(inpidx, copy );
+diff -r 992120803410 -r e044997c2eda src/share/vm/opto/machnode.cpp
+--- openjdk/hotspot/src/share/vm/opto/machnode.cpp Mon Oct 22 05:26:38 2018 -0400
++++ openjdk/hotspot/src/share/vm/opto/machnode.cpp Mon Oct 15 11:00:27 2018 +0200
+@@ -619,6 +619,7 @@
+ }
+
+ // Values outside the domain represent debug info
++ assert(in(idx)->ideal_reg() != Op_RegFlags, "flags register is not spillable");
+ return *Compile::current()->matcher()->idealreg2spillmask[in(idx)->ideal_reg()];
+ }
+
+diff -r 992120803410 -r e044997c2eda src/share/vm/opto/matcher.cpp
+--- openjdk/hotspot/src/share/vm/opto/matcher.cpp Mon Oct 22 05:26:38 2018 -0400
++++ openjdk/hotspot/src/share/vm/opto/matcher.cpp Mon Oct 15 11:00:27 2018 +0200
+@@ -95,6 +95,7 @@
+ idealreg2spillmask [Op_VecD] = NULL;
+ idealreg2spillmask [Op_VecX] = NULL;
+ idealreg2spillmask [Op_VecY] = NULL;
++ idealreg2spillmask [Op_RegFlags] = NULL;
+
+ idealreg2debugmask [Op_RegI] = NULL;
+ idealreg2debugmask [Op_RegN] = NULL;
+@@ -106,6 +107,7 @@
+ idealreg2debugmask [Op_VecD] = NULL;
+ idealreg2debugmask [Op_VecX] = NULL;
+ idealreg2debugmask [Op_VecY] = NULL;
++ idealreg2debugmask [Op_RegFlags] = NULL;
+
+ idealreg2mhdebugmask[Op_RegI] = NULL;
+ idealreg2mhdebugmask[Op_RegN] = NULL;
+@@ -117,6 +119,7 @@
+ idealreg2mhdebugmask[Op_VecD] = NULL;
+ idealreg2mhdebugmask[Op_VecX] = NULL;
+ idealreg2mhdebugmask[Op_VecY] = NULL;
++ idealreg2mhdebugmask[Op_RegFlags] = NULL;
+
+ debug_only(_mem_node = NULL;) // Ideal memory node consumed by mach node
+ }
+diff -r 992120803410 -r e044997c2eda test/compiler/gcbarriers/TestMembarDependencies.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/hotspot/test/compiler/gcbarriers/TestMembarDependencies.java Mon Oct 15 11:00:27 2018 +0200
+@@ -0,0 +1,98 @@
++/*
++ * Copyright (c) 2017, 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.
++ *
++ * 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.
++ */
++
++/*
++ * @test TestMembarDependencies
++ * @bug 8172850
++ * @summary Tests correct scheduling of memory loads around MembarVolatile emitted by GC barriers.
++ * @library /testlibrary
++ * @run driver compiler.membars.TestMembarDependencies
++ */
++
++package compiler.membars;
++
++import com.oracle.java.testlibrary.*;
++
++public class TestMembarDependencies {
++ private static TestMembarDependencies f1;
++ private static TestMembarDependencies f2;
++
++ public static void main(String args[]) throws Throwable {
++ if (args.length == 0) {
++ // For debugging, add "-XX:+TraceOptoPipelining"
++ OutputAnalyzer oa = ProcessTools.executeTestJvm("-XX:+IgnoreUnrecognizedVMOptions",
++ "-XX:-TieredCompilation", "-XX:-BackgroundCompilation", "-XX:+PrintOpto",
++ "-XX:CompileCommand=compileonly,compiler.membars.TestMembarDependencies::test*",
++ "-XX:CompileCommand=dontinline,compiler.membars.TestMembarDependencies::test_m1",
++ TestMembarDependencies.class.getName(), "run");
++ // C2 should not crash or bail out from compilation
++ oa.shouldHaveExitValue(0);
++ oa.shouldNotMatch("Bailout: Recompile without subsuming loads");
++ System.out.println(oa.getOutput());
++ } else {
++ f2 = new TestMembarDependencies();
++ // Trigger compilation of test1 and test2
++ for (int i = 0; i < 10_000; ++i) {
++ f2.test1(f2);
++ f2.test2(f2);
++ }
++ }
++ }
++
++ public void test_m1() { }
++ public void test_m2() { }
++
++ public void test1(TestMembarDependencies obj) {
++ // Try/catch/finally is used to create a CFG block without a test + jmpCon
++ // allowing GCM to schedule the testN_mem_reg0 instruction into that block.
++ try {
++ // Method call defines memory state that is then
++ // used by subsequent instructions/blocks (see below).
++ test_m1();
++ } catch (Exception e) {
++
++ } finally {
++ // Oop write to field emits a GC post-barrier with a MembarVolatile
++ // which has a wide memory effect (kills all memory). This creates an
++ // anti-dependency on all surrounding memory loads.
++ f1 = obj;
++ }
++ // The empty method m2 is inlined but the null check of f2 remains. It is encoded
++ // as CmpN(LoadN(MEM), NULL) where MEM is the memory after the call to test_m1().
++ // This is matched to testN_mem_reg0 on x86 which is scheduled before the barrier
++ // in the try/catch block due to the anti-dependency on the MembarVolatile.
++ // C2 crashes in the register allocator when trying to spill the flag register
++ // to keep the result of the testN instruction live from the try/catch block
++ // until it is here.
++ f2.test_m2();
++ }
++
++ public void test2(TestMembarDependencies obj) {
++ // Same as test1 but without try/catch/finally.
++ // This causes C2 to bail out in block local scheduling because testN_mem_reg0 is
++ // scheduled into a block that already contains another test + jmpCon instruction.
++ test_m1();
++ f1 = obj;
++ f2.test_m2();
++ }
++}
+
diff --git a/jdk8184309-pr3596-build_warnings_from_gcc_7_1_on_fedora_26.patch b/jdk8184309-pr3596-build_warnings_from_gcc_7_1_on_fedora_26.patch
new file mode 100644
index 0000000..00b6125
--- /dev/null
+++ b/jdk8184309-pr3596-build_warnings_from_gcc_7_1_on_fedora_26.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User ysuenaga
+# Date 1527498573 -3600
+# Mon May 28 10:09:33 2018 +0100
+# Node ID ef176cb429c49d1c330d9575938f66b04e3fb730
+# Parent 6915dc9ae18cce5625d3a3fc74b37da70a5b4215
+8184309, PR3596: Build warnings from GCC 7.1 on Fedora 26
+Reviewed-by: kbarrett, vlivanov
+
+diff --git openjdk.orig/hotspot/src/share/vm/code/dependencies.cpp openjdk/hotspot/src/share/vm/code/dependencies.cpp
+--- openjdk.orig/hotspot/src/share/vm/code/dependencies.cpp
++++ openjdk/hotspot/src/share/vm/code/dependencies.cpp
+@@ -525,7 +525,7 @@
+ xtty->object("x", arg.metadata_value());
+ }
+ } else {
+- char xn[10]; sprintf(xn, "x%d", j);
++ char xn[12]; sprintf(xn, "x%d", j);
+ if (arg.is_oop()) {
+ xtty->object(xn, arg.oop_value());
+ } else {
diff --git a/jdk8189170-aarch64_primordial_thread.patch b/jdk8189170-aarch64_primordial_thread.patch
new file mode 100644
index 0000000..876cfdf
--- /dev/null
+++ b/jdk8189170-aarch64_primordial_thread.patch
@@ -0,0 +1,30 @@
+# HG changeset patch
+# User dbuck
+# Date 1547622839 0
+# Wed Jan 16 07:13:59 2019 +0000
+# Node ID 34c6b4b813caf9b3a6fd1859596a87a24a49c423
+# Parent bca8195a3bc70df281a73d9a40032c673971676c
+8189170: [AArch64] Add option to disable stack overflow checking in primordial thread for use with JNI_CreateJavaJVM
+Reviewed-by: dcubed
+
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
++++ openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 2018, 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
+@@ -550,8 +550,8 @@
+ // pthread_attr_getstack()
+
+ static void current_stack_region(address * bottom, size_t * size) {
+- if (os::Linux::is_initial_thread()) {
+- // initial thread needs special handling because pthread_getattr_np()
++ if (os::is_primordial_thread()) {
++ // primordial thread needs special handling because pthread_getattr_np()
+ // may return bogus value.
+ *bottom = os::Linux::initial_thread_stack_bottom();
+ *size = os::Linux::initial_thread_stack_size();
diff --git a/jdk8197429-pr3546-rh1536622-increased_stack_guard_causes_segfaults_on_x86_32.patch b/jdk8197429-pr3546-rh1536622-increased_stack_guard_causes_segfaults_on_x86_32.patch
new file mode 100644
index 0000000..6d7f743
--- /dev/null
+++ b/jdk8197429-pr3546-rh1536622-increased_stack_guard_causes_segfaults_on_x86_32.patch
@@ -0,0 +1,286 @@
+# HG changeset patch
+# User aph
+# Date 1530894306 -3600
+# Fri Jul 06 17:25:06 2018 +0100
+# Node ID 1485461a0fd1ff977a6acb8f2ed1069aaaf3b07e
+# Parent d7bcbcfde5057ad066ad2fb55a87d19a5827ddee
+8197429: Increased stack guard causes segfaults on x86-32
+Reviewed-by: dholmes
+
+diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -724,6 +724,10 @@
+ }
+ }
+
++void os::Linux::expand_stack_to(address bottom) {
++ _expand_stack_to(bottom);
++}
++
+ bool os::Linux::manually_expand_stack(JavaThread * t, address addr) {
+ assert(t!=NULL, "just checking");
+ assert(t->osthread()->expanding_stack(), "expand should be set");
+diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.hpp openjdk/hotspot/src/os/linux/vm/os_linux.hpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.hpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.hpp
+@@ -249,6 +249,8 @@
+ static int safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime);
+
+ private:
++ static void expand_stack_to(address bottom);
++
+ typedef int (*sched_getcpu_func_t)(void);
+ typedef int (*numa_node_to_cpus_func_t)(int node, unsigned long *buffer, int bufferlen);
+ typedef int (*numa_max_node_func_t)(void);
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+@@ -892,6 +892,27 @@
+ void os::workaround_expand_exec_shield_cs_limit() {
+ #if defined(IA32)
+ size_t page_size = os::vm_page_size();
++
++ /*
++ * JDK-8197429
++ *
++ * Expand the stack mapping to the end of the initial stack before
++ * attempting to install the codebuf. This is needed because newer
++ * Linux kernels impose a distance of a megabyte between stack
++ * memory and other memory regions. If we try to install the
++ * codebuf before expanding the stack the installation will appear
++ * to succeed but we'll get a segfault later if we expand the stack
++ * in Java code.
++ *
++ */
++ if (os::is_primordial_thread()) {
++ address limit = Linux::initial_thread_stack_bottom();
++ if (! DisablePrimordialThreadGuardPages) {
++ limit += (StackYellowPages + StackRedPages) * page_size;
++ }
++ os::Linux::expand_stack_to(limit);
++ }
++
+ /*
+ * Take the highest VA the OS will give us and exec
+ *
+@@ -910,6 +931,16 @@
+ char* hint = (char*) (Linux::initial_thread_stack_bottom() -
+ ((StackYellowPages + StackRedPages + 1) * page_size));
+ char* codebuf = os::attempt_reserve_memory_at(page_size, hint);
++
++ if (codebuf == NULL) {
++ // JDK-8197429: There may be a stack gap of one megabyte between
++ // the limit of the stack and the nearest memory region: this is a
++ // Linux kernel workaround for CVE-2017-1000364. If we failed to
++ // map our codebuf, try again at an address one megabyte lower.
++ hint -= 1 * M;
++ codebuf = os::attempt_reserve_memory_at(page_size, hint);
++ }
++
+ if ( (codebuf == NULL) || (!os::commit_memory(codebuf, page_size, true)) ) {
+ return; // No matter, we tried, best effort.
+ }
+diff --git openjdk.orig/hotspot/test/runtime/StackGap/T.java openjdk/hotspot/test/runtime/StackGap/T.java
+new file mode 100644
+--- /dev/null
++++ openjdk/hotspot/test/runtime/StackGap/T.java
+@@ -0,0 +1,33 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ *
++ * 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.
++ */
++
++public class T {
++
++ public static void test(int n) {
++ if (n == 0) return;
++ System.out.println (n);
++ test (n - 1);
++
++ }
++
++}
+diff --git openjdk.orig/hotspot/test/runtime/StackGap/exestack-gap.c openjdk/hotspot/test/runtime/StackGap/exestack-gap.c
+new file mode 100644
+--- /dev/null
++++ openjdk/hotspot/test/runtime/StackGap/exestack-gap.c
+@@ -0,0 +1,82 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ *
++ * 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.
++ */
++
++#include <jni.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++JNIEnv* create_vm(JavaVM **jvm, char *extra_option)
++{
++ JNIEnv* env;
++ JavaVMInitArgs args;
++ JavaVMOption options[4];
++ args.version = JNI_VERSION_1_8;
++ args.nOptions = 3 + (extra_option != NULL);
++ options[0].optionString = "-Xss2048k";
++ char classpath[4096];
++ snprintf(classpath, sizeof classpath,
++ "-Djava.class.path=%s", getenv("CLASSPATH"));
++ options[1].optionString = classpath;
++ options[2].optionString = "-XX:+UnlockExperimentalVMOptions";
++ if (extra_option) {
++ options[3].optionString = extra_option;
++ }
++ args.options = &options[0];
++ args.ignoreUnrecognized = 0;
++ int rv;
++ rv = JNI_CreateJavaVM(jvm, (void**)&env, &args);
++ if (rv < 0) return NULL;
++ return env;
++}
++
++void run(char *extra_arg) {
++ JavaVM *jvm;
++ jclass T_class;
++ jmethodID test_method;
++ JNIEnv *env = create_vm(&jvm, extra_arg);
++ if (env == NULL)
++ exit(1);
++ T_class = (*env)->FindClass(env, "T");
++ if ((*env)->ExceptionCheck(env) == JNI_TRUE) {
++ (*env)->ExceptionDescribe(env);
++ exit(1);
++ }
++ test_method = (*env)->GetStaticMethodID(env, T_class, "test", "(I)V");
++ if ((*env)->ExceptionCheck(env) == JNI_TRUE) {
++ (*env)->ExceptionDescribe(env);
++ exit(1);
++ }
++ (*env)->CallStaticVoidMethod(env, T_class, test_method, 1000);
++}
++
++
++int main(int argc, char **argv)
++{
++ if (argc > 1) {
++ run(argv[1]);
++ } else {
++ run(NULL);
++ }
++
++ return 0;
++}
+diff --git openjdk.orig/hotspot/test/runtime/StackGap/testme.sh openjdk/hotspot/test/runtime/StackGap/testme.sh
+new file mode 100644
+--- /dev/null
++++ openjdk/hotspot/test/runtime/StackGap/testme.sh
+@@ -0,0 +1,73 @@
++# Copyright (c) 2014, 2018, 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.
++#
++# 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.
++#!/bin/sh
++
++#
++# @test testme.sh
++# @bug 8197429
++# @summary Linux kernel stack guard should not cause segfaults on x86-32
++# @compile T.java
++# @run shell testme.sh
++#
++
++if [ "${TESTSRC}" = "" ]
++then
++ TESTSRC=${PWD}
++ echo "TESTSRC not set. Using "${TESTSRC}" as default"
++fi
++echo "TESTSRC=${TESTSRC}"
++## Adding common setup Variables for running shell tests.
++. ${TESTSRC}/../../test_env.sh
++
++if [ "${VM_OS}" != "linux" ]
++then
++ echo "Test only valid for Linux"
++ exit 0
++fi
++
++gcc_cmd=`which gcc`
++if [ "x$gcc_cmd" = "x" ]; then
++ echo "WARNING: gcc not found. Cannot execute test." 2>&1
++ exit 0;
++fi
++
++CFLAGS="-m${VM_BITS}"
++
++LD_LIBRARY_PATH=.:${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE}:/usr/lib:$LD_LIBRARY_PATH
++export LD_LIBRARY_PATH
++
++cp ${TESTSRC}${FS}exestack-gap.c .
++
++# Copy the result of our @compile action:
++cp ${TESTCLASSES}${FS}T.class .
++
++echo "Compilation flag: ${COMP_FLAG}"
++# Note pthread may not be found thus invoke creation will fail to be created.
++# Check to ensure you have a /usr/lib/libpthread.so if you don't please look
++# for /usr/lib/`uname -m`-linux-gnu version ensure to add that path to below compilation.
++
++$gcc_cmd -DLINUX ${CFLAGS} -o stack-gap \
++ -I${COMPILEJAVA}/include -I${COMPILEJAVA}/include/linux \
++ -L${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE} \
++ -ljvm -lpthread exestack-gap.c
++
++./stack-gap || exit $?
++./stack-gap -XX:+DisablePrimordialThreadGuardPages || exit $?
diff --git a/jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch b/jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch
new file mode 100644
index 0000000..ba712ad
--- /dev/null
+++ b/jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch
@@ -0,0 +1,35 @@
+# HG changeset patch
+# User prr
+# Date 1518454604 28800
+# Mon Feb 12 08:56:44 2018 -0800
+# Node ID 556adf3a76aa81bf3918d7d46554dae7cc1d5c5c
+# Parent b77308735540644d4710244e3c88865067f2905a
+8197546: Fix for 8171000 breaks Solaris + Linux builds
+Reviewed-by: serb, jdv
+
+diff --git openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
+--- openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c
++++ openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
+@@ -395,6 +395,8 @@
+ list_ptr regions;/* list of regions to read from */
+ {
+ XImage *ximage ;
++ image_region_type* reg;
++ int32_t rect;
+
+ ximage = XCreateImage(disp,fakeVis,(uint32_t) depth,format,0,NULL,
+ (uint32_t)width,(uint32_t)height,8,0);
+@@ -402,11 +404,11 @@
+ ximage->data = calloc(ximage->bytes_per_line*height*((format==ZPixmap)? 1 : depth), sizeof(char));
+ ximage->bits_per_pixel = depth; /** Valid only if format is ZPixmap ***/
+
+- for (image_region_type* reg = (image_region_type *) first_in_list( regions); reg;
++ for (reg = (image_region_type *) first_in_list( regions); reg;
+ reg = (image_region_type *) next_in_list( regions))
+ {
+ struct my_XRegion *vis_reg = (struct my_XRegion *)(reg->visible_region);
+- for (int32_t rect = 0; rect < vis_reg->numRects; rect++)
++ for (rect = 0; rect < vis_reg->numRects; rect++)
+ {
+ /** ------------------------------------------------------------------------
+ Intersect bbox with visible part of region giving src rect & output
diff --git a/jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch b/jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
new file mode 100644
index 0000000..5f6d9ce
--- /dev/null
+++ b/jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
@@ -0,0 +1,32 @@
+# HG changeset patch
+# User andrew
+# Date 1518667645 0
+# Thu Feb 15 04:07:25 2018 +0000
+# Node ID 1d35411eb7bdf16191e220ffe3b1dc4d5d0c6041
+# Parent 999983606f5c61b093c6f6316a7b26c4cd4ca79e
+8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
+Summary: Fix issue discovered by -Wreturn-type on systems without LP64.
+Reviewed-by: aph
+
+diff --git openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
+--- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
++++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
+@@ -457,6 +457,7 @@
+ long long unsigned int oldval,
+ long long unsigned int newval) {
+ ShouldNotCallThis();
++ return 0;
+ }
+ };
+ #endif // !_LP64
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+@@ -498,6 +498,7 @@
+ long long unsigned int oldval,
+ long long unsigned int newval) {
+ ShouldNotCallThis();
++ return 0;
+ }
+ };
+ #endif // !_LP64
diff --git a/jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch b/jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch
new file mode 100644
index 0000000..533ea2d
--- /dev/null
+++ b/jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch
@@ -0,0 +1,58 @@
+# HG changeset patch
+# User andrew
+# Date 1526122977 -3600
+# Sat May 12 12:02:57 2018 +0100
+# Node ID 00ccc73498628a51a45301322e64ce2ad06e49be
+# Parent aecf9f48f7b5c6148b62713a6b746301435b57cc
+PR3533: HotSpot generates code with unaligned stack, crashes on SSE operations
+Summary: Enable -mstackrealign on x86 Linux as well as x86 Mac OS X
+
+diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/flags.m4
+--- openjdk.orig///common/autoconf/flags.m4
++++ openjdk///common/autoconf/flags.m4
+@@ -389,6 +389,21 @@
+ AC_SUBST($2CXXSTD_CXXFLAG)
+ fi
+
++ #
++ # NOTE: check for -mstackrealign needs to be below potential addition of -m32
++ #
++ if test "x$OPENJDK_TARGET_CPU" = xx86 && test "x$OPENJDK_TARGET_OS" = xmacosx -o \
++ "x$OPENJDK_TARGET_OS" = xlinux; then
++ # On 32-bit MacOSX the OS requires C-entry points to be 16 byte aligned.
++ # While waiting for a better solution, the current workaround is to use -mstackrealign
++ # This is also required on Linux systems which use libraries compiled with SSE instructions
++ REALIGN_CFLAG="-mstackrealign"
++ FLAGS_COMPILER_CHECK_ARGUMENTS([$REALIGN_CFLAG -Werror], [],
++ AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.])
++ )
++ AC_SUBST([REALIGN_CFLAG])
++ fi
++
+ if test "x$CFLAGS" != "x${ADDED_CFLAGS}"; then
+ AC_MSG_WARN([Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags])
+ fi
+diff --git openjdk.orig///common/autoconf/hotspot-spec.gmk.in openjdk///common/autoconf/hotspot-spec.gmk.in
+--- openjdk.orig///common/autoconf/hotspot-spec.gmk.in
++++ openjdk///common/autoconf/hotspot-spec.gmk.in
+@@ -112,7 +112,8 @@
+ RC:=@HOTSPOT_RC@
+
+ EXTRA_CFLAGS=@LEGACY_EXTRA_CFLAGS@ $(NO_DELETE_NULL_POINTER_CHECKS_CFLAG) \
+- $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG)
++ $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG) \
++ $(REALIGN_CFLAG)
+ EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@
+ EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@
+
+diff --git openjdk.orig///common/autoconf/spec.gmk.in openjdk///common/autoconf/spec.gmk.in
+--- openjdk.orig///common/autoconf/spec.gmk.in
++++ openjdk///common/autoconf/spec.gmk.in
+@@ -334,6 +334,7 @@
+
+ NO_DELETE_NULL_POINTER_CHECKS_CFLAG=@NO_DELETE_NULL_POINTER_CHECKS_CFLAG@
+ NO_LIFETIME_DSE_CFLAG=@NO_LIFETIME_DSE_CFLAG@
++REALIGN_CFLAG=@REALIGN_CFLAG@
+ CXXSTD_CXXFLAG=@CXXSTD_CXXFLAG@
+
+ CXX:=@FIXPATH@ @CCACHE@ @CXX@
diff --git a/jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch b/jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch
new file mode 100644
index 0000000..7ac077b
--- /dev/null
+++ b/jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User andrew
+# Date 1526489197 -3600
+# Wed May 16 17:46:37 2018 +0100
+# Node ID 64e87a408afd2b56d59dad73dee28d4b99463810
+# Parent 00ccc73498628a51a45301322e64ce2ad06e49be
+PR3591: Fix for bug 3533 doesn't add -mstackrealign to JDK code
+
+diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/flags.m4
+--- openjdk.orig///common/autoconf/flags.m4
++++ openjdk///common/autoconf/flags.m4
+@@ -401,6 +401,8 @@
+ FLAGS_COMPILER_CHECK_ARGUMENTS([$REALIGN_CFLAG -Werror], [],
+ AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.])
+ )
++ CFLAGS_JDK="${CFLAGS_JDK} ${REALIGN_CFLAG}"
++ CXXFLAGS_JDK="${CXXFLAGS_JDK} ${REALIGN_CFLAG}"
+ AC_SUBST([REALIGN_CFLAG])
+ fi
+
diff --git a/jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch b/jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch
new file mode 100644
index 0000000..6e0d762
--- /dev/null
+++ b/jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch
@@ -0,0 +1,321 @@
+diff --git a/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp b/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
+@@ -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);
+diff --git a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
+@@ -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(
+diff --git a/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+@@ -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;
+ }
+@@ -4707,7 +4707,7 @@
+ // The > 0 check is to deal with the prev and next live bytes which
+ // could be 0.
+ if (*hum_bytes > 0) {
+- bytes = MIN2(HeapRegion::GrainBytes, *hum_bytes);
++ bytes = MIN2(HeapRegion::GrainBytes, (size_t)*hum_bytes);
+ *hum_bytes -= bytes;
+ }
+ return bytes;
+diff --git a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+@@ -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")
+diff --git a/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp b/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp
+@@ -117,7 +117,7 @@
+ return reserved_size() - committed_size();
+ }
+
+-size_t G1PageBasedVirtualSpace::addr_to_page_index(char* addr) const {
++uintptr_t G1PageBasedVirtualSpace::addr_to_page_index(char* addr) const {
+ return (addr - _low_boundary) / _page_size;
+ }
+
+diff --git a/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp b/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
+@@ -38,7 +38,7 @@
+ _cancel(false),
+ _empty(true),
+ _dropped(0) {
+- _nqueues = MAX2(ParallelGCThreads, (size_t)1);
++ _nqueues = MAX2(ParallelGCThreads, (uintx)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);
+diff --git a/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp b/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
+@@ -120,7 +120,7 @@
+ };
+
+ G1StringDedupEntryCache::G1StringDedupEntryCache(size_t max_size) :
+- _nlists(MAX2(ParallelGCThreads, (size_t)1)),
++ _nlists(MAX2(ParallelGCThreads, (uintx)1)),
+ _max_list_length(0),
+ _cached(PaddedArray<G1StringDedupEntryList, mtGC>::create_unfreeable((uint)_nlists)),
+ _overflowed(PaddedArray<G1StringDedupEntryList, mtGC>::create_unfreeable((uint)_nlists)) {
+diff --git a/src/share/vm/gc_implementation/g1/heapRegion.cpp b/src/share/vm/gc_implementation/g1/heapRegion.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
+@@ -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());
++ HeapRegionBounds::min_size());
+ }
+
+ int region_size_log = log2_long((jlong) region_size);
+diff --git a/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp b/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
+@@ -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.
+diff --git a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
+--- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
+@@ -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);
+diff --git a/src/share/vm/memory/collectorPolicy.cpp b/src/share/vm/memory/collectorPolicy.cpp
+--- openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
++++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
+@@ -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,24 +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");
+ _initial_gen0_size = desired_new_size;
+@@ -573,7 +572,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
+diff --git a/src/share/vm/memory/metaspace.cpp b/src/share/vm/memory/metaspace.cpp
+--- openjdk/hotspot/src/share/vm/memory/metaspace.cpp
++++ openjdk/hotspot/src/share/vm/memory/metaspace.cpp
+@@ -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"
+@@ -3285,7 +3285,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.
+diff --git a/src/share/vm/memory/threadLocalAllocBuffer.cpp b/src/share/vm/memory/threadLocalAllocBuffer.cpp
+--- openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
++++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
+@@ -238,13 +238,13 @@
+ size_t init_sz = 0;
+
+ if (TLABSize > 0) {
+- init_sz = TLABSize / HeapWordSize;
++ init_sz = (size_t)(TLABSize / HeapWordSize);
+ } else if (global_stats() != NULL) {
+ // Initial size is a function of the average number of allocating threads.
+ unsigned nof_threads = global_stats()->allocating_threads_avg();
+
+- init_sz = (Universe::heap()->tlab_capacity(myThread()) / HeapWordSize) /
+- (nof_threads * target_refills());
++ init_sz = (size_t)((Universe::heap()->tlab_capacity(myThread()) / HeapWordSize) /
++ (nof_threads * target_refills()));
+ init_sz = align_object_size(init_sz);
+ }
+ init_sz = MIN2(MAX2(init_sz, min_size()), max_size());
+diff --git a/src/share/vm/oops/objArrayKlass.inline.hpp b/src/share/vm/oops/objArrayKlass.inline.hpp
+--- openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp
++++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp
+@@ -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;
+diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp
+--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+@@ -1283,7 +1283,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);
+ }
+@@ -1308,8 +1308,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);
+@@ -1319,7 +1319,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((size_t)(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);
diff --git a/jdk8207057-pr3613-no_debug_info_for_assembler_files_hotspot.patch b/jdk8207057-pr3613-no_debug_info_for_assembler_files_hotspot.patch
new file mode 100644
index 0000000..c61d972
--- /dev/null
+++ b/jdk8207057-pr3613-no_debug_info_for_assembler_files_hotspot.patch
@@ -0,0 +1,13 @@
+--- openjdk/hotspot/make/linux/makefiles/gcc.make 2018-09-17 15:40:56.933127667 +0200
++++ openjdk/hotspot/make/linux/makefiles/gcc.make 2018-09-17 15:40:56.831127850 +0200
+@@ -184,6 +184,10 @@
+ LFLAGS += $(ARCHFLAG)
+ ASFLAGS += $(ARCHFLAG)
+
++ifeq ($(DEBUG_BINARIES), true)
++ ASFLAGS += $(ASFLAGS_DEBUG_SYMBOLS)
++endif
++
+ # Use C++ Interpreter
+ ifdef CC_INTERP
+ CFLAGS += -DCC_INTERP
diff --git a/jdk8207057-pr3613-no_debug_info_for_assembler_files_root.patch b/jdk8207057-pr3613-no_debug_info_for_assembler_files_root.patch
new file mode 100644
index 0000000..e4a007c
--- /dev/null
+++ b/jdk8207057-pr3613-no_debug_info_for_assembler_files_root.patch
@@ -0,0 +1,52 @@
+diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/flags.m4
+--- openjdk.orig///common/autoconf/flags.m4
++++ openjdk///common/autoconf/flags.m4
+@@ -282,9 +282,11 @@
+ if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
+ CFLAGS_DEBUG_SYMBOLS="-g1"
+ CXXFLAGS_DEBUG_SYMBOLS="-g1"
++ ASFLAGS_DEBUG_SYMBOLS="-g1"
+ else
+ CFLAGS_DEBUG_SYMBOLS="-g"
+ CXXFLAGS_DEBUG_SYMBOLS="-g"
++ ASFLAGS_DEBUG_SYMBOLS="-g"
+ fi
+ elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
+ CFLAGS_DEBUG_SYMBOLS="-g -xs"
+@@ -295,6 +297,7 @@
+ fi
+ AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
+ AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
++ AC_SUBST(ASFLAGS_DEBUG_SYMBOLS)
+
+ # Optimization levels
+ if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
+diff --git openjdk.orig///common/autoconf/spec.gmk.in openjdk///common/autoconf/spec.gmk.in
+--- openjdk.orig///common/autoconf/spec.gmk.in
++++ openjdk///common/autoconf/spec.gmk.in
+@@ -414,6 +414,7 @@
+ # Options for generating debug symbols
+ ENABLE_DEBUG_SYMBOLS:=@ENABLE_DEBUG_SYMBOLS@
+ CFLAGS_DEBUG_SYMBOLS:=@CFLAGS_DEBUG_SYMBOLS@
++ASFLAGS_DEBUG_SYMBOLS:=@ASFLAGS_DEBUG_SYMBOLS@
+ CXXFLAGS_DEBUG_SYMBOLS:=@CXXFLAGS_DEBUG_SYMBOLS@
+ ZIP_DEBUGINFO_FILES:=@ZIP_DEBUGINFO_FILES@
+ STRIP_POLICY:=@STRIP_POLICY@
+diff --git openjdk.orig///make/common/NativeCompilation.gmk openjdk///make/common/NativeCompilation.gmk
+--- openjdk.orig///make/common/NativeCompilation.gmk
++++ openjdk///make/common/NativeCompilation.gmk
+@@ -351,12 +351,14 @@
+ # Always add debug symbols
+ $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
+ $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
++ $1_EXTRA_ASFLAGS+=$(ASFLAGS_DEBUG_SYMBOLS)
+ else
+ # Programs don't get the debug symbols added in the old build. It's not clear if
+ # this is intentional.
+ ifeq ($$($1_PROGRAM),)
+ $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
+ $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
++ $1_EXTRA_ASFLAGS+=$(ASFLAGS_DEBUG_SYMBOLS)
+ endif
+ endif
+ endif
diff --git a/jdk8209639-rh1640127-02-coalesce_attempted_spill_non_spillable.patch b/jdk8209639-rh1640127-02-coalesce_attempted_spill_non_spillable.patch
new file mode 100644
index 0000000..63c9cba
--- /dev/null
+++ b/jdk8209639-rh1640127-02-coalesce_attempted_spill_non_spillable.patch
@@ -0,0 +1,114 @@
+
+# HG changeset patch
+# User roland
+# Date 1540370574 -7200
+# Node ID d853bac073f8a4851e313ba8fa9768b38396a204
+# Parent e044997c2edaeae97866394a7f8e2ddebbd41392
+8209639: assert failure in coalesce.cpp: attempted to spill a non-spillable item
+Reviewed-by: neliasso, kvn
+
+diff -r e044997c2eda -r d853bac073f8 src/share/vm/opto/coalesce.cpp
+--- openjdk/hotspot/src/share/vm/opto/coalesce.cpp Mon Oct 15 11:00:27 2018 +0200
++++ openjdk/hotspot/src/share/vm/opto/coalesce.cpp Wed Oct 24 10:42:54 2018 +0200
+@@ -25,6 +25,7 @@
+ #include "precompiled.hpp"
+ #include "memory/allocation.inline.hpp"
+ #include "opto/block.hpp"
++#include "opto/c2compiler.hpp"
+ #include "opto/cfgnode.hpp"
+ #include "opto/chaitin.hpp"
+ #include "opto/coalesce.hpp"
+@@ -294,9 +295,13 @@
+ } else {
+ int ireg = m->ideal_reg();
+ if (ireg == 0 || ireg == Op_RegFlags) {
+- assert(false, err_msg("attempted to spill a non-spillable item: %d: %s, ireg = %d",
+- m->_idx, m->Name(), ireg));
+- C->record_method_not_compilable("attempted to spill a non-spillable item");
++ if (C->subsume_loads()) {
++ C->record_failure(C2Compiler::retry_no_subsuming_loads());
++ } else {
++ assert(false, err_msg("attempted to spill a non-spillable item: %d: %s, ireg = %d",
++ m->_idx, m->Name(), ireg));
++ C->record_method_not_compilable("attempted to spill a non-spillable item");
++ }
+ return;
+ }
+ const RegMask *rm = C->matcher()->idealreg2spillmask[ireg];
+diff -r e044997c2eda -r d853bac073f8 test/compiler/c2/SubsumingLoadsCauseFlagSpill.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/hotspot/test/compiler/c2/SubsumingLoadsCauseFlagSpill.java Wed Oct 24 10:42:54 2018 +0200
+@@ -0,0 +1,72 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. 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.
++ *
++ * 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.
++ */
++
++/**
++ * @test
++ * @bug 8209639
++ * @summary assert failure in coalesce.cpp: attempted to spill a non-spillable item
++ *
++ * @run main/othervm -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,SubsumingLoadsCauseFlagSpill::not_inlined -Xmx1024m SubsumingLoadsCauseFlagSpill
++ *
++ */
++
++public class SubsumingLoadsCauseFlagSpill {
++ private static Object field;
++ private static boolean do_throw;
++ private static volatile boolean barrier;
++
++ public static void main(String[] args) {
++ for (int i = 0; i < 20_000; i++) {
++ do_throw = true;
++ field = null;
++ test(0);
++ do_throw = false;
++ field = new Object();
++ test(0);
++ }
++ }
++
++ private static float test(float f) {
++ Object v = null;
++ try {
++ not_inlined();
++ v = field;
++ } catch (MyException me) {
++ v = field;
++ barrier = true;
++ }
++ if (v == null) {
++ return f * f;
++ }
++ return f;
++ }
++
++ private static void not_inlined() throws MyException{
++ if (do_throw) {
++ throw new MyException();
++ }
++ }
++
++ private static class MyException extends Throwable {
++ }
++}
+
diff --git a/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch b/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch
new file mode 100644
index 0000000..98bbad0
--- /dev/null
+++ b/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch
@@ -0,0 +1,57 @@
+diff --git openjdk.orig/jdk/make/lib/CoreLibraries.gmk openjdk/jdk/make/lib/CoreLibraries.gmk
+--- openjdk.orig/jdk/make/lib/CoreLibraries.gmk
++++ openjdk/jdk/make/lib/CoreLibraries.gmk
+@@ -37,21 +37,32 @@ ifeq ($(OPENJDK_TARGET_OS), solaris)
+ endif
+
+ ifeq ($(OPENJDK_TARGET_OS), linux)
+- ifeq ($(OPENJDK_TARGET_CPU), ppc64)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- else ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- else ifeq ($(OPENJDK_TARGET_CPU), aarch64)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- endif
+-endif
+-
+-ifneq ($(OPENJDK_TARGET_OS), macosx)
++ BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
++ LIBFDLIBM_CFLAGS_LINUX := -ffp-contract=off
+ # Unfortunately, '-ffp-contract' is only available since gcc 4.6. For ppc64le
+ # that's no problem since ppc64le support only appeared in gcc 4.8.3. But on
+ # ppc64 (big endian) we traditionally compiled with gcc 4.3 which only knows
+ # '-mno-fused-madd'. However, that's still not enough to get the float
+ # computations right - we additionally have to supply '-fno-strict-aliasing'.
++ #
++ #
++ ifeq ($(TOOLCHAIN_TYPE), gcc)
++ CC_VER_MAJOR := $(shell $(CC) -dumpversion | cut -d'.' -f1)
++ CC_VER_MINOR := $(shell $(CC) -dumpversion | cut -d'.' -f2)
++ endif
++ # Only GCC 4.6 and better have machine independent -ffp-contract=off.
++ # For other versions we need to explicitly set arch specific machine
++ # flags or keep optimization off.
++ ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 6 \) \))" "0"
++ ifeq ($(OPENJDK_TARGET_CPU), ppc64)
++ LIBFDLIBM_CFLAGS_LINUX := -mno-fused-madd -fno-strict-aliasing
++ else
++ BUILD_LIBFDLIBM_OPTIMIZATION := NONE
++ endif
++ endif
++endif
++
++ifneq ($(OPENJDK_TARGET_OS), macosx)
+ $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM, \
+ STATIC_LIBRARY := fdlibm, \
+ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
+@@ -62,9 +73,7 @@ ifneq ($(OPENJDK_TARGET_OS), macosx)
+ -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \
+ CFLAGS_windows_debug := -DLOGGING, \
+ CFLAGS_aix := -qfloat=nomaf, \
+- CFLAGS_linux_ppc64 := -mno-fused-madd -fno-strict-aliasing, \
+- CFLAGS_linux_ppc64le := -ffp-contract=off, \
+- CFLAGS_linux_aarch64 := -ffp-contract=off, \
++ CFLAGS_linux := $(LIBFDLIBM_CFLAGS_LINUX), \
+ ARFLAGS := $(ARFLAGS), \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
diff --git a/jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch b/jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch
new file mode 100644
index 0000000..0b05ba6
--- /dev/null
+++ b/jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch
@@ -0,0 +1,83 @@
+diff --git openjdk.orig/hotspot/make/linux/makefiles/amd64.make openjdk/hotspot/make/linux/makefiles/amd64.make
+--- openjdk.orig/hotspot/make/linux/makefiles/amd64.make
++++ openjdk/hotspot/make/linux/makefiles/amd64.make
+@@ -22,10 +22,13 @@
+ #
+ #
+
+-# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+-# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++ifeq ($(OPT_CFLAGS_NO_FMA),)
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++else
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++endif
+ # Must also specify if CPU is little endian
+ CFLAGS += -DVM_LITTLE_ENDIAN
+
+diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
++++ openjdk/hotspot/make/linux/makefiles/gcc.make
+@@ -225,6 +225,16 @@
+ OPT_CFLAGS/SIZE=-Os
+ OPT_CFLAGS/SPEED=-O3
+
++ifeq ($(USE_CLANG),)
++ # Only GCC 4.6 and better have machine independent -ffp-contract=off.
++ # For other versions we need to explicitly set arch specific machine
++ # flags or keep optimization off for them.
++ ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 6 \) \))" "1"
++ OPT_CFLAGS_NO_FMA = -ffp-contract=off
++ endif
++endif
++
++
+ # Hotspot uses very unstrict aliasing turn this optimization off
+ # This option is added to CFLAGS rather than OPT_CFLAGS
+ # so that OPT_CFLAGS overrides get this option too.
+diff --git openjdk.orig/hotspot/make/linux/makefiles/i486.make openjdk/hotspot/make/linux/makefiles/i486.make
+--- openjdk.orig/hotspot/make/linux/makefiles/i486.make
++++ openjdk/hotspot/make/linux/makefiles/i486.make
+@@ -24,10 +24,13 @@
+
+ # TLS helper, assembled from .s file
+
+-# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+-# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++ifeq ($(OPT_CFLAGS_NO_FMA),)
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++else
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++endif
+ # Must also specify if CPU is little endian
+ CFLAGS += -DVM_LITTLE_ENDIAN
+
+diff --git openjdk.orig/hotspot/make/linux/makefiles/ppc64.make openjdk/hotspot/make/linux/makefiles/ppc64.make
+--- openjdk.orig/hotspot/make/linux/makefiles/ppc64.make
++++ openjdk/hotspot/make/linux/makefiles/ppc64.make
+@@ -49,3 +49,17 @@
+ # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
+ CFLAGS += -mcpu=power7 -mtune=power8 -minsert-sched-nops=regroup_exact -mno-multiple -mno-string
+ endif
++
++ifeq ($(OPT_CFLAGS_NO_FMA),)
++ ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),big)
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) -mno-fused-madd -fno-strict-aliasing
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) -mno-fused-madd -fno-strict-aliasing
++ else
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++ endif
++else
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++endif
++
diff --git a/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch b/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch
new file mode 100644
index 0000000..cf1b40b
--- /dev/null
+++ b/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch
@@ -0,0 +1,22 @@
+diff --git openjdk.orig/hotspot/make/linux/makefiles/aarch64.make openjdk/hotspot/make/linux/makefiles/aarch64.make
+index 3d17326..7cdb498 100644
+--- openjdk.orig/hotspot/make/linux/makefiles/aarch64.make
++++ openjdk/hotspot/make/linux/makefiles/aarch64.make
+@@ -22,10 +22,13 @@
+ #
+ #
+
+-# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+-# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++ifeq ($(OPT_CFLAGS_NO_FMA),)
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++else
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++endif
+ # Must also specify if CPU is little endian
+ CFLAGS += -DVM_LITTLE_ENDIAN
+
diff --git a/jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch b/jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch
new file mode 100644
index 0000000..6c1ebad
--- /dev/null
+++ b/jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch
@@ -0,0 +1,20 @@
+--- openjdk/hotspot/make/linux/makefiles/zeroshark.make
++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
+@@ -30,10 +30,13 @@ ifeq ($(USE_CLANG), true)
+ WARNING_FLAGS += -Wno-undef
+ endif
+
+-# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+-# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++ifeq ($(OPT_CFLAGS_NO_FMA),)
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++else
++ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++endif
+
+ # Specify that the CPU is little endian, if necessary
+ ifeq ($(ZERO_ENDIANNESS), little)
diff --git a/jdk8210647-rh1632174-libsaproc_is_being_compiled_without_optimization.patch b/jdk8210647-rh1632174-libsaproc_is_being_compiled_without_optimization.patch
new file mode 100644
index 0000000..0ab09e4
--- /dev/null
+++ b/jdk8210647-rh1632174-libsaproc_is_being_compiled_without_optimization.patch
@@ -0,0 +1,23 @@
+diff --git openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
++++ openjdk/hotspot/make/linux/makefiles/saproc.make
+@@ -59,6 +59,11 @@
+ SA_DEBUG_CFLAGS = -g
+ endif
+
++# Optimize saproc lib at level -O3 unless it's a slowdebug build
++ifneq ($(DEBUG_LEVEL), slowdebug)
++ SA_OPT_FLAGS = $(OPT_CFLAGS)
++endif
++
+ # if $(AGENT_DIR) does not exist, we don't build SA
+ # also, we don't build SA on Itanium or zero.
+
+@@ -95,6 +100,7 @@
+ $(SASRCFILES) \
+ $(SA_LFLAGS) \
+ $(SA_DEBUG_CFLAGS) \
++ $(SA_OPT_FLAGS) \
+ $(EXTRA_CFLAGS) \
+ -o $@ \
+ -lthread_db
diff --git a/jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch b/jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch
new file mode 100644
index 0000000..be2650b
--- /dev/null
+++ b/jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1537541916 -7200
+# Fri Sep 21 16:58:36 2018 +0200
+# Node ID 4010c90156d1bfeaf988dbfeb01520f2e3a66ea8
+# Parent 54afe70c50b6a6685763d00883e5173c0ba3a19d
+8210761: libjsig is being compiled without optimization
+Reviewed-by: erikj, ihse
+
+diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
+--- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
++++ openjdk/hotspot/make/linux/makefiles/jsig.make
+@@ -51,10 +51,15 @@
+ JSIG_DEBUG_CFLAGS = -g
+ endif
+
++# Optimize jsig lib at level -O3 unless it's a slowdebug build
++ifneq ($(DEBUG_LEVEL), slowdebug)
++ JSIG_OPT_FLAGS = $(OPT_CFLAGS)
++endif
++
+ $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
+ @echo Making signal interposition lib...
+ $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
+- $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
++ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(JSIG_OPT_FLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifneq ($(STRIP_POLICY),no_strip)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
diff --git a/jstack-pr1845.patch b/jstack-pr1845.patch
deleted file mode 100644
index 5d036ba..0000000
--- a/jstack-pr1845.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-diff -r c728621e76f2 tapset/jstack.stp.in
---- tapset/jstack-1.8.0.stp.in Mon Jun 02 18:41:24 2014 +0100
-+++ tapset/jstack-1.8.0.stp.in Sat Jun 14 00:21:14 2014 +0900
-@@ -45,11 +45,7 @@
- semantic error: failed to retrieve location attribute for local
- */
-
--global Universe_methodKlassObj;
--global Universe_collectedHeap;
--global HeapWordSize;
- global CodeCache_heap;
--global NarrowOopStruct;
-
- global sp_register;
- global fp_register;
-@@ -57,9 +53,8 @@
- global ptr_size;
- global ptr_mask;
-
--global constantPoolOopDesc_size;
-+global constantPool_size;
- global HeapBlock_Header_size;
--global oopDesc_size;
-
- global vm_inited;
-
-@@ -67,26 +62,6 @@
- in a bare function and vm_init_end seems a good place to use. */
- probe hotspot.vm_init_end
- {
-- // The parent/type oop for a methodOop.
-- Universe_methodKlassObj[pid()] = %( systemtap_v >= "1.8"
-- %? @var("_methodKlassObj(a)universe.cpp")
-- %: $_methodKlassObj %);
--
-- /**
-- * The Universe class holds some of the interesting statics for
-- * introspection into HotSpot. The CollectedHeap
-- * (Universe::_collectedHeap) is an abstraction of a java heap for Hotspot
-- * it contains a _reserved MemRegion which represents a contigous
-- * region of the address space consisting of HeapWords (which just
-- * have one field member char *i).
-- *
-- * Note that we access it through its "short name" _collectedHeap.
-- */
-- Universe_collectedHeap[pid()] = %( systemtap_v >= "1.8"
-- %? @var("_collectedHeap(a)universe.cpp")
-- %: $_collectedHeap %);
-- HeapWordSize[pid()] = $HeapWordSize;
--
- /**
- * The CodeCache class contains the static CodeHeap _heap that
- * is malloced at the start of the vm run and holds all generated
-@@ -107,17 +82,6 @@
- %? @var("_heap(a)codeCache.cpp")
- %: $_heap %);
-
-- /**
-- * Does target process use CompressedOops ?
-- */
-- NarrowOopStruct[pid()] = 0;
-- %( systemtap_v >= "1.8"
-- %? if (@var("UseCompressedOops(a)globals.cpp"))
-- NarrowOopStruct[pid()] = &@var("_narrow_oop(a)universe.cpp");
-- %: if($UseCompressedOops)
-- NarrowOopStruct[pid()] = $_narrow_oop;
-- %)
--
- // Should really check arch of user space (for 32bit jvm on 64bit kernel).
- %( arch == "i386" %?
- sp_register = "esp";
-@@ -136,22 +100,17 @@
-
- // Pretend we have an array at address zero and take address of second
- // element and we have the size.
-- constantPoolOopDesc_size = &@cast(0, "constantPoolOopDesc")[1];
-+ constantPool_size = &@cast(0, "ConstantPool")[1];
-
- // Really should get from dwarf: @size("HeapBlock::Header"), @size("oopDesc")
- HeapBlock_Header_size = 2 * ptr_size;
-- oopDesc_size = 2 * ptr_size;
-
- vm_inited[pid()] = 1;
- }
-
- probe hotspot.vm_shutdown
- {
-- delete(Universe_methodKlassObj[pid()]);
-- delete(Universe_collectedHeap[pid()]);
-- delete(HeapWordSize[pid()]);
- delete(CodeCache_heap[pid()]);
-- delete(NarrowOopStruct[pid()]);
- delete(vm_inited[pid()]);
- }
-
-@@ -262,15 +221,7 @@
- return frame;
- }
-
-- // Extract heap and code bounds.
-- heap_start = @cast(Universe_collectedHeap[pid()],
-- "CollectedHeap",
-- "@ABS_SERVER_LIBJVM_SO@")->_reserved->_start;
-- heap_size = HeapWordSize[pid()] * @cast(Universe_collectedHeap[pid()],
-- "CollectedHeap",
-- "@ABS_SERVER_LIBJVM_SO@")->_reserved->_word_size;
-- heap_end = heap_start + heap_size;
--
-+ // Extract code bounds.
- CodeCache_low = @cast(CodeCache_heap[pid()], "CodeHeap",
- "@ABS_SERVER_LIBJVM_SO@")->_memory->_low;
- CodeCache_high = @cast(CodeCache_heap[pid()], "CodeHeap",
-@@ -351,105 +302,69 @@
- // For the interpreter (and other code blobs) it is on the
- // stack relative to the frame pointer.
- if (blob_name == "nmethod")
-- methodOopPtr = @cast(blob, "nmethod",
-+ methodPtr = @cast(blob, "nmethod",
- "@ABS_SERVER_LIBJVM_SO@")->_method
- else
-- methodOopPtr = user_long(fp + (-3 * ptr_size)) & ptr_mask
--
-- // Start optimistic. A methodOop is only valid if it was
-- // heap allocated. And if the "type class" oop equals the
-- // Universe::methodKlassObj.
-- if (heap_start > methodOopPtr || methodOopPtr >= heap_end)
-- isMethodOop = 0
-- else
-- {
-- if (NarrowOopStruct[pid()])
-- {
-- methodOopKlass = @cast(methodOopPtr, "methodOopDesc",
-- "@ABS_SERVER_LIBJVM_SO@")->_metadata->_compressed_klass;
-- methodOopKlass = (@cast(NarrowOopStruct[pid()],
-- "NarrowOopStruct",
-- "@ABS_SERVER_LIBJVM_SO@")->_base
-- + (methodOopKlass
-- << @cast(NarrowOopStruct[pid()],
-- "NarrowOopStruct",
-- "@ABS_SERVER_LIBJVM_SO@")->_shift));
-- }
-- else
-- methodOopKlass = @cast(methodOopPtr, "methodOopDesc",
-- "@ABS_SERVER_LIBJVM_SO@")->_metadata->_klass;
-+ methodPtr = user_long(fp + (-3 * ptr_size)) & ptr_mask
-
-- isMethodOop = (methodOopKlass == Universe_methodKlassObj[pid()]);
-- }
-+ // The java class is the holder of the constants (strings)
-+ // that describe the method and signature. This constant pool
-+ // contains symbolic information that describe the properties
-+ // of the class. The indexes for methods and signaturates in
-+ // the constant pool are Symbols that contain utf8
-+ // strings (plus lenghts). (We could also sanity check that
-+ // the tag value is correct [CONSTANT_String = 8]).
-+ // Note that the class name uses '/' instead of '.' as
-+ // package name separator and that the method signature is
-+ // encoded as a method descriptor string. Both of which we
-+ // don't demangle here.
-+ constMethod = @cast(methodPtr, "Method",
-+ "@ABS_SERVER_LIBJVM_SO@")->_constMethod;
-+ constantPool = @cast(constMethod, "ConstMethod",
-+ "@ABS_SERVER_LIBJVM_SO@")->_constants;
-+ constantPool_base = constantPool + constantPool_size;
-+
-+ klass = @cast(constantPool, "ConstantPool",
-+ "@ABS_SERVER_LIBJVM_SO@")->_pool_holder;
-+ klassSymbol = @cast(klass, "Klass",
-+ "@ABS_SERVER_LIBJVM_SO@")->_name;
-+ klassName = &@cast(klassSymbol, "Symbol",
-+ "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-+ klassLength = @cast(klassSymbol, "Symbol",
-+ "@ABS_SERVER_LIBJVM_SO@")->_length;
-+
-+ methodIndex = @cast(constMethod, "ConstMethod",
-+ "@ABS_SERVER_LIBJVM_SO@")->_name_index;
-+ methodSymbol = user_long(constantPool_base + (methodIndex * ptr_size));
-+ methodName = &@cast(methodSymbol, "Symbol",
-+ "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-+ methodLength = @cast(methodSymbol, "Symbol",
-+ "@ABS_SERVER_LIBJVM_SO@")->_length;
-
-- if (isMethodOop)
-+ if (log_sig)
- {
-- // The java class is the holder of the constants (strings)
-- // that describe the method and signature. This constant pool
-- // contains symbolic information that describe the properties
-- // of the class. The indexes for methods and signaturates in
-- // the constant pool are Symbols that contain utf8
-- // strings (plus lenghts). (We could also sanity check that
-- // the tag value is correct [CONSTANT_String = 8]).
-- // Note that the class name uses '/' instead of '.' as
-- // package name separator and that the method signature is
-- // encoded as a method descriptor string. Both of which we
-- // don't demangle here.
-- constantPoolOopDesc = @cast(methodOopPtr, "methodOopDesc",
-- "@ABS_SERVER_LIBJVM_SO@")->_constants;
-- constantPoolOop_base = constantPoolOopDesc + constantPoolOopDesc_size;
--
-- klassPtr = @cast(constantPoolOopDesc, "constantPoolOopDesc",
-- "@ABS_SERVER_LIBJVM_SO@")->_pool_holder;
-- klassSymbol = @cast(klassPtr + oopDesc_size, "Klass",
-- "@ABS_SERVER_LIBJVM_SO@")->_name;
-- klassName = &@cast(klassSymbol, "Symbol",
-- "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-- klassLength = @cast(klassSymbol, "Symbol",
-- "@ABS_SERVER_LIBJVM_SO@")->_length;
--
-- methodIndex = @cast(methodOopPtr, "methodOopDesc",
-- "@ABS_SERVER_LIBJVM_SO@")->_constMethod->_name_index;
-- methodOopDesc = user_long(constantPoolOop_base + (methodIndex * ptr_size)) - 1;
-- methodName = &@cast(methodOopDesc, "Symbol",
-- "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-- methodLength = @cast(methodOopDesc, "Symbol",
-- "@ABS_SERVER_LIBJVM_SO@")->_length;
--
-- if (log_sig)
-- {
-- sigIndex = @cast(methodOopPtr, "methodOopDesc",
-- "@ABS_SERVER_LIBJVM_SO@")->_constMethod->_signature_index;
-- sigOopDesc = user_long(constantPoolOop_base
-- + (sigIndex * ptr_size)) - 1;
-- sigName = &@cast(sigOopDesc, "Symbol",
-- "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-- sigLength = @cast(sigOopDesc, "Symbol",
-- "@ABS_SERVER_LIBJVM_SO@")->_length;
-- sig = user_string_n(sigName, sigLength);
-- }
-- else
-- sig = "";
--
-- code_name = (log_native
-- ? sprintf("<%s@0x%x>",
-- str_replace(blob_name, " ", "_"), pc)
-- : "");
--
-- frame = sprintf("%s.%s%s%s",
-- user_string_n(klassName, klassLength),
-- user_string_n(methodName, methodLength),
-- sig, code_name);
-+ sigIndex = @cast(constMethod, "ConstMethod",
-+ "@ABS_SERVER_LIBJVM_SO@")->_signature_index;
-+ sigSymbol = user_long(constantPool_base
-+ + (sigIndex * ptr_size));
-+ sigName = &@cast(sigSymbol, "Symbol",
-+ "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-+ sigLength = @cast(sigSymbol, "Symbol",
-+ "@ABS_SERVER_LIBJVM_SO@")->_length;
-+ sig = user_string_n(sigName, sigLength);
- }
- else
-- {
-- // This is probably just an internal function, not a java
-- // method, just print the blob_name and continue.
-- // fp is probably still trusted.
-- if (log_native)
-- frame = sprintf("<%s@0x%x>",
-- str_replace(blob_name, " ", "_"), pc);
-- }
-+ sig = "";
-+
-+ code_name = (log_native
-+ ? sprintf("<%s@0x%x>",
-+ str_replace(blob_name, " ", "_"), pc)
-+ : "");
-+
-+ frame = sprintf("%s.%s%s%s",
-+ user_string_n(klassName, klassLength),
-+ user_string_n(methodName, methodLength),
-+ sig, code_name);
-
- // We cannot trust the frame pointer of compiled methods.
- // The server (c2) jit compiler uses the fp register.
diff --git a/multiple-pkcs11-library-init.patch b/multiple-pkcs11-library-init.patch
deleted file mode 100644
index f1e8bc2..0000000
--- a/multiple-pkcs11-library-init.patch
+++ /dev/null
@@ -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 {
diff --git a/no_strict_overflow.patch b/no_strict_overflow.patch
deleted file mode 100644
index 53fa41c..0000000
--- a/no_strict_overflow.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -r 1fe56343ecc8 make/lib/Awt2dLibraries.gmk
---- openjdk/jdk/make/lib/Awt2dLibraries.gmk Tue Jan 12 21:01:12 2016 +0000
-+++ openjdk/jdk/make/lib/Awt2dLibraries.gmk Thu Jan 14 00:47:01 2016 +0000
-@@ -904,6 +904,12 @@
- BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
- endif
-
-+# Turn off strict overflow with GCC for IndicRearrangementProcessor.cpp
-+ifeq ($(OPENJDK_TARGET_OS), linux)
-+ BUILD_LIBFONTMANAGER_IndicRearrangementProcessor.cpp_CXXFLAGS := -fno-strict-overflow
-+ BUILD_LIBFONTMANAGER_IndicRearrangementProcessor2.cpp_CXXFLAGS := -fno-strict-overflow
-+endif
-+
- $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \
- LIBRARY := fontmanager, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
diff --git a/policytool.desktop.in b/policytool.desktop.in
index e05969d..e38c0ec 100644
--- a/policytool.desktop.in
+++ b/policytool.desktop.in
@@ -1,6 +1,6 @@
[Desktop Entry]
-Name=OpenJDK @JAVA_MAJOR_VERSION@ Policy Tool #ARCH#
-Comment=Manage OpenJDK @JAVA_MAJOR_VERSION@ policy files #ARCH#
+Name=OpenJDK @JAVA_MAJOR_VERSION@ Policy Tool @ARCH@
+Comment=Manage OpenJDK @JAVA_MAJOR_VERSION@ policy files @ARCH@
Exec=@JRE_HOME@/policytool
Icon=java-@JAVA_MAJOR_VERSION@-@JAVA_VENDOR@
Terminal=false
diff --git a/pr1834-rh1022017-reduce_ellipticcurvesextension_to_provide_only_three_nss_supported_nist_curves_23_24_25.patch b/pr1834-rh1022017-reduce_ellipticcurvesextension_to_provide_only_three_nss_supported_nist_curves_23_24_25.patch
new file mode 100644
index 0000000..8165340
--- /dev/null
+++ b/pr1834-rh1022017-reduce_ellipticcurvesextension_to_provide_only_three_nss_supported_nist_curves_23_24_25.patch
@@ -0,0 +1,28 @@
+diff --git a/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java b/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
+--- openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
++++ openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
+@@ -168,20 +168,10 @@
+ "contains no supported elliptic curves");
+ }
+ } else { // default curves
+- int[] ids;
+- if (requireFips) {
+- ids = new int[] {
+- // only NIST curves in FIPS mode
+- 23, 24, 25, 9, 10, 11, 12, 13, 14,
+- };
+- } else {
+- ids = new int[] {
+- // NIST curves first
+- 23, 24, 25, 9, 10, 11, 12, 13, 14,
+- // non-NIST curves
+- 22,
+- };
+- }
++ int[] ids = new int[] {
++ // NSS currently only supports these three NIST curves
++ 23, 24, 25
++ };
+
+ idList = new ArrayList<>(ids.length);
+ for (int curveId : ids) {
diff --git a/pr1834-rh1022017.patch b/pr1834-rh1022017.patch
deleted file mode 100644
index 8165340..0000000
--- a/pr1834-rh1022017.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java b/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
---- openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
-+++ openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
-@@ -168,20 +168,10 @@
- "contains no supported elliptic curves");
- }
- } else { // default curves
-- int[] ids;
-- if (requireFips) {
-- ids = new int[] {
-- // only NIST curves in FIPS mode
-- 23, 24, 25, 9, 10, 11, 12, 13, 14,
-- };
-- } else {
-- ids = new int[] {
-- // NIST curves first
-- 23, 24, 25, 9, 10, 11, 12, 13, 14,
-- // non-NIST curves
-- 22,
-- };
-- }
-+ int[] ids = new int[] {
-+ // NSS currently only supports these three NIST curves
-+ 23, 24, 25
-+ };
-
- idList = new ArrayList<>(ids.length);
- for (int curveId : ids) {
diff --git a/pr1983-jdk.patch b/pr1983-jdk.patch
deleted file mode 100644
index 673b8a9..0000000
--- a/pr1983-jdk.patch
+++ /dev/null
@@ -1,694 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1453863246 0
-# Wed Jan 27 02:54:06 2016 +0000
-# Node ID 48c15869ecd568263249af4b9a4e98d4e57f9a8f
-# Parent afd392dfaed501ac674a7cc3e37353ce300969c7
-PR1983: Support using the system installation of NSS with the SunEC provider
-Summary: Apply code changes from PR1699 & PR1742 & forward-port Makefile changes to the new build.
-Updated 2017/07/04 to accomodate 8175110
-
-diff -r 984a4af2ed4e make/lib/SecurityLibraries.gmk
---- openjdk/jdk/make/lib/SecurityLibraries.gmk
-+++ openjdk/jdk/make/lib/SecurityLibraries.gmk
-@@ -218,8 +218,17 @@
-
- ifeq ($(ENABLE_INTREE_EC), yes)
-
-- BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec \
-+ BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec
-+
-+ ifeq ($(USE_EXTERNAL_NSS), true)
-+ BUILD_LIBSUNEC_IMPL_DIR :=
-+ BUILD_LIBSUNEC_FLAGS += $(NSS_CFLAGS) -DSYSTEM_NSS -DNSS_ENABLE_ECC
-+ else
-+ BUILD_LIBSUNEC_IMPL_DIR := \
-+ $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
-+ BUILD_LIBSUNEC_FLAGS += \
- -I$(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
-+ endif
-
- #
- # On sol-sparc...all libraries are compiled with -xregs=no%appl
-@@ -235,8 +244,8 @@
- $(eval $(call SetupNativeCompilation,BUILD_LIBSUNEC, \
- LIBRARY := sunec, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-- SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec \
-- $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl, \
-+ SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec/ECC_JNI.cpp \
-+ $(BUILD_LIBSUNEC_IMPL_DIR), \
- LANG := C++, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \
-@@ -248,8 +257,8 @@
- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
- LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(LIBCXX), \
-- LDFLAGS_SUFFIX_linux := -lc, \
-- LDFLAGS_SUFFIX_solaris := -lc, \
-+ LDFLAGS_SUFFIX_linux := -lc $(NSS_LIBS), \
-+ LDFLAGS_SUFFIX_solaris := -lc $(NSS_LIBS), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=sunec.dll" \
-diff -r 984a4af2ed4e src/share/native/sun/security/ec/ECC_JNI.cpp
---- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
-+++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
-@@ -24,7 +24,7 @@
- */
-
- #include <jni.h>
--#include "impl/ecc_impl.h"
-+#include "ecc_impl.h"
-
- #define ILLEGAL_STATE_EXCEPTION "java/lang/IllegalStateException"
- #define INVALID_ALGORITHM_PARAMETER_EXCEPTION \
-@@ -89,7 +89,7 @@
- */
- JNIEXPORT jobjectArray
- JNICALL Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair
-- (JNIEnv *env, jclass clazz, jint keySize, jbyteArray encodedParams, jbyteArray seed)
-+ (JNIEnv *env, jclass UNUSED(clazz), jint UNUSED(keySize), jbyteArray encodedParams, jbyteArray seed)
- {
- ECPrivateKey *privKey = NULL; // contains both public and private values
- ECParams *ecparams = NULL;
-@@ -190,7 +190,7 @@
- */
- JNIEXPORT jbyteArray
- JNICALL Java_sun_security_ec_ECDSASignature_signDigest
-- (JNIEnv *env, jclass clazz, jbyteArray digest, jbyteArray privateKey, jbyteArray encodedParams, jbyteArray seed, jint timing)
-+ (JNIEnv *env, jclass UNUSED(clazz), jbyteArray digest, jbyteArray privateKey, jbyteArray encodedParams, jbyteArray seed, jint timing)
- {
- jbyte* pDigestBuffer = NULL;
- jint jDigestLength = env->GetArrayLength(digest);
-@@ -299,7 +299,7 @@
- */
- JNIEXPORT jboolean
- JNICALL Java_sun_security_ec_ECDSASignature_verifySignedDigest
-- (JNIEnv *env, jclass clazz, jbyteArray signedDigest, jbyteArray digest, jbyteArray publicKey, jbyteArray encodedParams)
-+ (JNIEnv *env, jclass UNUSED(clazz), jbyteArray signedDigest, jbyteArray digest, jbyteArray publicKey, jbyteArray encodedParams)
- {
- jboolean isValid = false;
-
-@@ -384,7 +384,7 @@
- */
- JNIEXPORT jbyteArray
- JNICALL Java_sun_security_ec_ECDHKeyAgreement_deriveKey
-- (JNIEnv *env, jclass clazz, jbyteArray privateKey, jbyteArray publicKey, jbyteArray encodedParams)
-+ (JNIEnv *env, jclass UNUSED(clazz), jbyteArray privateKey, jbyteArray publicKey, jbyteArray encodedParams)
- {
- jbyteArray jSecret = NULL;
- ECParams *ecparams = NULL;
-diff -r 984a4af2ed4e src/share/native/sun/security/ec/ecc_impl.h
---- /dev/null
-+++ openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
-@@ -0,0 +1,298 @@
-+/*
-+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library 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
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * along with this library; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin Street, 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.
-+ */
-+
-+/* *********************************************************************
-+ *
-+ * The Original Code is the Netscape security libraries.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1994-2000
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Dr Vipul Gupta <vipul.gupta(a)sun.com> and
-+ * Douglas Stebila <douglas(a)stebila.ca>, Sun Microsystems Laboratories
-+ *
-+ * Last Modified Date from the Original Code: May 2017
-+ *********************************************************************** */
-+
-+#ifndef _ECC_IMPL_H
-+#define _ECC_IMPL_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include <sys/types.h>
-+
-+#ifdef SYSTEM_NSS
-+#include <secitem.h>
-+#include <secerr.h>
-+#include <keythi.h>
-+#ifdef LEGACY_NSS
-+#include <softoken.h>
-+#else
-+#include <blapi.h>
-+#endif
-+#else
-+#include "ecl-exp.h"
-+#endif
-+
-+/*
-+ * Multi-platform definitions
-+ */
-+#ifdef __linux__
-+#define B_FALSE FALSE
-+#define B_TRUE TRUE
-+typedef unsigned char uint8_t;
-+typedef unsigned long ulong_t;
-+typedef enum { B_FALSE, B_TRUE } boolean_t;
-+#endif /* __linux__ */
-+
-+#ifdef _ALLBSD_SOURCE
-+#include <stdint.h>
-+#define B_FALSE FALSE
-+#define B_TRUE TRUE
-+typedef unsigned long ulong_t;
-+typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
-+#endif /* _ALLBSD_SOURCE */
-+
-+#ifdef AIX
-+#define B_FALSE FALSE
-+#define B_TRUE TRUE
-+typedef unsigned char uint8_t;
-+typedef unsigned long ulong_t;
-+#endif /* AIX */
-+
-+#ifdef _WIN32
-+typedef unsigned char uint8_t;
-+typedef unsigned long ulong_t;
-+typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
-+#define strdup _strdup /* Replace POSIX name with ISO C++ name */
-+#endif /* _WIN32 */
-+
-+#ifndef _KERNEL
-+#include <stdlib.h>
-+#endif /* _KERNEL */
-+
-+#define EC_MAX_DIGEST_LEN 1024 /* max digest that can be signed */
-+#define EC_MAX_POINT_LEN 145 /* max len of DER encoded Q */
-+#define EC_MAX_VALUE_LEN 72 /* max len of ANSI X9.62 private value d */
-+#define EC_MAX_SIG_LEN 144 /* max signature len for supported curves */
-+#define EC_MIN_KEY_LEN 112 /* min key length in bits */
-+#define EC_MAX_KEY_LEN 571 /* max key length in bits */
-+#define EC_MAX_OID_LEN 10 /* max length of OID buffer */
-+
-+/*
-+ * Various structures and definitions from NSS are here.
-+ */
-+
-+#ifndef SYSTEM_NSS
-+#ifdef _KERNEL
-+#define PORT_ArenaAlloc(a, n, f) kmem_alloc((n), (f))
-+#define PORT_ArenaZAlloc(a, n, f) kmem_zalloc((n), (f))
-+#define PORT_ArenaGrow(a, b, c, d) NULL
-+#define PORT_ZAlloc(n, f) kmem_zalloc((n), (f))
-+#define PORT_Alloc(n, f) kmem_alloc((n), (f))
-+#else
-+#define PORT_ArenaAlloc(a, n, f) malloc((n))
-+#define PORT_ArenaZAlloc(a, n, f) calloc(1, (n))
-+#define PORT_ArenaGrow(a, b, c, d) NULL
-+#define PORT_ZAlloc(n, f) calloc(1, (n))
-+#define PORT_Alloc(n, f) malloc((n))
-+#endif
-+
-+#define PORT_NewArena(b) (char *)12345
-+#define PORT_ArenaMark(a) NULL
-+#define PORT_ArenaUnmark(a, b)
-+#define PORT_ArenaRelease(a, m)
-+#define PORT_FreeArena(a, b)
-+#define PORT_Strlen(s) strlen((s))
-+#define PORT_SetError(e)
-+
-+#define PRBool boolean_t
-+#define PR_TRUE B_TRUE
-+#define PR_FALSE B_FALSE
-+
-+#ifdef _KERNEL
-+#define PORT_Assert ASSERT
-+#define PORT_Memcpy(t, f, l) bcopy((f), (t), (l))
-+#else
-+#define PORT_Assert assert
-+#define PORT_Memcpy(t, f, l) memcpy((t), (f), (l))
-+#endif
-+
-+#endif
-+
-+#define CHECK_OK(func) if (func == NULL) goto cleanup
-+#define CHECK_SEC_OK(func) if (SECSuccess != (rv = func)) goto cleanup
-+
-+#ifndef SYSTEM_NSS
-+typedef enum {
-+ siBuffer = 0,
-+ siClearDataBuffer = 1,
-+ siCipherDataBuffer = 2,
-+ siDERCertBuffer = 3,
-+ siEncodedCertBuffer = 4,
-+ siDERNameBuffer = 5,
-+ siEncodedNameBuffer = 6,
-+ siAsciiNameString = 7,
-+ siAsciiString = 8,
-+ siDEROID = 9,
-+ siUnsignedInteger = 10,
-+ siUTCTime = 11,
-+ siGeneralizedTime = 12
-+} SECItemType;
-+
-+typedef struct SECItemStr SECItem;
-+
-+struct SECItemStr {
-+ SECItemType type;
-+ unsigned char *data;
-+ unsigned int len;
-+};
-+
-+typedef SECItem SECKEYECParams;
-+
-+typedef enum { ec_params_explicit,
-+ ec_params_named
-+} ECParamsType;
-+
-+typedef enum { ec_field_GFp = 1,
-+ ec_field_GF2m
-+} ECFieldType;
-+
-+struct ECFieldIDStr {
-+ int size; /* field size in bits */
-+ ECFieldType type;
-+ union {
-+ SECItem prime; /* prime p for (GFp) */
-+ SECItem poly; /* irreducible binary polynomial for (GF2m) */
-+ } u;
-+ int k1; /* first coefficient of pentanomial or
-+ * the only coefficient of trinomial
-+ */
-+ int k2; /* two remaining coefficients of pentanomial */
-+ int k3;
-+};
-+typedef struct ECFieldIDStr ECFieldID;
-+
-+struct ECCurveStr {
-+ SECItem a; /* contains octet stream encoding of
-+ * field element (X9.62 section 4.3.3)
-+ */
-+ SECItem b;
-+ SECItem seed;
-+};
-+typedef struct ECCurveStr ECCurve;
-+
-+typedef void PRArenaPool;
-+
-+struct ECParamsStr {
-+ PRArenaPool * arena;
-+ ECParamsType type;
-+ ECFieldID fieldID;
-+ ECCurve curve;
-+ SECItem base;
-+ SECItem order;
-+ int cofactor;
-+ SECItem DEREncoding;
-+ ECCurveName name;
-+ SECItem curveOID;
-+};
-+typedef struct ECParamsStr ECParams;
-+
-+struct ECPublicKeyStr {
-+ ECParams ecParams;
-+ SECItem publicValue; /* elliptic curve point encoded as
-+ * octet stream.
-+ */
-+};
-+typedef struct ECPublicKeyStr ECPublicKey;
-+
-+struct ECPrivateKeyStr {
-+ ECParams ecParams;
-+ SECItem publicValue; /* encoded ec point */
-+ SECItem privateValue; /* private big integer */
-+ SECItem version; /* As per SEC 1, Appendix C, Section C.4 */
-+};
-+typedef struct ECPrivateKeyStr ECPrivateKey;
-+
-+typedef enum _SECStatus {
-+ SECBufferTooSmall = -3,
-+ SECWouldBlock = -2,
-+ SECFailure = -1,
-+ SECSuccess = 0
-+} SECStatus;
-+#endif
-+
-+#ifdef _KERNEL
-+#define RNG_GenerateGlobalRandomBytes(p,l) ecc_knzero_random_generator((p), (l))
-+#else
-+/*
-+ This function is no longer required because the random bytes are now
-+ supplied by the caller. Force a failure.
-+*/
-+#define RNG_GenerateGlobalRandomBytes(p,l) SECFailure
-+#endif
-+#define CHECK_MPI_OK(func) if (MP_OKAY > (err = func)) goto cleanup
-+#define MP_TO_SEC_ERROR(err)
-+
-+#define SECITEM_TO_MPINT(it, mp) \
-+ CHECK_MPI_OK(mp_read_unsigned_octets((mp), (it).data, (it).len))
-+
-+extern int ecc_knzero_random_generator(uint8_t *, size_t);
-+extern ulong_t soft_nzero_random_generator(uint8_t *, ulong_t);
-+
-+#ifdef SYSTEM_NSS
-+#define EC_DecodeParams(a,b,c) EC_DecodeParams(a,b)
-+#define EC_NewKey(a,b,c,d,e) EC_NewKeyFromSeed(a,b,c,d)
-+#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigestWithSeed(a,b,c,d,e)
-+#define ECDSA_VerifyDigest(a,b,c,d) ECDSA_VerifyDigest(a,b,c)
-+#define ECDH_Derive(a,b,c,d,e,f) ECDH_Derive(a,b,c,d,e)
-+#else
-+extern SECStatus EC_DecodeParams(const SECItem *, ECParams **, int);
-+
-+extern SECItem * SECITEM_AllocItem(PRArenaPool *, SECItem *, unsigned int, int);
-+extern SECStatus SECITEM_CopyItem(PRArenaPool *, SECItem *, const SECItem *,
-+ int);
-+extern void SECITEM_FreeItem(SECItem *, boolean_t);
-+
-+/* This function has been modified to accept an array of random bytes */
-+extern SECStatus EC_NewKey(ECParams *ecParams, ECPrivateKey **privKey,
-+ const unsigned char* random, int randomlen, int);
-+/* This function has been modified to accept an array of random bytes */
-+extern SECStatus ECDSA_SignDigest(ECPrivateKey *, SECItem *, const SECItem *,
-+ const unsigned char* random, int randomlen, int, int timing);
-+extern SECStatus ECDSA_VerifyDigest(ECPublicKey *, const SECItem *,
-+ const SECItem *, int);
-+extern SECStatus ECDH_Derive(SECItem *, ECParams *, SECItem *, boolean_t,
-+ SECItem *, int);
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _ECC_IMPL_H */
-diff -r 984a4af2ed4e src/share/native/sun/security/ec/impl/ecc_impl.h
---- openjdk/jdk/src/share/native/sun/security/ec/impl/ecc_impl.h
-+++ /dev/null
-@@ -1,271 +0,0 @@
--/*
-- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
-- * Use is subject to license terms.
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2.1 of the License, or (at your option) any later version.
-- *
-- * This library 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
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this library; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin Street, 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.
-- */
--
--/* *********************************************************************
-- *
-- * The Original Code is the Netscape security libraries.
-- *
-- * The Initial Developer of the Original Code is
-- * Netscape Communications Corporation.
-- * Portions created by the Initial Developer are Copyright (C) 1994-2000
-- * the Initial Developer. All Rights Reserved.
-- *
-- * Contributor(s):
-- * Dr Vipul Gupta <vipul.gupta(a)sun.com> and
-- * Douglas Stebila <douglas(a)stebila.ca>, Sun Microsystems Laboratories
-- *
-- * Last Modified Date from the Original Code: May 2017
-- *********************************************************************** */
--
--#ifndef _ECC_IMPL_H
--#define _ECC_IMPL_H
--
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--#include <sys/types.h>
--#include "ecl-exp.h"
--
--/*
-- * Multi-platform definitions
-- */
--#ifdef __linux__
--#define B_FALSE FALSE
--#define B_TRUE TRUE
--typedef unsigned char uint8_t;
--typedef unsigned long ulong_t;
--typedef enum { B_FALSE, B_TRUE } boolean_t;
--#endif /* __linux__ */
--
--#ifdef _ALLBSD_SOURCE
--#include <stdint.h>
--#define B_FALSE FALSE
--#define B_TRUE TRUE
--typedef unsigned long ulong_t;
--typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
--#endif /* _ALLBSD_SOURCE */
--
--#ifdef AIX
--#define B_FALSE FALSE
--#define B_TRUE TRUE
--typedef unsigned char uint8_t;
--typedef unsigned long ulong_t;
--#endif /* AIX */
--
--#ifdef _WIN32
--typedef unsigned char uint8_t;
--typedef unsigned long ulong_t;
--typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
--#define strdup _strdup /* Replace POSIX name with ISO C++ name */
--#endif /* _WIN32 */
--
--#ifndef _KERNEL
--#include <stdlib.h>
--#endif /* _KERNEL */
--
--#define EC_MAX_DIGEST_LEN 1024 /* max digest that can be signed */
--#define EC_MAX_POINT_LEN 145 /* max len of DER encoded Q */
--#define EC_MAX_VALUE_LEN 72 /* max len of ANSI X9.62 private value d */
--#define EC_MAX_SIG_LEN 144 /* max signature len for supported curves */
--#define EC_MIN_KEY_LEN 112 /* min key length in bits */
--#define EC_MAX_KEY_LEN 571 /* max key length in bits */
--#define EC_MAX_OID_LEN 10 /* max length of OID buffer */
--
--/*
-- * Various structures and definitions from NSS are here.
-- */
--
--#ifdef _KERNEL
--#define PORT_ArenaAlloc(a, n, f) kmem_alloc((n), (f))
--#define PORT_ArenaZAlloc(a, n, f) kmem_zalloc((n), (f))
--#define PORT_ArenaGrow(a, b, c, d) NULL
--#define PORT_ZAlloc(n, f) kmem_zalloc((n), (f))
--#define PORT_Alloc(n, f) kmem_alloc((n), (f))
--#else
--#define PORT_ArenaAlloc(a, n, f) malloc((n))
--#define PORT_ArenaZAlloc(a, n, f) calloc(1, (n))
--#define PORT_ArenaGrow(a, b, c, d) NULL
--#define PORT_ZAlloc(n, f) calloc(1, (n))
--#define PORT_Alloc(n, f) malloc((n))
--#endif
--
--#define PORT_NewArena(b) (char *)12345
--#define PORT_ArenaMark(a) NULL
--#define PORT_ArenaUnmark(a, b)
--#define PORT_ArenaRelease(a, m)
--#define PORT_FreeArena(a, b)
--#define PORT_Strlen(s) strlen((s))
--#define PORT_SetError(e)
--
--#define PRBool boolean_t
--#define PR_TRUE B_TRUE
--#define PR_FALSE B_FALSE
--
--#ifdef _KERNEL
--#define PORT_Assert ASSERT
--#define PORT_Memcpy(t, f, l) bcopy((f), (t), (l))
--#else
--#define PORT_Assert assert
--#define PORT_Memcpy(t, f, l) memcpy((t), (f), (l))
--#endif
--
--#define CHECK_OK(func) if (func == NULL) goto cleanup
--#define CHECK_SEC_OK(func) if (SECSuccess != (rv = func)) goto cleanup
--
--typedef enum {
-- siBuffer = 0,
-- siClearDataBuffer = 1,
-- siCipherDataBuffer = 2,
-- siDERCertBuffer = 3,
-- siEncodedCertBuffer = 4,
-- siDERNameBuffer = 5,
-- siEncodedNameBuffer = 6,
-- siAsciiNameString = 7,
-- siAsciiString = 8,
-- siDEROID = 9,
-- siUnsignedInteger = 10,
-- siUTCTime = 11,
-- siGeneralizedTime = 12
--} SECItemType;
--
--typedef struct SECItemStr SECItem;
--
--struct SECItemStr {
-- SECItemType type;
-- unsigned char *data;
-- unsigned int len;
--};
--
--typedef SECItem SECKEYECParams;
--
--typedef enum { ec_params_explicit,
-- ec_params_named
--} ECParamsType;
--
--typedef enum { ec_field_GFp = 1,
-- ec_field_GF2m
--} ECFieldType;
--
--struct ECFieldIDStr {
-- int size; /* field size in bits */
-- ECFieldType type;
-- union {
-- SECItem prime; /* prime p for (GFp) */
-- SECItem poly; /* irreducible binary polynomial for (GF2m) */
-- } u;
-- int k1; /* first coefficient of pentanomial or
-- * the only coefficient of trinomial
-- */
-- int k2; /* two remaining coefficients of pentanomial */
-- int k3;
--};
--typedef struct ECFieldIDStr ECFieldID;
--
--struct ECCurveStr {
-- SECItem a; /* contains octet stream encoding of
-- * field element (X9.62 section 4.3.3)
-- */
-- SECItem b;
-- SECItem seed;
--};
--typedef struct ECCurveStr ECCurve;
--
--typedef void PRArenaPool;
--
--struct ECParamsStr {
-- PRArenaPool * arena;
-- ECParamsType type;
-- ECFieldID fieldID;
-- ECCurve curve;
-- SECItem base;
-- SECItem order;
-- int cofactor;
-- SECItem DEREncoding;
-- ECCurveName name;
-- SECItem curveOID;
--};
--typedef struct ECParamsStr ECParams;
--
--struct ECPublicKeyStr {
-- ECParams ecParams;
-- SECItem publicValue; /* elliptic curve point encoded as
-- * octet stream.
-- */
--};
--typedef struct ECPublicKeyStr ECPublicKey;
--
--struct ECPrivateKeyStr {
-- ECParams ecParams;
-- SECItem publicValue; /* encoded ec point */
-- SECItem privateValue; /* private big integer */
-- SECItem version; /* As per SEC 1, Appendix C, Section C.4 */
--};
--typedef struct ECPrivateKeyStr ECPrivateKey;
--
--typedef enum _SECStatus {
-- SECBufferTooSmall = -3,
-- SECWouldBlock = -2,
-- SECFailure = -1,
-- SECSuccess = 0
--} SECStatus;
--
--#ifdef _KERNEL
--#define RNG_GenerateGlobalRandomBytes(p,l) ecc_knzero_random_generator((p), (l))
--#else
--/*
-- This function is no longer required because the random bytes are now
-- supplied by the caller. Force a failure.
--*/
--#define RNG_GenerateGlobalRandomBytes(p,l) SECFailure
--#endif
--#define CHECK_MPI_OK(func) if (MP_OKAY > (err = func)) goto cleanup
--#define MP_TO_SEC_ERROR(err)
--
--#define SECITEM_TO_MPINT(it, mp) \
-- CHECK_MPI_OK(mp_read_unsigned_octets((mp), (it).data, (it).len))
--
--extern int ecc_knzero_random_generator(uint8_t *, size_t);
--extern ulong_t soft_nzero_random_generator(uint8_t *, ulong_t);
--
--extern SECStatus EC_DecodeParams(const SECItem *, ECParams **, int);
--extern SECItem * SECITEM_AllocItem(PRArenaPool *, SECItem *, unsigned int, int);
--extern SECStatus SECITEM_CopyItem(PRArenaPool *, SECItem *, const SECItem *,
-- int);
--extern void SECITEM_FreeItem(SECItem *, boolean_t);
--/* This function has been modified to accept an array of random bytes */
--extern SECStatus EC_NewKey(ECParams *ecParams, ECPrivateKey **privKey,
-- const unsigned char* random, int randomlen, int);
--/* This function has been modified to accept an array of random bytes */
--extern SECStatus ECDSA_SignDigest(ECPrivateKey *, SECItem *, const SECItem *,
-- const unsigned char* random, int randomlen, int, int timing);
--extern SECStatus ECDSA_VerifyDigest(ECPublicKey *, const SECItem *,
-- const SECItem *, int);
--extern SECStatus ECDH_Derive(SECItem *, ECParams *, SECItem *, boolean_t,
-- SECItem *, int);
--
--#ifdef __cplusplus
--}
--#endif
--
--#endif /* _ECC_IMPL_H */
-diff -r 984a4af2ed4e src/solaris/javavm/export/jni_md.h
---- openjdk/jdk/src/solaris/javavm/export/jni_md.h
-+++ openjdk/jdk/src/solaris/javavm/export/jni_md.h
-@@ -36,6 +36,11 @@
- #define JNIEXPORT
- #define JNIIMPORT
- #endif
-+#if (defined(__GNUC__)) || __has_attribute(unused)
-+ #define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
-+#else
-+ #define UNUSED(x) UNUSED_ ## x
-+#endif
-
- #define JNICALL
-
diff --git a/pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_jdk8.patch b/pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_jdk8.patch
new file mode 100644
index 0000000..31c285b
--- /dev/null
+++ b/pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_jdk8.patch
@@ -0,0 +1,699 @@
+# HG changeset patch
+# User andrew
+# Date 1453863246 0
+# Wed Jan 27 02:54:06 2016 +0000
+# Node ID 48c15869ecd568263249af4b9a4e98d4e57f9a8f
+# Parent afd392dfaed501ac674a7cc3e37353ce300969c7
+PR1983: Support using the system installation of NSS with the SunEC provider
+Summary: Apply code changes from PR1699 & PR1742 & forward-port Makefile changes to the new build.
+Updated 2017/07/04 to accomodate 8175110
+
+diff -r 984a4af2ed4e make/lib/SecurityLibraries.gmk
+--- openjdk/jdk/make/lib/SecurityLibraries.gmk
++++ openjdk/jdk/make/lib/SecurityLibraries.gmk
+@@ -218,8 +218,17 @@
+
+ ifeq ($(ENABLE_INTREE_EC), yes)
+
+- BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec \
++ BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec
++
++ ifeq ($(USE_EXTERNAL_NSS), true)
++ BUILD_LIBSUNEC_IMPL_DIR :=
++ BUILD_LIBSUNEC_FLAGS += $(NSS_CFLAGS) -DSYSTEM_NSS -DNSS_ENABLE_ECC
++ else
++ BUILD_LIBSUNEC_IMPL_DIR := \
++ $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
++ BUILD_LIBSUNEC_FLAGS += \
+ -I$(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
++ endif
+
+ #
+ # On sol-sparc...all libraries are compiled with -xregs=no%appl
+@@ -235,8 +244,8 @@
+ $(eval $(call SetupNativeCompilation,BUILD_LIBSUNEC, \
+ LIBRARY := sunec, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+- SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec \
+- $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl, \
++ SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec/ECC_JNI.cpp \
++ $(BUILD_LIBSUNEC_IMPL_DIR), \
+ LANG := C++, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \
+@@ -245,11 +254,12 @@
+ CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \
+ $(BUILD_LIBSUNEC_FLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsunec/mapfile-vers, \
+- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
++ LDFLAGS := $(subst -Xlinker --as-needed,, \
++ $(subst -Wl$(COMMA)--as-needed,, $(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK), \
+ LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(LIBCXX), \
+- LDFLAGS_SUFFIX_linux := -lc, \
+- LDFLAGS_SUFFIX_solaris := -lc, \
++ LDFLAGS_SUFFIX_linux := -lc $(NSS_LIBS), \
++ LDFLAGS_SUFFIX_solaris := -lc $(NSS_LIBS), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=sunec.dll" \
+diff -r 984a4af2ed4e src/share/native/sun/security/ec/ECC_JNI.cpp
+--- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
++++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
+@@ -24,7 +24,7 @@
+ */
+
+ #include <jni.h>
+-#include "impl/ecc_impl.h"
++#include "ecc_impl.h"
+
+ #define ILLEGAL_STATE_EXCEPTION "java/lang/IllegalStateException"
+ #define INVALID_ALGORITHM_PARAMETER_EXCEPTION \
+@@ -89,7 +89,7 @@
+ */
+ JNIEXPORT jobjectArray
+ JNICALL Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair
+- (JNIEnv *env, jclass clazz, jint keySize, jbyteArray encodedParams, jbyteArray seed)
++ (JNIEnv *env, jclass UNUSED(clazz), jint UNUSED(keySize), jbyteArray encodedParams, jbyteArray seed)
+ {
+ ECPrivateKey *privKey = NULL; // contains both public and private values
+ ECParams *ecparams = NULL;
+@@ -190,7 +190,7 @@
+ */
+ JNIEXPORT jbyteArray
+ JNICALL Java_sun_security_ec_ECDSASignature_signDigest
+- (JNIEnv *env, jclass clazz, jbyteArray digest, jbyteArray privateKey, jbyteArray encodedParams, jbyteArray seed, jint timing)
++ (JNIEnv *env, jclass UNUSED(clazz), jbyteArray digest, jbyteArray privateKey, jbyteArray encodedParams, jbyteArray seed, jint timing)
+ {
+ jbyte* pDigestBuffer = NULL;
+ jint jDigestLength = env->GetArrayLength(digest);
+@@ -299,7 +299,7 @@
+ */
+ JNIEXPORT jboolean
+ JNICALL Java_sun_security_ec_ECDSASignature_verifySignedDigest
+- (JNIEnv *env, jclass clazz, jbyteArray signedDigest, jbyteArray digest, jbyteArray publicKey, jbyteArray encodedParams)
++ (JNIEnv *env, jclass UNUSED(clazz), jbyteArray signedDigest, jbyteArray digest, jbyteArray publicKey, jbyteArray encodedParams)
+ {
+ jboolean isValid = false;
+
+@@ -384,7 +384,7 @@
+ */
+ JNIEXPORT jbyteArray
+ JNICALL Java_sun_security_ec_ECDHKeyAgreement_deriveKey
+- (JNIEnv *env, jclass clazz, jbyteArray privateKey, jbyteArray publicKey, jbyteArray encodedParams)
++ (JNIEnv *env, jclass UNUSED(clazz), jbyteArray privateKey, jbyteArray publicKey, jbyteArray encodedParams)
+ {
+ jbyteArray jSecret = NULL;
+ ECParams *ecparams = NULL;
+diff -r 984a4af2ed4e src/share/native/sun/security/ec/ecc_impl.h
+--- /dev/null
++++ openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
+@@ -0,0 +1,298 @@
++/*
++ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
++ * Use is subject to license terms.
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library 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
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this library; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin Street, 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.
++ */
++
++/* *********************************************************************
++ *
++ * The Original Code is the Netscape security libraries.
++ *
++ * The Initial Developer of the Original Code is
++ * Netscape Communications Corporation.
++ * Portions created by the Initial Developer are Copyright (C) 1994-2000
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ * Dr Vipul Gupta <vipul.gupta(a)sun.com> and
++ * Douglas Stebila <douglas(a)stebila.ca>, Sun Microsystems Laboratories
++ *
++ * Last Modified Date from the Original Code: May 2017
++ *********************************************************************** */
++
++#ifndef _ECC_IMPL_H
++#define _ECC_IMPL_H
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#include <sys/types.h>
++
++#ifdef SYSTEM_NSS
++#include <secitem.h>
++#include <secerr.h>
++#include <keythi.h>
++#ifdef LEGACY_NSS
++#include <softoken.h>
++#else
++#include <blapi.h>
++#endif
++#else
++#include "ecl-exp.h"
++#endif
++
++/*
++ * Multi-platform definitions
++ */
++#ifdef __linux__
++#define B_FALSE FALSE
++#define B_TRUE TRUE
++typedef unsigned char uint8_t;
++typedef unsigned long ulong_t;
++typedef enum { B_FALSE, B_TRUE } boolean_t;
++#endif /* __linux__ */
++
++#ifdef _ALLBSD_SOURCE
++#include <stdint.h>
++#define B_FALSE FALSE
++#define B_TRUE TRUE
++typedef unsigned long ulong_t;
++typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
++#endif /* _ALLBSD_SOURCE */
++
++#ifdef AIX
++#define B_FALSE FALSE
++#define B_TRUE TRUE
++typedef unsigned char uint8_t;
++typedef unsigned long ulong_t;
++#endif /* AIX */
++
++#ifdef _WIN32
++typedef unsigned char uint8_t;
++typedef unsigned long ulong_t;
++typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
++#define strdup _strdup /* Replace POSIX name with ISO C++ name */
++#endif /* _WIN32 */
++
++#ifndef _KERNEL
++#include <stdlib.h>
++#endif /* _KERNEL */
++
++#define EC_MAX_DIGEST_LEN 1024 /* max digest that can be signed */
++#define EC_MAX_POINT_LEN 145 /* max len of DER encoded Q */
++#define EC_MAX_VALUE_LEN 72 /* max len of ANSI X9.62 private value d */
++#define EC_MAX_SIG_LEN 144 /* max signature len for supported curves */
++#define EC_MIN_KEY_LEN 112 /* min key length in bits */
++#define EC_MAX_KEY_LEN 571 /* max key length in bits */
++#define EC_MAX_OID_LEN 10 /* max length of OID buffer */
++
++/*
++ * Various structures and definitions from NSS are here.
++ */
++
++#ifndef SYSTEM_NSS
++#ifdef _KERNEL
++#define PORT_ArenaAlloc(a, n, f) kmem_alloc((n), (f))
++#define PORT_ArenaZAlloc(a, n, f) kmem_zalloc((n), (f))
++#define PORT_ArenaGrow(a, b, c, d) NULL
++#define PORT_ZAlloc(n, f) kmem_zalloc((n), (f))
++#define PORT_Alloc(n, f) kmem_alloc((n), (f))
++#else
++#define PORT_ArenaAlloc(a, n, f) malloc((n))
++#define PORT_ArenaZAlloc(a, n, f) calloc(1, (n))
++#define PORT_ArenaGrow(a, b, c, d) NULL
++#define PORT_ZAlloc(n, f) calloc(1, (n))
++#define PORT_Alloc(n, f) malloc((n))
++#endif
++
++#define PORT_NewArena(b) (char *)12345
++#define PORT_ArenaMark(a) NULL
++#define PORT_ArenaUnmark(a, b)
++#define PORT_ArenaRelease(a, m)
++#define PORT_FreeArena(a, b)
++#define PORT_Strlen(s) strlen((s))
++#define PORT_SetError(e)
++
++#define PRBool boolean_t
++#define PR_TRUE B_TRUE
++#define PR_FALSE B_FALSE
++
++#ifdef _KERNEL
++#define PORT_Assert ASSERT
++#define PORT_Memcpy(t, f, l) bcopy((f), (t), (l))
++#else
++#define PORT_Assert assert
++#define PORT_Memcpy(t, f, l) memcpy((t), (f), (l))
++#endif
++
++#endif
++
++#define CHECK_OK(func) if (func == NULL) goto cleanup
++#define CHECK_SEC_OK(func) if (SECSuccess != (rv = func)) goto cleanup
++
++#ifndef SYSTEM_NSS
++typedef enum {
++ siBuffer = 0,
++ siClearDataBuffer = 1,
++ siCipherDataBuffer = 2,
++ siDERCertBuffer = 3,
++ siEncodedCertBuffer = 4,
++ siDERNameBuffer = 5,
++ siEncodedNameBuffer = 6,
++ siAsciiNameString = 7,
++ siAsciiString = 8,
++ siDEROID = 9,
++ siUnsignedInteger = 10,
++ siUTCTime = 11,
++ siGeneralizedTime = 12
++} SECItemType;
++
++typedef struct SECItemStr SECItem;
++
++struct SECItemStr {
++ SECItemType type;
++ unsigned char *data;
++ unsigned int len;
++};
++
++typedef SECItem SECKEYECParams;
++
++typedef enum { ec_params_explicit,
++ ec_params_named
++} ECParamsType;
++
++typedef enum { ec_field_GFp = 1,
++ ec_field_GF2m
++} ECFieldType;
++
++struct ECFieldIDStr {
++ int size; /* field size in bits */
++ ECFieldType type;
++ union {
++ SECItem prime; /* prime p for (GFp) */
++ SECItem poly; /* irreducible binary polynomial for (GF2m) */
++ } u;
++ int k1; /* first coefficient of pentanomial or
++ * the only coefficient of trinomial
++ */
++ int k2; /* two remaining coefficients of pentanomial */
++ int k3;
++};
++typedef struct ECFieldIDStr ECFieldID;
++
++struct ECCurveStr {
++ SECItem a; /* contains octet stream encoding of
++ * field element (X9.62 section 4.3.3)
++ */
++ SECItem b;
++ SECItem seed;
++};
++typedef struct ECCurveStr ECCurve;
++
++typedef void PRArenaPool;
++
++struct ECParamsStr {
++ PRArenaPool * arena;
++ ECParamsType type;
++ ECFieldID fieldID;
++ ECCurve curve;
++ SECItem base;
++ SECItem order;
++ int cofactor;
++ SECItem DEREncoding;
++ ECCurveName name;
++ SECItem curveOID;
++};
++typedef struct ECParamsStr ECParams;
++
++struct ECPublicKeyStr {
++ ECParams ecParams;
++ SECItem publicValue; /* elliptic curve point encoded as
++ * octet stream.
++ */
++};
++typedef struct ECPublicKeyStr ECPublicKey;
++
++struct ECPrivateKeyStr {
++ ECParams ecParams;
++ SECItem publicValue; /* encoded ec point */
++ SECItem privateValue; /* private big integer */
++ SECItem version; /* As per SEC 1, Appendix C, Section C.4 */
++};
++typedef struct ECPrivateKeyStr ECPrivateKey;
++
++typedef enum _SECStatus {
++ SECBufferTooSmall = -3,
++ SECWouldBlock = -2,
++ SECFailure = -1,
++ SECSuccess = 0
++} SECStatus;
++#endif
++
++#ifdef _KERNEL
++#define RNG_GenerateGlobalRandomBytes(p,l) ecc_knzero_random_generator((p), (l))
++#else
++/*
++ This function is no longer required because the random bytes are now
++ supplied by the caller. Force a failure.
++*/
++#define RNG_GenerateGlobalRandomBytes(p,l) SECFailure
++#endif
++#define CHECK_MPI_OK(func) if (MP_OKAY > (err = func)) goto cleanup
++#define MP_TO_SEC_ERROR(err)
++
++#define SECITEM_TO_MPINT(it, mp) \
++ CHECK_MPI_OK(mp_read_unsigned_octets((mp), (it).data, (it).len))
++
++extern int ecc_knzero_random_generator(uint8_t *, size_t);
++extern ulong_t soft_nzero_random_generator(uint8_t *, ulong_t);
++
++#ifdef SYSTEM_NSS
++#define EC_DecodeParams(a,b,c) EC_DecodeParams(a,b)
++#define EC_NewKey(a,b,c,d,e) EC_NewKeyFromSeed(a,b,c,d)
++#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigestWithSeed(a,b,c,d,e)
++#define ECDSA_VerifyDigest(a,b,c,d) ECDSA_VerifyDigest(a,b,c)
++#define ECDH_Derive(a,b,c,d,e,f) ECDH_Derive(a,b,c,d,e)
++#else
++extern SECStatus EC_DecodeParams(const SECItem *, ECParams **, int);
++
++extern SECItem * SECITEM_AllocItem(PRArenaPool *, SECItem *, unsigned int, int);
++extern SECStatus SECITEM_CopyItem(PRArenaPool *, SECItem *, const SECItem *,
++ int);
++extern void SECITEM_FreeItem(SECItem *, boolean_t);
++
++/* This function has been modified to accept an array of random bytes */
++extern SECStatus EC_NewKey(ECParams *ecParams, ECPrivateKey **privKey,
++ const unsigned char* random, int randomlen, int);
++/* This function has been modified to accept an array of random bytes */
++extern SECStatus ECDSA_SignDigest(ECPrivateKey *, SECItem *, const SECItem *,
++ const unsigned char* random, int randomlen, int, int timing);
++extern SECStatus ECDSA_VerifyDigest(ECPublicKey *, const SECItem *,
++ const SECItem *, int);
++extern SECStatus ECDH_Derive(SECItem *, ECParams *, SECItem *, boolean_t,
++ SECItem *, int);
++#endif
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif /* _ECC_IMPL_H */
+diff -r 984a4af2ed4e src/share/native/sun/security/ec/impl/ecc_impl.h
+--- openjdk/jdk/src/share/native/sun/security/ec/impl/ecc_impl.h
++++ /dev/null
+@@ -1,271 +0,0 @@
+-/*
+- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+- * Use is subject to license terms.
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2.1 of the License, or (at your option) any later version.
+- *
+- * This library 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
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * along with this library; if not, write to the Free Software Foundation,
+- * Inc., 51 Franklin Street, 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.
+- */
+-
+-/* *********************************************************************
+- *
+- * The Original Code is the Netscape security libraries.
+- *
+- * The Initial Developer of the Original Code is
+- * Netscape Communications Corporation.
+- * Portions created by the Initial Developer are Copyright (C) 1994-2000
+- * the Initial Developer. All Rights Reserved.
+- *
+- * Contributor(s):
+- * Dr Vipul Gupta <vipul.gupta(a)sun.com> and
+- * Douglas Stebila <douglas(a)stebila.ca>, Sun Microsystems Laboratories
+- *
+- * Last Modified Date from the Original Code: May 2017
+- *********************************************************************** */
+-
+-#ifndef _ECC_IMPL_H
+-#define _ECC_IMPL_H
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-#include <sys/types.h>
+-#include "ecl-exp.h"
+-
+-/*
+- * Multi-platform definitions
+- */
+-#ifdef __linux__
+-#define B_FALSE FALSE
+-#define B_TRUE TRUE
+-typedef unsigned char uint8_t;
+-typedef unsigned long ulong_t;
+-typedef enum { B_FALSE, B_TRUE } boolean_t;
+-#endif /* __linux__ */
+-
+-#ifdef _ALLBSD_SOURCE
+-#include <stdint.h>
+-#define B_FALSE FALSE
+-#define B_TRUE TRUE
+-typedef unsigned long ulong_t;
+-typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
+-#endif /* _ALLBSD_SOURCE */
+-
+-#ifdef AIX
+-#define B_FALSE FALSE
+-#define B_TRUE TRUE
+-typedef unsigned char uint8_t;
+-typedef unsigned long ulong_t;
+-#endif /* AIX */
+-
+-#ifdef _WIN32
+-typedef unsigned char uint8_t;
+-typedef unsigned long ulong_t;
+-typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
+-#define strdup _strdup /* Replace POSIX name with ISO C++ name */
+-#endif /* _WIN32 */
+-
+-#ifndef _KERNEL
+-#include <stdlib.h>
+-#endif /* _KERNEL */
+-
+-#define EC_MAX_DIGEST_LEN 1024 /* max digest that can be signed */
+-#define EC_MAX_POINT_LEN 145 /* max len of DER encoded Q */
+-#define EC_MAX_VALUE_LEN 72 /* max len of ANSI X9.62 private value d */
+-#define EC_MAX_SIG_LEN 144 /* max signature len for supported curves */
+-#define EC_MIN_KEY_LEN 112 /* min key length in bits */
+-#define EC_MAX_KEY_LEN 571 /* max key length in bits */
+-#define EC_MAX_OID_LEN 10 /* max length of OID buffer */
+-
+-/*
+- * Various structures and definitions from NSS are here.
+- */
+-
+-#ifdef _KERNEL
+-#define PORT_ArenaAlloc(a, n, f) kmem_alloc((n), (f))
+-#define PORT_ArenaZAlloc(a, n, f) kmem_zalloc((n), (f))
+-#define PORT_ArenaGrow(a, b, c, d) NULL
+-#define PORT_ZAlloc(n, f) kmem_zalloc((n), (f))
+-#define PORT_Alloc(n, f) kmem_alloc((n), (f))
+-#else
+-#define PORT_ArenaAlloc(a, n, f) malloc((n))
+-#define PORT_ArenaZAlloc(a, n, f) calloc(1, (n))
+-#define PORT_ArenaGrow(a, b, c, d) NULL
+-#define PORT_ZAlloc(n, f) calloc(1, (n))
+-#define PORT_Alloc(n, f) malloc((n))
+-#endif
+-
+-#define PORT_NewArena(b) (char *)12345
+-#define PORT_ArenaMark(a) NULL
+-#define PORT_ArenaUnmark(a, b)
+-#define PORT_ArenaRelease(a, m)
+-#define PORT_FreeArena(a, b)
+-#define PORT_Strlen(s) strlen((s))
+-#define PORT_SetError(e)
+-
+-#define PRBool boolean_t
+-#define PR_TRUE B_TRUE
+-#define PR_FALSE B_FALSE
+-
+-#ifdef _KERNEL
+-#define PORT_Assert ASSERT
+-#define PORT_Memcpy(t, f, l) bcopy((f), (t), (l))
+-#else
+-#define PORT_Assert assert
+-#define PORT_Memcpy(t, f, l) memcpy((t), (f), (l))
+-#endif
+-
+-#define CHECK_OK(func) if (func == NULL) goto cleanup
+-#define CHECK_SEC_OK(func) if (SECSuccess != (rv = func)) goto cleanup
+-
+-typedef enum {
+- siBuffer = 0,
+- siClearDataBuffer = 1,
+- siCipherDataBuffer = 2,
+- siDERCertBuffer = 3,
+- siEncodedCertBuffer = 4,
+- siDERNameBuffer = 5,
+- siEncodedNameBuffer = 6,
+- siAsciiNameString = 7,
+- siAsciiString = 8,
+- siDEROID = 9,
+- siUnsignedInteger = 10,
+- siUTCTime = 11,
+- siGeneralizedTime = 12
+-} SECItemType;
+-
+-typedef struct SECItemStr SECItem;
+-
+-struct SECItemStr {
+- SECItemType type;
+- unsigned char *data;
+- unsigned int len;
+-};
+-
+-typedef SECItem SECKEYECParams;
+-
+-typedef enum { ec_params_explicit,
+- ec_params_named
+-} ECParamsType;
+-
+-typedef enum { ec_field_GFp = 1,
+- ec_field_GF2m
+-} ECFieldType;
+-
+-struct ECFieldIDStr {
+- int size; /* field size in bits */
+- ECFieldType type;
+- union {
+- SECItem prime; /* prime p for (GFp) */
+- SECItem poly; /* irreducible binary polynomial for (GF2m) */
+- } u;
+- int k1; /* first coefficient of pentanomial or
+- * the only coefficient of trinomial
+- */
+- int k2; /* two remaining coefficients of pentanomial */
+- int k3;
+-};
+-typedef struct ECFieldIDStr ECFieldID;
+-
+-struct ECCurveStr {
+- SECItem a; /* contains octet stream encoding of
+- * field element (X9.62 section 4.3.3)
+- */
+- SECItem b;
+- SECItem seed;
+-};
+-typedef struct ECCurveStr ECCurve;
+-
+-typedef void PRArenaPool;
+-
+-struct ECParamsStr {
+- PRArenaPool * arena;
+- ECParamsType type;
+- ECFieldID fieldID;
+- ECCurve curve;
+- SECItem base;
+- SECItem order;
+- int cofactor;
+- SECItem DEREncoding;
+- ECCurveName name;
+- SECItem curveOID;
+-};
+-typedef struct ECParamsStr ECParams;
+-
+-struct ECPublicKeyStr {
+- ECParams ecParams;
+- SECItem publicValue; /* elliptic curve point encoded as
+- * octet stream.
+- */
+-};
+-typedef struct ECPublicKeyStr ECPublicKey;
+-
+-struct ECPrivateKeyStr {
+- ECParams ecParams;
+- SECItem publicValue; /* encoded ec point */
+- SECItem privateValue; /* private big integer */
+- SECItem version; /* As per SEC 1, Appendix C, Section C.4 */
+-};
+-typedef struct ECPrivateKeyStr ECPrivateKey;
+-
+-typedef enum _SECStatus {
+- SECBufferTooSmall = -3,
+- SECWouldBlock = -2,
+- SECFailure = -1,
+- SECSuccess = 0
+-} SECStatus;
+-
+-#ifdef _KERNEL
+-#define RNG_GenerateGlobalRandomBytes(p,l) ecc_knzero_random_generator((p), (l))
+-#else
+-/*
+- This function is no longer required because the random bytes are now
+- supplied by the caller. Force a failure.
+-*/
+-#define RNG_GenerateGlobalRandomBytes(p,l) SECFailure
+-#endif
+-#define CHECK_MPI_OK(func) if (MP_OKAY > (err = func)) goto cleanup
+-#define MP_TO_SEC_ERROR(err)
+-
+-#define SECITEM_TO_MPINT(it, mp) \
+- CHECK_MPI_OK(mp_read_unsigned_octets((mp), (it).data, (it).len))
+-
+-extern int ecc_knzero_random_generator(uint8_t *, size_t);
+-extern ulong_t soft_nzero_random_generator(uint8_t *, ulong_t);
+-
+-extern SECStatus EC_DecodeParams(const SECItem *, ECParams **, int);
+-extern SECItem * SECITEM_AllocItem(PRArenaPool *, SECItem *, unsigned int, int);
+-extern SECStatus SECITEM_CopyItem(PRArenaPool *, SECItem *, const SECItem *,
+- int);
+-extern void SECITEM_FreeItem(SECItem *, boolean_t);
+-/* This function has been modified to accept an array of random bytes */
+-extern SECStatus EC_NewKey(ECParams *ecParams, ECPrivateKey **privKey,
+- const unsigned char* random, int randomlen, int);
+-/* This function has been modified to accept an array of random bytes */
+-extern SECStatus ECDSA_SignDigest(ECPrivateKey *, SECItem *, const SECItem *,
+- const unsigned char* random, int randomlen, int, int timing);
+-extern SECStatus ECDSA_VerifyDigest(ECPublicKey *, const SECItem *,
+- const SECItem *, int);
+-extern SECStatus ECDH_Derive(SECItem *, ECParams *, SECItem *, boolean_t,
+- SECItem *, int);
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif /* _ECC_IMPL_H */
+diff -r 984a4af2ed4e src/solaris/javavm/export/jni_md.h
+--- openjdk/jdk/src/solaris/javavm/export/jni_md.h
++++ openjdk/jdk/src/solaris/javavm/export/jni_md.h
+@@ -36,6 +36,11 @@
+ #define JNIEXPORT
+ #define JNIIMPORT
+ #endif
++#if (defined(__GNUC__)) || __has_attribute(unused)
++ #define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
++#else
++ #define UNUSED(x) UNUSED_ ## x
++#endif
+
+ #define JNICALL
+
diff --git a/pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_root8.patch b/pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_root8.patch
new file mode 100644
index 0000000..100472b
--- /dev/null
+++ b/pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_root8.patch
@@ -0,0 +1,89 @@
+# HG changeset patch
+# User andrew
+# Date 1453863007 0
+# Wed Jan 27 02:50:07 2016 +0000
+# Node ID f0635543beb309c4da1bb88c906a76ee4b75e16d
+# Parent 4a5a0d4e1ae0feec2f47d17be380d6fcd5eff126
+PR1983: Support using the system installation of NSS with the SunEC provider
+Summary: Add new configure option --enable-system-nss
+
+diff -r 92af9369869f common/autoconf/jdk-options.m4
+--- openjdk/common/autoconf/jdk-options.m4 Thu Jan 21 22:17:02 2016 +0000
++++ openjdk/common/autoconf/jdk-options.m4 Wed Jan 27 05:32:12 2016 +0000
+@@ -414,9 +414,10 @@
+ #
+ AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
+ [
+- AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
++ AC_REQUIRE([LIB_SETUP_MISC_LIBS])
++ AC_MSG_CHECKING([if the elliptic curve crypto implementation is present])
+
+- if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
++ if test "x${system_nss}" = "xyes" -o -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
+ ENABLE_INTREE_EC=yes
+ AC_MSG_RESULT([yes])
+ else
+diff -r 92af9369869f common/autoconf/libraries.m4
+--- openjdk/common/autoconf/libraries.m4 Thu Jan 21 22:17:02 2016 +0000
++++ openjdk/common/autoconf/libraries.m4 Wed Jan 27 05:32:12 2016 +0000
+@@ -731,6 +731,47 @@
+ LIBDL="$LIBS"
+ AC_SUBST(LIBDL)
+ LIBS="$save_LIBS"
++
++ ###############################################################################
++ #
++ # Check for the NSS libraries
++ #
++
++ AC_MSG_CHECKING([whether to build the Sun EC provider against the system NSS libraries])
++
++ # default is bundled
++ DEFAULT_SYSTEM_NSS=no
++
++ AC_ARG_ENABLE([system-nss], [AS_HELP_STRING([--enable-system-nss],
++ [build the SunEC provider using the system NSS libraries @<:@disabled@:>@])],
++ [
++ case "${enableval}" in
++ yes)
++ system_nss=yes
++ ;;
++ *)
++ system_nss=no
++ ;;
++ esac
++ ],
++ [
++ system_nss=${DEFAULT_SYSTEM_NSS}
++ ])
++ AC_MSG_RESULT([$system_nss])
++
++ if test "x${system_nss}" = "xyes"; then
++ PKG_CHECK_MODULES(NSS, nss-softokn >= 3.16.1, [NSS_SOFTOKN_FOUND=yes], [NSS_SOFTOKN_FOUND=no])
++ if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
++ NSS_LIBS="$NSS_LIBS -lfreebl";
++ USE_EXTERNAL_NSS=true
++ else
++ AC_MSG_ERROR([--enable-system-nss specified, but NSS not found.])
++ fi
++ else
++ USE_EXTERNAL_NSS=false
++ fi
++ AC_SUBST(USE_EXTERNAL_NSS)
++
+ ])
+
+ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP],
+diff -r 92af9369869f common/autoconf/spec.gmk.in
+--- openjdk/common/autoconf/spec.gmk.in Thu Jan 21 22:17:02 2016 +0000
++++ openjdk/common/autoconf/spec.gmk.in Wed Jan 27 05:32:12 2016 +0000
+@@ -647,6 +647,9 @@
+ # Read-only single-machine data
+ INSTALL_SYSCONFDIR=@sysconfdir@
+
++USE_EXTERNAL_NSS:=@USE_EXTERNAL_NSS@
++NSS_LIBS:=@NSS_LIBS@
++NSS_CFLAGS:=@NSS_CFLAGS@
+
+ ####################################################
+ #
diff --git a/pr1983-root.patch b/pr1983-root.patch
deleted file mode 100644
index 100472b..0000000
--- a/pr1983-root.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1453863007 0
-# Wed Jan 27 02:50:07 2016 +0000
-# Node ID f0635543beb309c4da1bb88c906a76ee4b75e16d
-# Parent 4a5a0d4e1ae0feec2f47d17be380d6fcd5eff126
-PR1983: Support using the system installation of NSS with the SunEC provider
-Summary: Add new configure option --enable-system-nss
-
-diff -r 92af9369869f common/autoconf/jdk-options.m4
---- openjdk/common/autoconf/jdk-options.m4 Thu Jan 21 22:17:02 2016 +0000
-+++ openjdk/common/autoconf/jdk-options.m4 Wed Jan 27 05:32:12 2016 +0000
-@@ -414,9 +414,10 @@
- #
- AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
- [
-- AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
-+ AC_REQUIRE([LIB_SETUP_MISC_LIBS])
-+ AC_MSG_CHECKING([if the elliptic curve crypto implementation is present])
-
-- if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
-+ if test "x${system_nss}" = "xyes" -o -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
- ENABLE_INTREE_EC=yes
- AC_MSG_RESULT([yes])
- else
-diff -r 92af9369869f common/autoconf/libraries.m4
---- openjdk/common/autoconf/libraries.m4 Thu Jan 21 22:17:02 2016 +0000
-+++ openjdk/common/autoconf/libraries.m4 Wed Jan 27 05:32:12 2016 +0000
-@@ -731,6 +731,47 @@
- LIBDL="$LIBS"
- AC_SUBST(LIBDL)
- LIBS="$save_LIBS"
-+
-+ ###############################################################################
-+ #
-+ # Check for the NSS libraries
-+ #
-+
-+ AC_MSG_CHECKING([whether to build the Sun EC provider against the system NSS libraries])
-+
-+ # default is bundled
-+ DEFAULT_SYSTEM_NSS=no
-+
-+ AC_ARG_ENABLE([system-nss], [AS_HELP_STRING([--enable-system-nss],
-+ [build the SunEC provider using the system NSS libraries @<:@disabled@:>@])],
-+ [
-+ case "${enableval}" in
-+ yes)
-+ system_nss=yes
-+ ;;
-+ *)
-+ system_nss=no
-+ ;;
-+ esac
-+ ],
-+ [
-+ system_nss=${DEFAULT_SYSTEM_NSS}
-+ ])
-+ AC_MSG_RESULT([$system_nss])
-+
-+ if test "x${system_nss}" = "xyes"; then
-+ PKG_CHECK_MODULES(NSS, nss-softokn >= 3.16.1, [NSS_SOFTOKN_FOUND=yes], [NSS_SOFTOKN_FOUND=no])
-+ if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
-+ NSS_LIBS="$NSS_LIBS -lfreebl";
-+ USE_EXTERNAL_NSS=true
-+ else
-+ AC_MSG_ERROR([--enable-system-nss specified, but NSS not found.])
-+ fi
-+ else
-+ USE_EXTERNAL_NSS=false
-+ fi
-+ AC_SUBST(USE_EXTERNAL_NSS)
-+
- ])
-
- AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP],
-diff -r 92af9369869f common/autoconf/spec.gmk.in
---- openjdk/common/autoconf/spec.gmk.in Thu Jan 21 22:17:02 2016 +0000
-+++ openjdk/common/autoconf/spec.gmk.in Wed Jan 27 05:32:12 2016 +0000
-@@ -647,6 +647,9 @@
- # Read-only single-machine data
- INSTALL_SYSCONFDIR=@sysconfdir@
-
-+USE_EXTERNAL_NSS:=@USE_EXTERNAL_NSS@
-+NSS_LIBS:=@NSS_LIBS@
-+NSS_CFLAGS:=@NSS_CFLAGS@
-
- ####################################################
- #
diff --git a/pr2127-sunec_provider_crashes_when_built_using_system_nss_thus_use_of_nss_memory_management_functions.patch b/pr2127-sunec_provider_crashes_when_built_using_system_nss_thus_use_of_nss_memory_management_functions.patch
new file mode 100644
index 0000000..b08822a
--- /dev/null
+++ b/pr2127-sunec_provider_crashes_when_built_using_system_nss_thus_use_of_nss_memory_management_functions.patch
@@ -0,0 +1,178 @@
+# HG changeset patch
+# User andrew
+# Date 1453866306 0
+# Wed Jan 27 03:45:06 2016 +0000
+# Node ID 0ff7720931e8dbf7de25720bdc93b18527ab89e8
+# Parent 48c15869ecd568263249af4b9a4e98d4e57f9a8f
+PR2127: SunEC provider crashes when built using system NSS
+Summary: Use NSS memory management functions
+
+diff -r 48c15869ecd5 -r 0ff7720931e8 src/share/native/sun/security/ec/ECC_JNI.cpp
+--- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 02:54:06 2016 +0000
++++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 03:45:06 2016 +0000
+@@ -32,6 +32,13 @@
+ #define INVALID_PARAMETER_EXCEPTION \
+ "java/security/InvalidParameterException"
+ #define KEY_EXCEPTION "java/security/KeyException"
++#define INTERNAL_ERROR "java/lang/InternalError"
++
++#ifdef SYSTEM_NSS
++#define SYSTEM_UNUSED(x) UNUSED(x)
++#else
++#define SYSTEM_UNUSED(x) x
++#endif
+
+ extern "C" {
+
+@@ -49,8 +56,13 @@
+ /*
+ * Deep free of the ECParams struct
+ */
+-void FreeECParams(ECParams *ecparams, jboolean freeStruct)
++void FreeECParams(ECParams *ecparams, jboolean SYSTEM_UNUSED(freeStruct))
+ {
++#ifdef SYSTEM_NSS
++ // Needs to be freed using the matching method to the one
++ // that allocated it. PR_TRUE means the memory is zeroed.
++ PORT_FreeArena(ecparams->arena, PR_TRUE);
++#else
+ // Use B_FALSE to free the SECItem->data element, but not the SECItem itself
+ // Use B_TRUE to free both
+
+@@ -64,6 +76,7 @@
+ SECITEM_FreeItem(&ecparams->curveOID, B_FALSE);
+ if (freeStruct)
+ free(ecparams);
++#endif
+ }
+
+ jbyteArray getEncodedBytes(JNIEnv *env, SECItem *hSECItem)
+@@ -108,6 +121,13 @@
+ goto cleanup;
+ }
+
++#ifdef SYSTEM_NSS
++ if (SECOID_Init() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ goto cleanup;
++ }
++#endif
++
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -163,16 +183,26 @@
+ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
++#ifdef SYSTEM_NSS
++ if (SECOID_Shutdown() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
++#endif
+ }
+ if (ecparams) {
+ FreeECParams(ecparams, true);
+ }
+ if (privKey) {
+ FreeECParams(&privKey->ecParams, false);
++#ifndef SYSTEM_NSS
++ // The entire ECPrivateKey is allocated in the arena
++ // when using system NSS, so only the in-tree version
++ // needs to clear these manually.
+ SECITEM_FreeItem(&privKey->version, B_FALSE);
+ SECITEM_FreeItem(&privKey->privateValue, B_FALSE);
+ SECITEM_FreeItem(&privKey->publicValue, B_FALSE);
+ free(privKey);
++#endif
+ }
+
+ if (pSeedBuffer) {
+@@ -223,6 +253,13 @@
+ goto cleanup;
+ }
+
++#ifdef SYSTEM_NSS
++ if (SECOID_Init() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ goto cleanup;
++ }
++#endif
++
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -270,6 +307,11 @@
+ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
++#ifdef SYSTEM_NSS
++ if (SECOID_Shutdown() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
++#endif
+ }
+ if (privKey.privateValue.data) {
+ env->ReleaseByteArrayElements(privateKey,
+@@ -336,6 +378,13 @@
+ goto cleanup;
+ }
+
++#ifdef SYSTEM_NSS
++ if (SECOID_Init() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ goto cleanup;
++ }
++#endif
++
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -356,9 +405,15 @@
+
+ cleanup:
+ {
+- if (params_item.data)
++ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
++#ifdef SYSTEM_NSS
++ if (SECOID_Shutdown() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
++#endif
++ }
+
+ if (pubKey.publicValue.data)
+ env->ReleaseByteArrayElements(publicKey,
+@@ -419,6 +474,13 @@
+ goto cleanup;
+ }
+
++#ifdef SYSTEM_NSS
++ if (SECOID_Init() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ goto cleanup;
++ }
++#endif
++
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -460,9 +522,15 @@
+ env->ReleaseByteArrayElements(publicKey,
+ (jbyte *) publicValue_item.data, JNI_ABORT);
+
+- if (params_item.data)
++ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
++#ifdef SYSTEM_NSS
++ if (SECOID_Shutdown() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
++#endif
++ }
+
+ if (ecparams)
+ FreeECParams(ecparams, true);
diff --git a/pr2127.patch b/pr2127.patch
deleted file mode 100644
index b08822a..0000000
--- a/pr2127.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1453866306 0
-# Wed Jan 27 03:45:06 2016 +0000
-# Node ID 0ff7720931e8dbf7de25720bdc93b18527ab89e8
-# Parent 48c15869ecd568263249af4b9a4e98d4e57f9a8f
-PR2127: SunEC provider crashes when built using system NSS
-Summary: Use NSS memory management functions
-
-diff -r 48c15869ecd5 -r 0ff7720931e8 src/share/native/sun/security/ec/ECC_JNI.cpp
---- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 02:54:06 2016 +0000
-+++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 03:45:06 2016 +0000
-@@ -32,6 +32,13 @@
- #define INVALID_PARAMETER_EXCEPTION \
- "java/security/InvalidParameterException"
- #define KEY_EXCEPTION "java/security/KeyException"
-+#define INTERNAL_ERROR "java/lang/InternalError"
-+
-+#ifdef SYSTEM_NSS
-+#define SYSTEM_UNUSED(x) UNUSED(x)
-+#else
-+#define SYSTEM_UNUSED(x) x
-+#endif
-
- extern "C" {
-
-@@ -49,8 +56,13 @@
- /*
- * Deep free of the ECParams struct
- */
--void FreeECParams(ECParams *ecparams, jboolean freeStruct)
-+void FreeECParams(ECParams *ecparams, jboolean SYSTEM_UNUSED(freeStruct))
- {
-+#ifdef SYSTEM_NSS
-+ // Needs to be freed using the matching method to the one
-+ // that allocated it. PR_TRUE means the memory is zeroed.
-+ PORT_FreeArena(ecparams->arena, PR_TRUE);
-+#else
- // Use B_FALSE to free the SECItem->data element, but not the SECItem itself
- // Use B_TRUE to free both
-
-@@ -64,6 +76,7 @@
- SECITEM_FreeItem(&ecparams->curveOID, B_FALSE);
- if (freeStruct)
- free(ecparams);
-+#endif
- }
-
- jbyteArray getEncodedBytes(JNIEnv *env, SECItem *hSECItem)
-@@ -108,6 +121,13 @@
- goto cleanup;
- }
-
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Init() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ goto cleanup;
-+ }
-+#endif
-+
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -163,16 +183,26 @@
- if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Shutdown() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
-+#endif
- }
- if (ecparams) {
- FreeECParams(ecparams, true);
- }
- if (privKey) {
- FreeECParams(&privKey->ecParams, false);
-+#ifndef SYSTEM_NSS
-+ // The entire ECPrivateKey is allocated in the arena
-+ // when using system NSS, so only the in-tree version
-+ // needs to clear these manually.
- SECITEM_FreeItem(&privKey->version, B_FALSE);
- SECITEM_FreeItem(&privKey->privateValue, B_FALSE);
- SECITEM_FreeItem(&privKey->publicValue, B_FALSE);
- free(privKey);
-+#endif
- }
-
- if (pSeedBuffer) {
-@@ -223,6 +253,13 @@
- goto cleanup;
- }
-
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Init() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ goto cleanup;
-+ }
-+#endif
-+
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -270,6 +307,11 @@
- if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Shutdown() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
-+#endif
- }
- if (privKey.privateValue.data) {
- env->ReleaseByteArrayElements(privateKey,
-@@ -336,6 +378,13 @@
- goto cleanup;
- }
-
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Init() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ goto cleanup;
-+ }
-+#endif
-+
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -356,9 +405,15 @@
-
- cleanup:
- {
-- if (params_item.data)
-+ if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Shutdown() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
-+#endif
-+ }
-
- if (pubKey.publicValue.data)
- env->ReleaseByteArrayElements(publicKey,
-@@ -419,6 +474,13 @@
- goto cleanup;
- }
-
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Init() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ goto cleanup;
-+ }
-+#endif
-+
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -460,9 +522,15 @@
- env->ReleaseByteArrayElements(publicKey,
- (jbyte *) publicValue_item.data, JNI_ABORT);
-
-- if (params_item.data)
-+ if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Shutdown() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
-+#endif
-+ }
-
- if (ecparams)
- FreeECParams(ecparams, true);
diff --git a/pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binary.patch b/pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binary.patch
new file mode 100644
index 0000000..17e1f69
--- /dev/null
+++ b/pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binary.patch
@@ -0,0 +1,302 @@
+# HG changeset patch
+# User mikael
+# Date 1426870964 25200
+# Fri Mar 20 10:02:44 2015 -0700
+# Node ID ee13ce369705a700b867f8c77423580b7b22cc13
+# Parent 7847ccfb240b35ed0dd328f0404b713b20e0905a
+8074839: Resolve disabled warnings for libunpack and the unpack200 binary
+Reviewed-by: dholmes, ksrini
+
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
+@@ -63,7 +63,7 @@
+ bytes res;
+ res.ptr = ptr + beg;
+ res.len = end - beg;
+- assert(res.len == 0 || inBounds(res.ptr) && inBounds(res.limit()-1));
++ assert(res.len == 0 || (inBounds(res.ptr) && inBounds(res.limit()-1)));
+ return res;
+ }
+ // building C strings inside byte buffers:
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
+@@ -292,7 +292,7 @@
+
+ if (uPtr->aborting()) {
+ THROW_IOE(uPtr->get_abort_message());
+- return false;
++ return null;
+ }
+
+ // We have fetched all the files.
+@@ -310,7 +310,7 @@
+ JNIEXPORT jlong JNICALL
+ Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
+ unpacker* uPtr = get_unpacker(env, pObj, false);
+- CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, 0);
+ size_t consumed = uPtr->input_consumed();
+ free_unpacker(env, pObj, uPtr);
+ return consumed;
+@@ -320,6 +320,7 @@
+ Java_com_sun_java_util_jar_pack_NativeUnpack_setOption(JNIEnv *env, jobject pObj,
+ jstring pProp, jstring pValue) {
+ unpacker* uPtr = get_unpacker(env, pObj);
++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false);
+ const char* prop = env->GetStringUTFChars(pProp, JNI_FALSE);
+ CHECK_EXCEPTION_RETURN_VALUE(prop, false);
+ const char* value = env->GetStringUTFChars(pValue, JNI_FALSE);
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
+@@ -142,31 +142,28 @@
+ return progname;
+ }
+
+-static const char* usage_lines[] = {
+- "Usage: %s [-opt... | --option=value]... x.pack[.gz] y.jar\n",
+- "\n",
+- "Unpacking Options\n",
+- " -H{h}, --deflate-hint={h} override transmitted deflate hint: true, false, or keep (default)\n",
+- " -r, --remove-pack-file remove input file after unpacking\n",
+- " -v, --verbose increase program verbosity\n",
+- " -q, --quiet set verbosity to lowest level\n",
+- " -l{F}, --log-file={F} output to the given log file, or '-' for standard output (default)\n",
+- " -?, -h, --help print this message\n",
+- " -V, --version print program version\n",
+- " -J{X} Java VM argument (ignored)\n",
+- null
+-};
++#define USAGE_HEADER "Usage: %s [-opt... | --option=value]... x.pack[.gz] y.jar\n"
++#define USAGE_OPTIONS \
++ "\n" \
++ "Unpacking Options\n" \
++ " -H{h}, --deflate-hint={h} override transmitted deflate hint: true, false, or keep (default)\n" \
++ " -r, --remove-pack-file remove input file after unpacking\n" \
++ " -v, --verbose increase program verbosity\n" \
++ " -q, --quiet set verbosity to lowest level\n" \
++ " -l{F}, --log-file={F} output to the given log file, or '-' for standard output (default)\n" \
++ " -?, -h, --help print this message\n" \
++ " -V, --version print program version\n" \
++ " -J{X} Java VM argument (ignored)\n"
+
+ static void usage(unpacker* u, const char* progname, bool full = false) {
+ // WinMain does not set argv[0] to the progrname
+ progname = (progname != null) ? nbasename(progname) : "unpack200";
+- for (int i = 0; usage_lines[i] != null; i++) {
+- fprintf(u->errstrm, usage_lines[i], progname);
+- if (!full) {
+- fprintf(u->errstrm,
+- "(For more information, run %s --help .)\n", progname);
+- break;
+- }
++
++ fprintf(u->errstrm, USAGE_HEADER, progname);
++ if (full) {
++ fprintf(u->errstrm, USAGE_OPTIONS);
++ } else {
++ fprintf(u->errstrm, "(For more information, run %s --help .)\n", progname);
+ }
+ }
+
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+@@ -222,9 +222,9 @@
+ }
+
+ #ifdef PRODUCT
+- char* string() { return 0; }
++ const char* string() { return NULL; }
+ #else
+- char* string(); // see far below
++ const char* string(); // see far below
+ #endif
+ };
+
+@@ -715,13 +715,13 @@
+ // Now we can size the whole archive.
+ // Read everything else into a mega-buffer.
+ rp = hdr.rp;
+- int header_size_0 = (int)(rp - input.base()); // used-up header (4byte + 3int)
+- int header_size_1 = (int)(rplimit - rp); // buffered unused initial fragment
+- int header_size = header_size_0+header_size_1;
++ size_t header_size_0 = (rp - input.base()); // used-up header (4byte + 3int)
++ size_t header_size_1 = (rplimit - rp); // buffered unused initial fragment
++ size_t header_size = header_size_0 + header_size_1;
+ unsized_bytes_read = header_size_0;
+ CHECK;
+ if (foreign_buf) {
+- if (archive_size > (size_t)header_size_1) {
++ if (archive_size > header_size_1) {
+ abort("EOF reading fixed input buffer");
+ return;
+ }
+@@ -735,7 +735,7 @@
+ return;
+ }
+ input.set(U_NEW(byte, add_size(header_size_0, archive_size, C_SLOP)),
+- (size_t) header_size_0 + archive_size);
++ header_size_0 + archive_size);
+ CHECK;
+ assert(input.limit()[0] == 0);
+ // Move all the bytes we read initially into the real buffer.
+@@ -958,13 +958,13 @@
+ nentries = next_entry;
+
+ // place a limit on future CP growth:
+- int generous = 0;
++ size_t generous = 0;
+ generous = add_size(generous, u->ic_count); // implicit name
+ generous = add_size(generous, u->ic_count); // outer
+ generous = add_size(generous, u->ic_count); // outer.utf8
+ generous = add_size(generous, 40); // WKUs, misc
+ generous = add_size(generous, u->class_count); // implicit SourceFile strings
+- maxentries = add_size(nentries, generous);
++ maxentries = (uint)add_size(nentries, generous);
+
+ // Note that this CP does not include "empty" entries
+ // for longs and doubles. Those are introduced when
+@@ -982,8 +982,9 @@
+ }
+
+ // Initialize *all* our entries once
+- for (int i = 0 ; i < maxentries ; i++)
++ for (uint i = 0 ; i < maxentries ; i++) {
+ entries[i].outputIndex = REQUESTED_NONE;
++ }
+
+ initGroupIndexes();
+ // Initialize hashTab to a generous power-of-two size.
+@@ -3677,21 +3678,22 @@
+
+ unpacker* debug_u;
+
+-static bytes& getbuf(int len) { // for debugging only!
++static bytes& getbuf(size_t len) { // for debugging only!
+ static int bn = 0;
+ static bytes bufs[8];
+ bytes& buf = bufs[bn++ & 7];
+- while ((int)buf.len < len+10)
++ while (buf.len < len + 10) {
+ buf.realloc(buf.len ? buf.len * 2 : 1000);
++ }
+ buf.ptr[0] = 0; // for the sake of strcat
+ return buf;
+ }
+
+-char* entry::string() {
++const char* entry::string() {
+ bytes buf;
+ switch (tag) {
+ case CONSTANT_None:
+- return (char*)"<empty>";
++ return "<empty>";
+ case CONSTANT_Signature:
+ if (value.b.ptr == null)
+ return ref(0)->string();
+@@ -3711,26 +3713,28 @@
+ break;
+ default:
+ if (nrefs == 0) {
+- buf = getbuf(20);
+- sprintf((char*)buf.ptr, TAG_NAME[tag]);
++ return TAG_NAME[tag];
+ } else if (nrefs == 1) {
+ return refs[0]->string();
+ } else {
+- char* s1 = refs[0]->string();
+- char* s2 = refs[1]->string();
+- buf = getbuf((int)strlen(s1) + 1 + (int)strlen(s2) + 4 + 1);
++ const char* s1 = refs[0]->string();
++ const char* s2 = refs[1]->string();
++ buf = getbuf(strlen(s1) + 1 + strlen(s2) + 4 + 1);
+ buf.strcat(s1).strcat(" ").strcat(s2);
+ if (nrefs > 2) buf.strcat(" ...");
+ }
+ }
+- return (char*)buf.ptr;
++ return (const char*)buf.ptr;
+ }
+
+ void print_cp_entry(int i) {
+ entry& e = debug_u->cp.entries[i];
+- char buf[30];
+- sprintf(buf, ((uint)e.tag < CONSTANT_Limit)? TAG_NAME[e.tag]: "%d", e.tag);
+- printf(" %d\t%s %s\n", i, buf, e.string());
++
++ if ((uint)e.tag < CONSTANT_Limit) {
++ printf(" %d\t%s %s\n", i, TAG_NAME[e.tag], e.string());
++ } else {
++ printf(" %d\t%d %s\n", i, e.tag, e.string());
++ }
+ }
+
+ void print_cp_entries(int beg, int end) {
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
+@@ -209,7 +209,7 @@
+ byte* rp; // read pointer (< rplimit <= input.limit())
+ byte* rplimit; // how much of the input block has been read?
+ julong bytes_read;
+- int unsized_bytes_read;
++ size_t unsized_bytes_read;
+
+ // callback to read at least one byte, up to available input
+ typedef jlong (*read_input_fn_t)(unpacker* self, void* buf, jlong minlen, jlong maxlen);
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
+@@ -81,7 +81,7 @@
+ int assert_failed(const char* p) {
+ char message[1<<12];
+ sprintf(message, "@assert failed: %s\n", p);
+- fprintf(stdout, 1+message);
++ fprintf(stdout, "%s", 1+message);
+ breakpoint();
+ unpack_abort(message);
+ return 0;
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
+@@ -84,7 +84,7 @@
+ }
+
+ // Write data to the ZIP output stream.
+-void jar::write_data(void* buff, int len) {
++void jar::write_data(void* buff, size_t len) {
+ while (len > 0) {
+ int rc = (int)fwrite(buff, 1, len, jarfp);
+ if (rc <= 0) {
+@@ -323,12 +323,12 @@
+ // Total number of disks (int)
+ header64[36] = (ushort)SWAP_BYTES(1);
+ header64[37] = 0;
+- write_data(header64, (int)sizeof(header64));
++ write_data(header64, sizeof(header64));
+ }
+
+ // Write the End of Central Directory structure.
+ PRINTCR((2, "end-of-directory at %d\n", output_file_offset));
+- write_data(header, (int)sizeof(header));
++ write_data(header, sizeof(header));
+
+ PRINTCR((2, "writing zip comment\n"));
+ // Write the comment.
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
+@@ -68,8 +68,8 @@
+ }
+
+ // Private Methods
+- void write_data(void* ptr, int len);
+- void write_data(bytes& b) { write_data(b.ptr, (int)b.len); }
++ void write_data(void* ptr, size_t len);
++ void write_data(bytes& b) { write_data(b.ptr, b.len); }
+ void add_to_jar_directory(const char* fname, bool store, int modtime,
+ int len, int clen, uLong crc);
+ void write_jar_header(const char* fname, bool store, int modtime,
diff --git a/pr2462.patch b/pr2462.patch
deleted file mode 100644
index 17e1f69..0000000
--- a/pr2462.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-# HG changeset patch
-# User mikael
-# Date 1426870964 25200
-# Fri Mar 20 10:02:44 2015 -0700
-# Node ID ee13ce369705a700b867f8c77423580b7b22cc13
-# Parent 7847ccfb240b35ed0dd328f0404b713b20e0905a
-8074839: Resolve disabled warnings for libunpack and the unpack200 binary
-Reviewed-by: dholmes, ksrini
-
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
-@@ -63,7 +63,7 @@
- bytes res;
- res.ptr = ptr + beg;
- res.len = end - beg;
-- assert(res.len == 0 || inBounds(res.ptr) && inBounds(res.limit()-1));
-+ assert(res.len == 0 || (inBounds(res.ptr) && inBounds(res.limit()-1)));
- return res;
- }
- // building C strings inside byte buffers:
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
-@@ -292,7 +292,7 @@
-
- if (uPtr->aborting()) {
- THROW_IOE(uPtr->get_abort_message());
-- return false;
-+ return null;
- }
-
- // We have fetched all the files.
-@@ -310,7 +310,7 @@
- JNIEXPORT jlong JNICALL
- Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
- unpacker* uPtr = get_unpacker(env, pObj, false);
-- CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
-+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, 0);
- size_t consumed = uPtr->input_consumed();
- free_unpacker(env, pObj, uPtr);
- return consumed;
-@@ -320,6 +320,7 @@
- Java_com_sun_java_util_jar_pack_NativeUnpack_setOption(JNIEnv *env, jobject pObj,
- jstring pProp, jstring pValue) {
- unpacker* uPtr = get_unpacker(env, pObj);
-+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false);
- const char* prop = env->GetStringUTFChars(pProp, JNI_FALSE);
- CHECK_EXCEPTION_RETURN_VALUE(prop, false);
- const char* value = env->GetStringUTFChars(pValue, JNI_FALSE);
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
-@@ -142,31 +142,28 @@
- return progname;
- }
-
--static const char* usage_lines[] = {
-- "Usage: %s [-opt... | --option=value]... x.pack[.gz] y.jar\n",
-- "\n",
-- "Unpacking Options\n",
-- " -H{h}, --deflate-hint={h} override transmitted deflate hint: true, false, or keep (default)\n",
-- " -r, --remove-pack-file remove input file after unpacking\n",
-- " -v, --verbose increase program verbosity\n",
-- " -q, --quiet set verbosity to lowest level\n",
-- " -l{F}, --log-file={F} output to the given log file, or '-' for standard output (default)\n",
-- " -?, -h, --help print this message\n",
-- " -V, --version print program version\n",
-- " -J{X} Java VM argument (ignored)\n",
-- null
--};
-+#define USAGE_HEADER "Usage: %s [-opt... | --option=value]... x.pack[.gz] y.jar\n"
-+#define USAGE_OPTIONS \
-+ "\n" \
-+ "Unpacking Options\n" \
-+ " -H{h}, --deflate-hint={h} override transmitted deflate hint: true, false, or keep (default)\n" \
-+ " -r, --remove-pack-file remove input file after unpacking\n" \
-+ " -v, --verbose increase program verbosity\n" \
-+ " -q, --quiet set verbosity to lowest level\n" \
-+ " -l{F}, --log-file={F} output to the given log file, or '-' for standard output (default)\n" \
-+ " -?, -h, --help print this message\n" \
-+ " -V, --version print program version\n" \
-+ " -J{X} Java VM argument (ignored)\n"
-
- static void usage(unpacker* u, const char* progname, bool full = false) {
- // WinMain does not set argv[0] to the progrname
- progname = (progname != null) ? nbasename(progname) : "unpack200";
-- for (int i = 0; usage_lines[i] != null; i++) {
-- fprintf(u->errstrm, usage_lines[i], progname);
-- if (!full) {
-- fprintf(u->errstrm,
-- "(For more information, run %s --help .)\n", progname);
-- break;
-- }
-+
-+ fprintf(u->errstrm, USAGE_HEADER, progname);
-+ if (full) {
-+ fprintf(u->errstrm, USAGE_OPTIONS);
-+ } else {
-+ fprintf(u->errstrm, "(For more information, run %s --help .)\n", progname);
- }
- }
-
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
-@@ -222,9 +222,9 @@
- }
-
- #ifdef PRODUCT
-- char* string() { return 0; }
-+ const char* string() { return NULL; }
- #else
-- char* string(); // see far below
-+ const char* string(); // see far below
- #endif
- };
-
-@@ -715,13 +715,13 @@
- // Now we can size the whole archive.
- // Read everything else into a mega-buffer.
- rp = hdr.rp;
-- int header_size_0 = (int)(rp - input.base()); // used-up header (4byte + 3int)
-- int header_size_1 = (int)(rplimit - rp); // buffered unused initial fragment
-- int header_size = header_size_0+header_size_1;
-+ size_t header_size_0 = (rp - input.base()); // used-up header (4byte + 3int)
-+ size_t header_size_1 = (rplimit - rp); // buffered unused initial fragment
-+ size_t header_size = header_size_0 + header_size_1;
- unsized_bytes_read = header_size_0;
- CHECK;
- if (foreign_buf) {
-- if (archive_size > (size_t)header_size_1) {
-+ if (archive_size > header_size_1) {
- abort("EOF reading fixed input buffer");
- return;
- }
-@@ -735,7 +735,7 @@
- return;
- }
- input.set(U_NEW(byte, add_size(header_size_0, archive_size, C_SLOP)),
-- (size_t) header_size_0 + archive_size);
-+ header_size_0 + archive_size);
- CHECK;
- assert(input.limit()[0] == 0);
- // Move all the bytes we read initially into the real buffer.
-@@ -958,13 +958,13 @@
- nentries = next_entry;
-
- // place a limit on future CP growth:
-- int generous = 0;
-+ size_t generous = 0;
- generous = add_size(generous, u->ic_count); // implicit name
- generous = add_size(generous, u->ic_count); // outer
- generous = add_size(generous, u->ic_count); // outer.utf8
- generous = add_size(generous, 40); // WKUs, misc
- generous = add_size(generous, u->class_count); // implicit SourceFile strings
-- maxentries = add_size(nentries, generous);
-+ maxentries = (uint)add_size(nentries, generous);
-
- // Note that this CP does not include "empty" entries
- // for longs and doubles. Those are introduced when
-@@ -982,8 +982,9 @@
- }
-
- // Initialize *all* our entries once
-- for (int i = 0 ; i < maxentries ; i++)
-+ for (uint i = 0 ; i < maxentries ; i++) {
- entries[i].outputIndex = REQUESTED_NONE;
-+ }
-
- initGroupIndexes();
- // Initialize hashTab to a generous power-of-two size.
-@@ -3677,21 +3678,22 @@
-
- unpacker* debug_u;
-
--static bytes& getbuf(int len) { // for debugging only!
-+static bytes& getbuf(size_t len) { // for debugging only!
- static int bn = 0;
- static bytes bufs[8];
- bytes& buf = bufs[bn++ & 7];
-- while ((int)buf.len < len+10)
-+ while (buf.len < len + 10) {
- buf.realloc(buf.len ? buf.len * 2 : 1000);
-+ }
- buf.ptr[0] = 0; // for the sake of strcat
- return buf;
- }
-
--char* entry::string() {
-+const char* entry::string() {
- bytes buf;
- switch (tag) {
- case CONSTANT_None:
-- return (char*)"<empty>";
-+ return "<empty>";
- case CONSTANT_Signature:
- if (value.b.ptr == null)
- return ref(0)->string();
-@@ -3711,26 +3713,28 @@
- break;
- default:
- if (nrefs == 0) {
-- buf = getbuf(20);
-- sprintf((char*)buf.ptr, TAG_NAME[tag]);
-+ return TAG_NAME[tag];
- } else if (nrefs == 1) {
- return refs[0]->string();
- } else {
-- char* s1 = refs[0]->string();
-- char* s2 = refs[1]->string();
-- buf = getbuf((int)strlen(s1) + 1 + (int)strlen(s2) + 4 + 1);
-+ const char* s1 = refs[0]->string();
-+ const char* s2 = refs[1]->string();
-+ buf = getbuf(strlen(s1) + 1 + strlen(s2) + 4 + 1);
- buf.strcat(s1).strcat(" ").strcat(s2);
- if (nrefs > 2) buf.strcat(" ...");
- }
- }
-- return (char*)buf.ptr;
-+ return (const char*)buf.ptr;
- }
-
- void print_cp_entry(int i) {
- entry& e = debug_u->cp.entries[i];
-- char buf[30];
-- sprintf(buf, ((uint)e.tag < CONSTANT_Limit)? TAG_NAME[e.tag]: "%d", e.tag);
-- printf(" %d\t%s %s\n", i, buf, e.string());
-+
-+ if ((uint)e.tag < CONSTANT_Limit) {
-+ printf(" %d\t%s %s\n", i, TAG_NAME[e.tag], e.string());
-+ } else {
-+ printf(" %d\t%d %s\n", i, e.tag, e.string());
-+ }
- }
-
- void print_cp_entries(int beg, int end) {
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
-@@ -209,7 +209,7 @@
- byte* rp; // read pointer (< rplimit <= input.limit())
- byte* rplimit; // how much of the input block has been read?
- julong bytes_read;
-- int unsized_bytes_read;
-+ size_t unsized_bytes_read;
-
- // callback to read at least one byte, up to available input
- typedef jlong (*read_input_fn_t)(unpacker* self, void* buf, jlong minlen, jlong maxlen);
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
-@@ -81,7 +81,7 @@
- int assert_failed(const char* p) {
- char message[1<<12];
- sprintf(message, "@assert failed: %s\n", p);
-- fprintf(stdout, 1+message);
-+ fprintf(stdout, "%s", 1+message);
- breakpoint();
- unpack_abort(message);
- return 0;
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
-@@ -84,7 +84,7 @@
- }
-
- // Write data to the ZIP output stream.
--void jar::write_data(void* buff, int len) {
-+void jar::write_data(void* buff, size_t len) {
- while (len > 0) {
- int rc = (int)fwrite(buff, 1, len, jarfp);
- if (rc <= 0) {
-@@ -323,12 +323,12 @@
- // Total number of disks (int)
- header64[36] = (ushort)SWAP_BYTES(1);
- header64[37] = 0;
-- write_data(header64, (int)sizeof(header64));
-+ write_data(header64, sizeof(header64));
- }
-
- // Write the End of Central Directory structure.
- PRINTCR((2, "end-of-directory at %d\n", output_file_offset));
-- write_data(header, (int)sizeof(header));
-+ write_data(header, sizeof(header));
-
- PRINTCR((2, "writing zip comment\n"));
- // Write the comment.
-diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
-@@ -68,8 +68,8 @@
- }
-
- // Private Methods
-- void write_data(void* ptr, int len);
-- void write_data(bytes& b) { write_data(b.ptr, (int)b.len); }
-+ void write_data(void* ptr, size_t len);
-+ void write_data(bytes& b) { write_data(b.ptr, b.len); }
- void add_to_jar_directory(const char* fname, bool store, int modtime,
- int len, int clen, uLong crc);
- void write_jar_header(const char* fname, bool store, int modtime,
diff --git a/pr2737-allow_multiple_pkcs11_library_initialisation_to_be_a_non_critical_error.patch b/pr2737-allow_multiple_pkcs11_library_initialisation_to_be_a_non_critical_error.patch
new file mode 100644
index 0000000..f1e8bc2
--- /dev/null
+++ b/pr2737-allow_multiple_pkcs11_library_initialisation_to_be_a_non_critical_error.patch
@@ -0,0 +1,74 @@
+# 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 {
diff --git a/pr2815-race_condition_in_sunec_provider_with_system_nss_fix.patch b/pr2815-race_condition_in_sunec_provider_with_system_nss_fix.patch
new file mode 100644
index 0000000..db14f10
--- /dev/null
+++ b/pr2815-race_condition_in_sunec_provider_with_system_nss_fix.patch
@@ -0,0 +1,189 @@
+# HG changeset patch
+# User andrew
+# Date 1453867347 0
+# Wed Jan 27 04:02:27 2016 +0000
+# Node ID 26e2e029ee256e9815fdc324831a03d8582255e1
+# Parent 0ff7720931e8dbf7de25720bdc93b18527ab89e8
+PR2815: Race condition in SunEC provider with system NSS
+Summary: Perform initialisation and shutdown only when library is loaded or SunEC is finalized respectively
+
+diff -r 0ff7720931e8 -r 26e2e029ee25 make/mapfiles/libsunec/mapfile-vers
+--- openjdk/jdk/make/mapfiles/libsunec/mapfile-vers Wed Jan 27 03:45:06 2016 +0000
++++ openjdk/jdk/make/mapfiles/libsunec/mapfile-vers Wed Jan 27 04:02:27 2016 +0000
+@@ -31,6 +31,8 @@
+ Java_sun_security_ec_ECDSASignature_signDigest;
+ Java_sun_security_ec_ECDSASignature_verifySignedDigest;
+ Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
++ Java_sun_security_ec_SunEC_initialize;
++ Java_sun_security_ec_SunEC_cleanup;
+ local:
+ *;
+ };
+diff -r 0ff7720931e8 -r 26e2e029ee25 src/share/classes/sun/security/ec/SunEC.java
+--- openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java Wed Jan 27 03:45:06 2016 +0000
++++ openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java Wed Jan 27 04:02:27 2016 +0000
+@@ -58,6 +58,7 @@
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ public Void run() {
+ System.loadLibrary("sunec"); // check for native library
++ initialize();
+ return null;
+ }
+ });
+@@ -81,4 +82,22 @@
+ }
+ }
+
++ /**
++ * Cleanup native resources during finalisation.
++ */
++ @Override
++ protected void finalize() {
++ cleanup();
++ }
++
++ /**
++ * Initialize the native code.
++ */
++ private static native void initialize();
++
++ /**
++ * Cleanup in the native layer.
++ */
++ private static native void cleanup();
++
+ }
+diff -r 0ff7720931e8 -r 26e2e029ee25 src/share/native/sun/security/ec/ECC_JNI.cpp
+--- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 03:45:06 2016 +0000
++++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 04:02:27 2016 +0000
+@@ -121,13 +121,6 @@
+ goto cleanup;
+ }
+
+-#ifdef SYSTEM_NSS
+- if (SECOID_Init() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- goto cleanup;
+- }
+-#endif
+-
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -183,11 +176,6 @@
+ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
+-#ifdef SYSTEM_NSS
+- if (SECOID_Shutdown() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- }
+-#endif
+ }
+ if (ecparams) {
+ FreeECParams(ecparams, true);
+@@ -253,13 +241,6 @@
+ goto cleanup;
+ }
+
+-#ifdef SYSTEM_NSS
+- if (SECOID_Init() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- goto cleanup;
+- }
+-#endif
+-
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -307,11 +288,6 @@
+ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
+-#ifdef SYSTEM_NSS
+- if (SECOID_Shutdown() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- }
+-#endif
+ }
+ if (privKey.privateValue.data) {
+ env->ReleaseByteArrayElements(privateKey,
+@@ -378,13 +354,6 @@
+ goto cleanup;
+ }
+
+-#ifdef SYSTEM_NSS
+- if (SECOID_Init() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- goto cleanup;
+- }
+-#endif
+-
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -408,11 +377,6 @@
+ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
+-#ifdef SYSTEM_NSS
+- if (SECOID_Shutdown() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- }
+-#endif
+ }
+
+ if (pubKey.publicValue.data)
+@@ -474,13 +438,6 @@
+ goto cleanup;
+ }
+
+-#ifdef SYSTEM_NSS
+- if (SECOID_Init() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- goto cleanup;
+- }
+-#endif
+-
+ // Fill a new ECParams using the supplied OID
+ if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
+ /* bad curve OID */
+@@ -525,11 +482,6 @@
+ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
+-#ifdef SYSTEM_NSS
+- if (SECOID_Shutdown() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- }
+-#endif
+ }
+
+ if (ecparams)
+@@ -539,4 +491,26 @@
+ return jSecret;
+ }
+
++JNIEXPORT void
++JNICALL Java_sun_security_ec_SunEC_initialize
++ (JNIEnv *env, jclass UNUSED(clazz))
++{
++#ifdef SYSTEM_NSS
++ if (SECOID_Init() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
++#endif
++}
++
++JNIEXPORT void
++JNICALL Java_sun_security_ec_SunEC_cleanup
++ (JNIEnv *env, jclass UNUSED(clazz))
++{
++#ifdef SYSTEM_NSS
++ if (SECOID_Shutdown() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
++#endif
++}
++
+ } /* extern "C" */
diff --git a/pr2815.patch b/pr2815.patch
deleted file mode 100644
index db14f10..0000000
--- a/pr2815.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1453867347 0
-# Wed Jan 27 04:02:27 2016 +0000
-# Node ID 26e2e029ee256e9815fdc324831a03d8582255e1
-# Parent 0ff7720931e8dbf7de25720bdc93b18527ab89e8
-PR2815: Race condition in SunEC provider with system NSS
-Summary: Perform initialisation and shutdown only when library is loaded or SunEC is finalized respectively
-
-diff -r 0ff7720931e8 -r 26e2e029ee25 make/mapfiles/libsunec/mapfile-vers
---- openjdk/jdk/make/mapfiles/libsunec/mapfile-vers Wed Jan 27 03:45:06 2016 +0000
-+++ openjdk/jdk/make/mapfiles/libsunec/mapfile-vers Wed Jan 27 04:02:27 2016 +0000
-@@ -31,6 +31,8 @@
- Java_sun_security_ec_ECDSASignature_signDigest;
- Java_sun_security_ec_ECDSASignature_verifySignedDigest;
- Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
-+ Java_sun_security_ec_SunEC_initialize;
-+ Java_sun_security_ec_SunEC_cleanup;
- local:
- *;
- };
-diff -r 0ff7720931e8 -r 26e2e029ee25 src/share/classes/sun/security/ec/SunEC.java
---- openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java Wed Jan 27 03:45:06 2016 +0000
-+++ openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java Wed Jan 27 04:02:27 2016 +0000
-@@ -58,6 +58,7 @@
- AccessController.doPrivileged(new PrivilegedAction<Void>() {
- public Void run() {
- System.loadLibrary("sunec"); // check for native library
-+ initialize();
- return null;
- }
- });
-@@ -81,4 +82,22 @@
- }
- }
-
-+ /**
-+ * Cleanup native resources during finalisation.
-+ */
-+ @Override
-+ protected void finalize() {
-+ cleanup();
-+ }
-+
-+ /**
-+ * Initialize the native code.
-+ */
-+ private static native void initialize();
-+
-+ /**
-+ * Cleanup in the native layer.
-+ */
-+ private static native void cleanup();
-+
- }
-diff -r 0ff7720931e8 -r 26e2e029ee25 src/share/native/sun/security/ec/ECC_JNI.cpp
---- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 03:45:06 2016 +0000
-+++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Jan 27 04:02:27 2016 +0000
-@@ -121,13 +121,6 @@
- goto cleanup;
- }
-
--#ifdef SYSTEM_NSS
-- if (SECOID_Init() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- goto cleanup;
-- }
--#endif
--
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -183,11 +176,6 @@
- if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
--#ifdef SYSTEM_NSS
-- if (SECOID_Shutdown() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- }
--#endif
- }
- if (ecparams) {
- FreeECParams(ecparams, true);
-@@ -253,13 +241,6 @@
- goto cleanup;
- }
-
--#ifdef SYSTEM_NSS
-- if (SECOID_Init() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- goto cleanup;
-- }
--#endif
--
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -307,11 +288,6 @@
- if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
--#ifdef SYSTEM_NSS
-- if (SECOID_Shutdown() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- }
--#endif
- }
- if (privKey.privateValue.data) {
- env->ReleaseByteArrayElements(privateKey,
-@@ -378,13 +354,6 @@
- goto cleanup;
- }
-
--#ifdef SYSTEM_NSS
-- if (SECOID_Init() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- goto cleanup;
-- }
--#endif
--
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -408,11 +377,6 @@
- if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
--#ifdef SYSTEM_NSS
-- if (SECOID_Shutdown() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- }
--#endif
- }
-
- if (pubKey.publicValue.data)
-@@ -474,13 +438,6 @@
- goto cleanup;
- }
-
--#ifdef SYSTEM_NSS
-- if (SECOID_Init() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- goto cleanup;
-- }
--#endif
--
- // Fill a new ECParams using the supplied OID
- if (EC_DecodeParams(¶ms_item, &ecparams, 0) != SECSuccess) {
- /* bad curve OID */
-@@ -525,11 +482,6 @@
- if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
--#ifdef SYSTEM_NSS
-- if (SECOID_Shutdown() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- }
--#endif
- }
-
- if (ecparams)
-@@ -539,4 +491,26 @@
- return jSecret;
- }
-
-+JNIEXPORT void
-+JNICALL Java_sun_security_ec_SunEC_initialize
-+ (JNIEnv *env, jclass UNUSED(clazz))
-+{
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Init() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
-+#endif
-+}
-+
-+JNIEXPORT void
-+JNICALL Java_sun_security_ec_SunEC_cleanup
-+ (JNIEnv *env, jclass UNUSED(clazz))
-+{
-+#ifdef SYSTEM_NSS
-+ if (SECOID_Shutdown() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
-+#endif
-+}
-+
- } /* extern "C" */
diff --git a/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch b/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch
new file mode 100644
index 0000000..fc8f981
--- /dev/null
+++ b/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch
@@ -0,0 +1,60 @@
+# HG changeset patch
+# User andrew
+# Date 1459487045 -3600
+# Fri Apr 01 06:04:05 2016 +0100
+# Node ID 3334efeacd8327a14b7d2f392f4546e3c29c594b
+# Parent 6b81fd2227d14226f2121f2d51b464536925686e
+PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
+
+diff --git a/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java b/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
+--- openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
++++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
+@@ -174,15 +174,20 @@
+ storeFile = new File(storeFileName);
+ fis = getFileInputStream(storeFile);
+ } else {
+- String javaHome = props.get("javaHome");
+- storeFile = new File(javaHome + sep + "lib" + sep
+- + "security" + sep +
+- "jssecacerts");
++ /* Check system cacerts DB first; /etc/pki/java/cacerts */
++ storeFile = new File(sep + "etc" + sep + "pki" + sep
++ + "java" + sep + "cacerts");
+ if ((fis = getFileInputStream(storeFile)) == null) {
++ String javaHome = props.get("javaHome");
+ storeFile = new File(javaHome + sep + "lib" + sep
+- + "security" + sep +
+- "cacerts");
+- fis = getFileInputStream(storeFile);
++ + "security" + sep +
++ "jssecacerts");
++ if ((fis = getFileInputStream(storeFile)) == null) {
++ storeFile = new File(javaHome + sep + "lib" + sep
++ + "security" + sep +
++ "cacerts");
++ fis = getFileInputStream(storeFile);
++ }
+ }
+ }
+
+diff --git a/src/share/classes/sun/security/tools/KeyStoreUtil.java b/src/share/classes/sun/security/tools/KeyStoreUtil.java
+--- openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
++++ openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
+@@ -87,9 +87,14 @@
+ throws Exception
+ {
+ String sep = File.separator;
+- File file = new File(System.getProperty("java.home") + sep
+- + "lib" + sep + "security" + sep
+- + "cacerts");
++ /* Check system cacerts DB first; /etc/pki/java/cacerts */
++ File file = new File(sep + "etc" + sep + "pki" + sep
++ + "java" + sep + "cacerts");
++ if (!file.exists()) {
++ file = new File(System.getProperty("java.home") + sep
++ + "lib" + sep + "security" + sep
++ + "cacerts");
++ }
+ if (!file.exists()) {
+ return null;
+ }
diff --git a/pr2888.patch b/pr2888.patch
deleted file mode 100644
index fc8f981..0000000
--- a/pr2888.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1459487045 -3600
-# Fri Apr 01 06:04:05 2016 +0100
-# Node ID 3334efeacd8327a14b7d2f392f4546e3c29c594b
-# Parent 6b81fd2227d14226f2121f2d51b464536925686e
-PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
-
-diff --git a/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java b/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
---- openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
-+++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
-@@ -174,15 +174,20 @@
- storeFile = new File(storeFileName);
- fis = getFileInputStream(storeFile);
- } else {
-- String javaHome = props.get("javaHome");
-- storeFile = new File(javaHome + sep + "lib" + sep
-- + "security" + sep +
-- "jssecacerts");
-+ /* Check system cacerts DB first; /etc/pki/java/cacerts */
-+ storeFile = new File(sep + "etc" + sep + "pki" + sep
-+ + "java" + sep + "cacerts");
- if ((fis = getFileInputStream(storeFile)) == null) {
-+ String javaHome = props.get("javaHome");
- storeFile = new File(javaHome + sep + "lib" + sep
-- + "security" + sep +
-- "cacerts");
-- fis = getFileInputStream(storeFile);
-+ + "security" + sep +
-+ "jssecacerts");
-+ if ((fis = getFileInputStream(storeFile)) == null) {
-+ storeFile = new File(javaHome + sep + "lib" + sep
-+ + "security" + sep +
-+ "cacerts");
-+ fis = getFileInputStream(storeFile);
-+ }
- }
- }
-
-diff --git a/src/share/classes/sun/security/tools/KeyStoreUtil.java b/src/share/classes/sun/security/tools/KeyStoreUtil.java
---- openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
-+++ openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
-@@ -87,9 +87,14 @@
- throws Exception
- {
- String sep = File.separator;
-- File file = new File(System.getProperty("java.home") + sep
-- + "lib" + sep + "security" + sep
-- + "cacerts");
-+ /* Check system cacerts DB first; /etc/pki/java/cacerts */
-+ File file = new File(sep + "etc" + sep + "pki" + sep
-+ + "java" + sep + "cacerts");
-+ if (!file.exists()) {
-+ file = new File(System.getProperty("java.home") + sep
-+ + "lib" + sep + "security" + sep
-+ + "cacerts");
-+ }
- if (!file.exists()) {
- return null;
- }
diff --git a/pr2899-dont_use_withseed_versions_of_nss_functions_as_they_dont_fully_process_the_seed.patch b/pr2899-dont_use_withseed_versions_of_nss_functions_as_they_dont_fully_process_the_seed.patch
new file mode 100644
index 0000000..ffdefb0
--- /dev/null
+++ b/pr2899-dont_use_withseed_versions_of_nss_functions_as_they_dont_fully_process_the_seed.patch
@@ -0,0 +1,24 @@
+# HG changeset patch
+# User andrew
+# Date 1459313680 -3600
+# Wed Mar 30 05:54:40 2016 +0100
+# Node ID 9dc0eca5fa8926e6a952fa4f1931e78aa1f52443
+# Parent 8957aff589013e671f02d38023d5ff245ef27e87
+PR2899: Don't use WithSeed versions of NSS functions as they don't fully process the seed
+Contributed-by: Alex Kashchenko <akashche(a)redhat.com>
+Updated 2017/07/04 to accomodate 8175110 by Andrew Hughes <gnu.andrew(a)redhat.com>
+
+diff -r e5fdbb82bd49 src/share/native/sun/security/ec/ecc_impl.h
+--- openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
++++ openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
+@@ -267,8 +267,8 @@
+
+ #ifdef SYSTEM_NSS
+ #define EC_DecodeParams(a,b,c) EC_DecodeParams(a,b)
+-#define EC_NewKey(a,b,c,d,e) EC_NewKeyFromSeed(a,b,c,d)
+-#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigestWithSeed(a,b,c,d,e)
++#define EC_NewKey(a,b,c,d,e) EC_NewKey(a,b)
++#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigest(a,b,c)
+ #define ECDSA_VerifyDigest(a,b,c,d) ECDSA_VerifyDigest(a,b,c)
+ #define ECDH_Derive(a,b,c,d,e,f) ECDH_Derive(a,b,c,d,e)
+ #else
diff --git a/pr2899.patch b/pr2899.patch
deleted file mode 100644
index ffdefb0..0000000
--- a/pr2899.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1459313680 -3600
-# Wed Mar 30 05:54:40 2016 +0100
-# Node ID 9dc0eca5fa8926e6a952fa4f1931e78aa1f52443
-# Parent 8957aff589013e671f02d38023d5ff245ef27e87
-PR2899: Don't use WithSeed versions of NSS functions as they don't fully process the seed
-Contributed-by: Alex Kashchenko <akashche(a)redhat.com>
-Updated 2017/07/04 to accomodate 8175110 by Andrew Hughes <gnu.andrew(a)redhat.com>
-
-diff -r e5fdbb82bd49 src/share/native/sun/security/ec/ecc_impl.h
---- openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
-+++ openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
-@@ -267,8 +267,8 @@
-
- #ifdef SYSTEM_NSS
- #define EC_DecodeParams(a,b,c) EC_DecodeParams(a,b)
--#define EC_NewKey(a,b,c,d,e) EC_NewKeyFromSeed(a,b,c,d)
--#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigestWithSeed(a,b,c,d,e)
-+#define EC_NewKey(a,b,c,d,e) EC_NewKey(a,b)
-+#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigest(a,b,c)
- #define ECDSA_VerifyDigest(a,b,c,d) ECDSA_VerifyDigest(a,b,c)
- #define ECDH_Derive(a,b,c,d,e,f) ECDH_Derive(a,b,c,d,e)
- #else
diff --git a/pr2934-sunec_provider_throwing_keyexception_withine.separator_current_nss_thus_initialise_the_random_number_generator_and_feed_the_seed_to_it.patch b/pr2934-sunec_provider_throwing_keyexception_withine.separator_current_nss_thus_initialise_the_random_number_generator_and_feed_the_seed_to_it.patch
new file mode 100644
index 0000000..83385da
--- /dev/null
+++ b/pr2934-sunec_provider_throwing_keyexception_withine.separator_current_nss_thus_initialise_the_random_number_generator_and_feed_the_seed_to_it.patch
@@ -0,0 +1,91 @@
+# HG changeset patch
+# User andrew
+# Date 1461349033 -3600
+# Fri Apr 22 19:17:13 2016 +0100
+# Node ID dab76de2f91cf1791c03560a3f45aaa69f8351fd
+# Parent 3fa42705acab6d69b6141f47ebba4f85739a338c
+PR2934: SunEC provider throwing KeyException with current NSS
+Summary: Initialise the random number generator and feed the seed to it.
+Updated 2017/07/04 to accomodate 8175110
+
+diff -r 8aed1e903a4c src/share/native/sun/security/ec/ECC_JNI.cpp
+--- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
++++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
+@@ -134,8 +134,17 @@
+ env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
+
+ // Generate the new keypair (using the supplied seed)
++#ifdef SYSTEM_NSS
++ if (RNG_RandomUpdate((unsigned char *) pSeedBuffer, jSeedLength)
++ != SECSuccess) {
++ ThrowException(env, KEY_EXCEPTION);
++ goto cleanup;
++ }
++ if (EC_NewKey(ecparams, &privKey) != SECSuccess) {
++#else
+ if (EC_NewKey(ecparams, &privKey, (unsigned char *) pSeedBuffer,
+ jSeedLength, 0) != SECSuccess) {
++#endif
+ ThrowException(env, KEY_EXCEPTION);
+ goto cleanup;
+ }
+@@ -267,8 +276,18 @@
+ env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
+
+ // Sign the digest (using the supplied seed)
++#ifdef SYSTEM_NSS
++ if (RNG_RandomUpdate((unsigned char *) pSeedBuffer, jSeedLength)
++ != SECSuccess) {
++ ThrowException(env, KEY_EXCEPTION);
++ goto cleanup;
++ }
++ if (ECDSA_SignDigest(&privKey, &signature_item, &digest_item)
++ != SECSuccess) {
++#else
+ if (ECDSA_SignDigest(&privKey, &signature_item, &digest_item,
+ (unsigned char *) pSeedBuffer, jSeedLength, 0, timing) != SECSuccess) {
++#endif
+ ThrowException(env, KEY_EXCEPTION);
+ goto cleanup;
+ }
+@@ -499,6 +518,9 @@
+ if (SECOID_Init() != SECSuccess) {
+ ThrowException(env, INTERNAL_ERROR);
+ }
++ if (RNG_RNGInit() != SECSuccess) {
++ ThrowException(env, INTERNAL_ERROR);
++ }
+ #endif
+ }
+
+@@ -507,6 +529,7 @@
+ (JNIEnv *env, jclass UNUSED(clazz))
+ {
+ #ifdef SYSTEM_NSS
++ RNG_RNGShutdown();
+ if (SECOID_Shutdown() != SECSuccess) {
+ ThrowException(env, INTERNAL_ERROR);
+ }
+diff -r 8aed1e903a4c src/share/native/sun/security/ec/ecc_impl.h
+--- openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
++++ openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
+@@ -254,8 +254,10 @@
+ This function is no longer required because the random bytes are now
+ supplied by the caller. Force a failure.
+ */
++#ifndef SYSTEM_NSS
+ #define RNG_GenerateGlobalRandomBytes(p,l) SECFailure
+ #endif
++#endif
+ #define CHECK_MPI_OK(func) if (MP_OKAY > (err = func)) goto cleanup
+ #define MP_TO_SEC_ERROR(err)
+
+@@ -267,8 +269,6 @@
+
+ #ifdef SYSTEM_NSS
+ #define EC_DecodeParams(a,b,c) EC_DecodeParams(a,b)
+-#define EC_NewKey(a,b,c,d,e) EC_NewKey(a,b)
+-#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigest(a,b,c)
+ #define ECDSA_VerifyDigest(a,b,c,d) ECDSA_VerifyDigest(a,b,c)
+ #define ECDH_Derive(a,b,c,d,e,f) ECDH_Derive(a,b,c,d,e)
+ #else
diff --git a/pr2934.patch b/pr2934.patch
deleted file mode 100644
index 83385da..0000000
--- a/pr2934.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1461349033 -3600
-# Fri Apr 22 19:17:13 2016 +0100
-# Node ID dab76de2f91cf1791c03560a3f45aaa69f8351fd
-# Parent 3fa42705acab6d69b6141f47ebba4f85739a338c
-PR2934: SunEC provider throwing KeyException with current NSS
-Summary: Initialise the random number generator and feed the seed to it.
-Updated 2017/07/04 to accomodate 8175110
-
-diff -r 8aed1e903a4c src/share/native/sun/security/ec/ECC_JNI.cpp
---- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
-+++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
-@@ -134,8 +134,17 @@
- env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
-
- // Generate the new keypair (using the supplied seed)
-+#ifdef SYSTEM_NSS
-+ if (RNG_RandomUpdate((unsigned char *) pSeedBuffer, jSeedLength)
-+ != SECSuccess) {
-+ ThrowException(env, KEY_EXCEPTION);
-+ goto cleanup;
-+ }
-+ if (EC_NewKey(ecparams, &privKey) != SECSuccess) {
-+#else
- if (EC_NewKey(ecparams, &privKey, (unsigned char *) pSeedBuffer,
- jSeedLength, 0) != SECSuccess) {
-+#endif
- ThrowException(env, KEY_EXCEPTION);
- goto cleanup;
- }
-@@ -267,8 +276,18 @@
- env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
-
- // Sign the digest (using the supplied seed)
-+#ifdef SYSTEM_NSS
-+ if (RNG_RandomUpdate((unsigned char *) pSeedBuffer, jSeedLength)
-+ != SECSuccess) {
-+ ThrowException(env, KEY_EXCEPTION);
-+ goto cleanup;
-+ }
-+ if (ECDSA_SignDigest(&privKey, &signature_item, &digest_item)
-+ != SECSuccess) {
-+#else
- if (ECDSA_SignDigest(&privKey, &signature_item, &digest_item,
- (unsigned char *) pSeedBuffer, jSeedLength, 0, timing) != SECSuccess) {
-+#endif
- ThrowException(env, KEY_EXCEPTION);
- goto cleanup;
- }
-@@ -499,6 +518,9 @@
- if (SECOID_Init() != SECSuccess) {
- ThrowException(env, INTERNAL_ERROR);
- }
-+ if (RNG_RNGInit() != SECSuccess) {
-+ ThrowException(env, INTERNAL_ERROR);
-+ }
- #endif
- }
-
-@@ -507,6 +529,7 @@
- (JNIEnv *env, jclass UNUSED(clazz))
- {
- #ifdef SYSTEM_NSS
-+ RNG_RNGShutdown();
- if (SECOID_Shutdown() != SECSuccess) {
- ThrowException(env, INTERNAL_ERROR);
- }
-diff -r 8aed1e903a4c src/share/native/sun/security/ec/ecc_impl.h
---- openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
-+++ openjdk/jdk/src/share/native/sun/security/ec/ecc_impl.h
-@@ -254,8 +254,10 @@
- This function is no longer required because the random bytes are now
- supplied by the caller. Force a failure.
- */
-+#ifndef SYSTEM_NSS
- #define RNG_GenerateGlobalRandomBytes(p,l) SECFailure
- #endif
-+#endif
- #define CHECK_MPI_OK(func) if (MP_OKAY > (err = func)) goto cleanup
- #define MP_TO_SEC_ERROR(err)
-
-@@ -267,8 +269,6 @@
-
- #ifdef SYSTEM_NSS
- #define EC_DecodeParams(a,b,c) EC_DecodeParams(a,b)
--#define EC_NewKey(a,b,c,d,e) EC_NewKey(a,b)
--#define ECDSA_SignDigest(a,b,c,d,e,f,g) ECDSA_SignDigest(a,b,c)
- #define ECDSA_VerifyDigest(a,b,c,d) ECDSA_VerifyDigest(a,b,c)
- #define ECDH_Derive(a,b,c,d,e,f) ECDH_Derive(a,b,c,d,e)
- #else
diff --git a/pr2974-rh1337583-add_systemlineendings_option_to_keytool_and_use_line_separator_instead_of_crlf_in_pkcs10.patch b/pr2974-rh1337583-add_systemlineendings_option_to_keytool_and_use_line_separator_instead_of_crlf_in_pkcs10.patch
new file mode 100644
index 0000000..4859ca6
--- /dev/null
+++ b/pr2974-rh1337583-add_systemlineendings_option_to_keytool_and_use_line_separator_instead_of_crlf_in_pkcs10.patch
@@ -0,0 +1,148 @@
+# HG changeset patch
+# User andrew
+# Date 1464316115 -3600
+# Fri May 27 03:28:35 2016 +0100
+# Node ID 794541fbbdc323f7da8a5cee75611f977eee66ee
+# Parent 0be28a33e12dfc9ae1e4be381530643f691d351a
+PR2974: PKCS#10 certificate requests now use CRLF line endings rather than system line endings
+Summary: Add -systemlineendings option to keytool to allow system line endings to be used again.
+
+diff --git a/src/share/classes/sun/security/pkcs10/PKCS10.java b/src/share/classes/sun/security/pkcs10/PKCS10.java
+--- openjdk/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
++++ openjdk/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
+@@ -30,6 +30,7 @@
+ import java.io.IOException;
+ import java.math.BigInteger;
+
++import java.security.AccessController;
+ import java.security.cert.CertificateException;
+ import java.security.NoSuchAlgorithmException;
+ import java.security.InvalidKeyException;
+@@ -39,6 +40,7 @@
+
+ import java.util.Base64;
+
++import sun.security.action.GetPropertyAction;
+ import sun.security.util.*;
+ import sun.security.x509.AlgorithmId;
+ import sun.security.x509.X509Key;
+@@ -76,6 +78,14 @@
+ * @author Hemma Prafullchandra
+ */
+ public class PKCS10 {
++
++ private static final byte[] sysLineEndings;
++
++ static {
++ sysLineEndings =
++ AccessController.doPrivileged(new GetPropertyAction("line.separator")).getBytes();
++ }
++
+ /**
+ * Constructs an unsigned PKCS #10 certificate request. Before this
+ * request may be used, it must be encoded and signed. Then it
+@@ -293,13 +303,39 @@
+ */
+ public void print(PrintStream out)
+ throws IOException, SignatureException {
++ print(out, false);
++ }
++
++ /**
++ * Prints an E-Mailable version of the certificate request on the print
++ * stream passed. The format is a common base64 encoded one, supported
++ * by most Certificate Authorities because Netscape web servers have
++ * used this for some time. Some certificate authorities expect some
++ * more information, in particular contact information for the web
++ * server administrator.
++ *
++ * @param out the print stream where the certificate request
++ * will be printed.
++ * @param systemLineEndings true if the request should be terminated
++ * using the system line endings.
++ * @exception IOException when an output operation failed
++ * @exception SignatureException when the certificate request was
++ * not yet signed.
++ */
++ public void print(PrintStream out, boolean systemLineEndings)
++ throws IOException, SignatureException {
++ byte[] lineEndings;
++
+ if (encoded == null)
+ throw new SignatureException("Cert request was not signed");
+
++ if (systemLineEndings)
++ lineEndings = sysLineEndings;
++ else
++ lineEndings = new byte[] {'\r', '\n'}; // CRLF
+
+- byte[] CRLF = new byte[] {'\r', '\n'};
+ out.println("-----BEGIN NEW CERTIFICATE REQUEST-----");
+- out.println(Base64.getMimeEncoder(64, CRLF).encodeToString(encoded));
++ out.println(Base64.getMimeEncoder(64, lineEndings).encodeToString(encoded));
+ out.println("-----END NEW CERTIFICATE REQUEST-----");
+ }
+
+diff --git a/src/share/classes/sun/security/tools/keytool/Main.java b/src/share/classes/sun/security/tools/keytool/Main.java
+--- openjdk/jdk/src/share/classes/sun/security/tools/keytool/Main.java
++++ openjdk/jdk/src/share/classes/sun/security/tools/keytool/Main.java
+@@ -124,6 +124,7 @@
+ private String infilename = null;
+ private String outfilename = null;
+ private String srcksfname = null;
++ private boolean systemLineEndings = false;
+
+ // User-specified providers are added before any command is called.
+ // However, they are not removed before the end of the main() method.
+@@ -186,7 +187,7 @@
+ CERTREQ("Generates.a.certificate.request",
+ ALIAS, SIGALG, FILEOUT, KEYPASS, KEYSTORE, DNAME,
+ STOREPASS, STORETYPE, PROVIDERNAME, PROVIDERCLASS,
+- PROVIDERARG, PROVIDERPATH, V, PROTECTED),
++ PROVIDERARG, PROVIDERPATH, SYSTEMLINEENDINGS, V, PROTECTED),
+ CHANGEALIAS("Changes.an.entry.s.alias",
+ ALIAS, DESTALIAS, KEYPASS, KEYSTORE, STOREPASS,
+ STORETYPE, PROVIDERNAME, PROVIDERCLASS, PROVIDERARG,
+@@ -319,6 +320,7 @@
+ STARTDATE("startdate", "<startdate>", "certificate.validity.start.date.time"),
+ STOREPASS("storepass", "<arg>", "keystore.password"),
+ STORETYPE("storetype", "<storetype>", "keystore.type"),
++ SYSTEMLINEENDINGS("systemlineendings", null, "system.line.endings"),
+ TRUSTCACERTS("trustcacerts", null, "trust.certificates.from.cacerts"),
+ V("v", null, "verbose.output"),
+ VALIDITY("validity", "<valDays>", "validity.number.of.days");
+@@ -559,6 +561,8 @@
+ protectedPath = true;
+ } else if (collator.compare(flags, "-srcprotected") == 0) {
+ srcprotectedPath = true;
++ } else if (collator.compare(flags, "-systemlineendings") == 0) {
++ systemLineEndings = true;
+ } else {
+ System.err.println(rb.getString("Illegal.option.") + flags);
+ tinyHelp();
+@@ -1463,7 +1467,7 @@
+
+ // Sign the request and base-64 encode it
+ request.encodeAndSign(subject, signature);
+- request.print(out);
++ request.print(out, systemLineEndings);
+
+ checkWeak(rb.getString("the.generated.certificate.request"), request);
+ }
+@@ -4540,4 +4544,3 @@
+ return new Pair<>(a,b);
+ }
+ }
+-
+diff --git a/src/share/classes/sun/security/tools/keytool/Resources.java b/src/share/classes/sun/security/tools/keytool/Resources.java
+--- openjdk/jdk/src/share/classes/sun/security/tools/keytool/Resources.java
++++ openjdk/jdk/src/share/classes/sun/security/tools/keytool/Resources.java
+@@ -168,6 +168,8 @@
+ "keystore password"}, //-storepass
+ {"keystore.type",
+ "keystore type"}, //-storetype
++ {"system.line.endings",
++ "use system line endings rather than CRLF to terminate output"}, //-systemlineendings
+ {"trust.certificates.from.cacerts",
+ "trust certificates from cacerts"}, //-trustcacerts
+ {"verbose.output",
diff --git a/pr2974-rh1337583.patch b/pr2974-rh1337583.patch
deleted file mode 100644
index 4859ca6..0000000
--- a/pr2974-rh1337583.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1464316115 -3600
-# Fri May 27 03:28:35 2016 +0100
-# Node ID 794541fbbdc323f7da8a5cee75611f977eee66ee
-# Parent 0be28a33e12dfc9ae1e4be381530643f691d351a
-PR2974: PKCS#10 certificate requests now use CRLF line endings rather than system line endings
-Summary: Add -systemlineendings option to keytool to allow system line endings to be used again.
-
-diff --git a/src/share/classes/sun/security/pkcs10/PKCS10.java b/src/share/classes/sun/security/pkcs10/PKCS10.java
---- openjdk/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
-+++ openjdk/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
-@@ -30,6 +30,7 @@
- import java.io.IOException;
- import java.math.BigInteger;
-
-+import java.security.AccessController;
- import java.security.cert.CertificateException;
- import java.security.NoSuchAlgorithmException;
- import java.security.InvalidKeyException;
-@@ -39,6 +40,7 @@
-
- import java.util.Base64;
-
-+import sun.security.action.GetPropertyAction;
- import sun.security.util.*;
- import sun.security.x509.AlgorithmId;
- import sun.security.x509.X509Key;
-@@ -76,6 +78,14 @@
- * @author Hemma Prafullchandra
- */
- public class PKCS10 {
-+
-+ private static final byte[] sysLineEndings;
-+
-+ static {
-+ sysLineEndings =
-+ AccessController.doPrivileged(new GetPropertyAction("line.separator")).getBytes();
-+ }
-+
- /**
- * Constructs an unsigned PKCS #10 certificate request. Before this
- * request may be used, it must be encoded and signed. Then it
-@@ -293,13 +303,39 @@
- */
- public void print(PrintStream out)
- throws IOException, SignatureException {
-+ print(out, false);
-+ }
-+
-+ /**
-+ * Prints an E-Mailable version of the certificate request on the print
-+ * stream passed. The format is a common base64 encoded one, supported
-+ * by most Certificate Authorities because Netscape web servers have
-+ * used this for some time. Some certificate authorities expect some
-+ * more information, in particular contact information for the web
-+ * server administrator.
-+ *
-+ * @param out the print stream where the certificate request
-+ * will be printed.
-+ * @param systemLineEndings true if the request should be terminated
-+ * using the system line endings.
-+ * @exception IOException when an output operation failed
-+ * @exception SignatureException when the certificate request was
-+ * not yet signed.
-+ */
-+ public void print(PrintStream out, boolean systemLineEndings)
-+ throws IOException, SignatureException {
-+ byte[] lineEndings;
-+
- if (encoded == null)
- throw new SignatureException("Cert request was not signed");
-
-+ if (systemLineEndings)
-+ lineEndings = sysLineEndings;
-+ else
-+ lineEndings = new byte[] {'\r', '\n'}; // CRLF
-
-- byte[] CRLF = new byte[] {'\r', '\n'};
- out.println("-----BEGIN NEW CERTIFICATE REQUEST-----");
-- out.println(Base64.getMimeEncoder(64, CRLF).encodeToString(encoded));
-+ out.println(Base64.getMimeEncoder(64, lineEndings).encodeToString(encoded));
- out.println("-----END NEW CERTIFICATE REQUEST-----");
- }
-
-diff --git a/src/share/classes/sun/security/tools/keytool/Main.java b/src/share/classes/sun/security/tools/keytool/Main.java
---- openjdk/jdk/src/share/classes/sun/security/tools/keytool/Main.java
-+++ openjdk/jdk/src/share/classes/sun/security/tools/keytool/Main.java
-@@ -124,6 +124,7 @@
- private String infilename = null;
- private String outfilename = null;
- private String srcksfname = null;
-+ private boolean systemLineEndings = false;
-
- // User-specified providers are added before any command is called.
- // However, they are not removed before the end of the main() method.
-@@ -186,7 +187,7 @@
- CERTREQ("Generates.a.certificate.request",
- ALIAS, SIGALG, FILEOUT, KEYPASS, KEYSTORE, DNAME,
- STOREPASS, STORETYPE, PROVIDERNAME, PROVIDERCLASS,
-- PROVIDERARG, PROVIDERPATH, V, PROTECTED),
-+ PROVIDERARG, PROVIDERPATH, SYSTEMLINEENDINGS, V, PROTECTED),
- CHANGEALIAS("Changes.an.entry.s.alias",
- ALIAS, DESTALIAS, KEYPASS, KEYSTORE, STOREPASS,
- STORETYPE, PROVIDERNAME, PROVIDERCLASS, PROVIDERARG,
-@@ -319,6 +320,7 @@
- STARTDATE("startdate", "<startdate>", "certificate.validity.start.date.time"),
- STOREPASS("storepass", "<arg>", "keystore.password"),
- STORETYPE("storetype", "<storetype>", "keystore.type"),
-+ SYSTEMLINEENDINGS("systemlineendings", null, "system.line.endings"),
- TRUSTCACERTS("trustcacerts", null, "trust.certificates.from.cacerts"),
- V("v", null, "verbose.output"),
- VALIDITY("validity", "<valDays>", "validity.number.of.days");
-@@ -559,6 +561,8 @@
- protectedPath = true;
- } else if (collator.compare(flags, "-srcprotected") == 0) {
- srcprotectedPath = true;
-+ } else if (collator.compare(flags, "-systemlineendings") == 0) {
-+ systemLineEndings = true;
- } else {
- System.err.println(rb.getString("Illegal.option.") + flags);
- tinyHelp();
-@@ -1463,7 +1467,7 @@
-
- // Sign the request and base-64 encode it
- request.encodeAndSign(subject, signature);
-- request.print(out);
-+ request.print(out, systemLineEndings);
-
- checkWeak(rb.getString("the.generated.certificate.request"), request);
- }
-@@ -4540,4 +4544,3 @@
- return new Pair<>(a,b);
- }
- }
--
-diff --git a/src/share/classes/sun/security/tools/keytool/Resources.java b/src/share/classes/sun/security/tools/keytool/Resources.java
---- openjdk/jdk/src/share/classes/sun/security/tools/keytool/Resources.java
-+++ openjdk/jdk/src/share/classes/sun/security/tools/keytool/Resources.java
-@@ -168,6 +168,8 @@
- "keystore password"}, //-storepass
- {"keystore.type",
- "keystore type"}, //-storetype
-+ {"system.line.endings",
-+ "use system line endings rather than CRLF to terminate output"}, //-systemlineendings
- {"trust.certificates.from.cacerts",
- "trust certificates from cacerts"}, //-trustcacerts
- {"verbose.output",
diff --git a/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch b/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch
new file mode 100644
index 0000000..d44ed1d
--- /dev/null
+++ b/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch
@@ -0,0 +1,152 @@
+# HG changeset patch
+# User andrew
+# Date 1467652889 -3600
+# Mon Jul 04 18:21:29 2016 +0100
+# Node ID a4541d1d8609cadb08d3e31b40b9184ff32dd6c3
+# Parent bc6eab2038c603afb2eb2b4644f3b900c8fd0c46
+PR3083, RH1346460: Regression in SSL debug output without an ECC provider
+Summary: Return null rather than throwing an exception when there's no ECC provider.
+
+diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/Debug.java
+--- openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 17:08:12 2016 +0100
++++ openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 18:21:29 2016 +0100
+@@ -73,6 +73,7 @@
+ System.err.println("certpath PKIX CertPathBuilder and");
+ System.err.println(" CertPathValidator debugging");
+ System.err.println("combiner SubjectDomainCombiner debugging");
++ System.err.println("ecc Elliptic Curve Cryptography debugging");
+ System.err.println("gssloginconfig");
+ System.err.println(" GSS LoginConfigImpl debugging");
+ System.err.println("configfile JAAS ConfigFile loading");
+diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/ECUtil.java
+--- openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 17:08:12 2016 +0100
++++ openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 18:21:29 2016 +0100
+@@ -41,6 +41,9 @@
+
+ public class ECUtil {
+
++ /* Are we debugging ? */
++ private static final Debug debug = Debug.getInstance("ecc");
++
+ // Used by SunPKCS11 and SunJSSE.
+ public static ECPoint decodePoint(byte[] data, EllipticCurve curve)
+ throws IOException {
+@@ -90,6 +93,10 @@
+ }
+
+ private static AlgorithmParameters getECParameters(Provider p) {
++ return getECParameters(p, false);
++ }
++
++ private static AlgorithmParameters getECParameters(Provider p, boolean throwException) {
+ try {
+ if (p != null) {
+ return AlgorithmParameters.getInstance("EC", p);
+@@ -97,13 +104,21 @@
+
+ return AlgorithmParameters.getInstance("EC");
+ } catch (NoSuchAlgorithmException nsae) {
+- throw new RuntimeException(nsae);
++ if (throwException) {
++ throw new RuntimeException(nsae);
++ } else {
++ // ECC provider is optional so just return null
++ if (debug != null) {
++ debug.println("Provider unavailable: " + nsae);
++ }
++ return null;
++ }
+ }
+ }
+
+ public static byte[] encodeECParameterSpec(Provider p,
+ ECParameterSpec spec) {
+- AlgorithmParameters parameters = getECParameters(p);
++ AlgorithmParameters parameters = getECParameters(p, true);
+
+ try {
+ parameters.init(spec);
+@@ -122,11 +137,16 @@
+ public static ECParameterSpec getECParameterSpec(Provider p,
+ ECParameterSpec spec) {
+ AlgorithmParameters parameters = getECParameters(p);
++ if (parameters == null)
++ return null;
+
+ try {
+ parameters.init(spec);
+ return parameters.getParameterSpec(ECParameterSpec.class);
+ } catch (InvalidParameterSpecException ipse) {
++ if (debug != null) {
++ debug.println("Invalid parameter specification: " + ipse);
++ }
+ return null;
+ }
+ }
+@@ -135,34 +155,49 @@
+ byte[] params)
+ throws IOException {
+ AlgorithmParameters parameters = getECParameters(p);
++ if (parameters == null)
++ return null;
+
+ parameters.init(params);
+
+ try {
+ return parameters.getParameterSpec(ECParameterSpec.class);
+ } catch (InvalidParameterSpecException ipse) {
++ if (debug != null) {
++ debug.println("Invalid parameter specification: " + ipse);
++ }
+ return null;
+ }
+ }
+
+ public static ECParameterSpec getECParameterSpec(Provider p, String name) {
+ AlgorithmParameters parameters = getECParameters(p);
++ if (parameters == null)
++ return null;
+
+ try {
+ parameters.init(new ECGenParameterSpec(name));
+ return parameters.getParameterSpec(ECParameterSpec.class);
+ } catch (InvalidParameterSpecException ipse) {
++ if (debug != null) {
++ debug.println("Invalid parameter specification: " + ipse);
++ }
+ return null;
+ }
+ }
+
+ public static ECParameterSpec getECParameterSpec(Provider p, int keySize) {
+ AlgorithmParameters parameters = getECParameters(p);
++ if (parameters == null)
++ return null;
+
+ try {
+ parameters.init(new ECKeySizeParameterSpec(keySize));
+ return parameters.getParameterSpec(ECParameterSpec.class);
+ } catch (InvalidParameterSpecException ipse) {
++ if (debug != null) {
++ debug.println("Invalid parameter specification: " + ipse);
++ }
+ return null;
+ }
+
+@@ -171,11 +206,16 @@
+ public static String getCurveName(Provider p, ECParameterSpec spec) {
+ ECGenParameterSpec nameSpec;
+ AlgorithmParameters parameters = getECParameters(p);
++ if (parameters == null)
++ return null;
+
+ try {
+ parameters.init(spec);
+ nameSpec = parameters.getParameterSpec(ECGenParameterSpec.class);
+ } catch (InvalidParameterSpecException ipse) {
++ if (debug != null) {
++ debug.println("Invalid parameter specification: " + ipse);
++ }
+ return null;
+ }
+
diff --git a/pr3083-rh1346460.patch b/pr3083-rh1346460.patch
deleted file mode 100644
index d44ed1d..0000000
--- a/pr3083-rh1346460.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1467652889 -3600
-# Mon Jul 04 18:21:29 2016 +0100
-# Node ID a4541d1d8609cadb08d3e31b40b9184ff32dd6c3
-# Parent bc6eab2038c603afb2eb2b4644f3b900c8fd0c46
-PR3083, RH1346460: Regression in SSL debug output without an ECC provider
-Summary: Return null rather than throwing an exception when there's no ECC provider.
-
-diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/Debug.java
---- openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 17:08:12 2016 +0100
-+++ openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 18:21:29 2016 +0100
-@@ -73,6 +73,7 @@
- System.err.println("certpath PKIX CertPathBuilder and");
- System.err.println(" CertPathValidator debugging");
- System.err.println("combiner SubjectDomainCombiner debugging");
-+ System.err.println("ecc Elliptic Curve Cryptography debugging");
- System.err.println("gssloginconfig");
- System.err.println(" GSS LoginConfigImpl debugging");
- System.err.println("configfile JAAS ConfigFile loading");
-diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/ECUtil.java
---- openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 17:08:12 2016 +0100
-+++ openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 18:21:29 2016 +0100
-@@ -41,6 +41,9 @@
-
- public class ECUtil {
-
-+ /* Are we debugging ? */
-+ private static final Debug debug = Debug.getInstance("ecc");
-+
- // Used by SunPKCS11 and SunJSSE.
- public static ECPoint decodePoint(byte[] data, EllipticCurve curve)
- throws IOException {
-@@ -90,6 +93,10 @@
- }
-
- private static AlgorithmParameters getECParameters(Provider p) {
-+ return getECParameters(p, false);
-+ }
-+
-+ private static AlgorithmParameters getECParameters(Provider p, boolean throwException) {
- try {
- if (p != null) {
- return AlgorithmParameters.getInstance("EC", p);
-@@ -97,13 +104,21 @@
-
- return AlgorithmParameters.getInstance("EC");
- } catch (NoSuchAlgorithmException nsae) {
-- throw new RuntimeException(nsae);
-+ if (throwException) {
-+ throw new RuntimeException(nsae);
-+ } else {
-+ // ECC provider is optional so just return null
-+ if (debug != null) {
-+ debug.println("Provider unavailable: " + nsae);
-+ }
-+ return null;
-+ }
- }
- }
-
- public static byte[] encodeECParameterSpec(Provider p,
- ECParameterSpec spec) {
-- AlgorithmParameters parameters = getECParameters(p);
-+ AlgorithmParameters parameters = getECParameters(p, true);
-
- try {
- parameters.init(spec);
-@@ -122,11 +137,16 @@
- public static ECParameterSpec getECParameterSpec(Provider p,
- ECParameterSpec spec) {
- AlgorithmParameters parameters = getECParameters(p);
-+ if (parameters == null)
-+ return null;
-
- try {
- parameters.init(spec);
- return parameters.getParameterSpec(ECParameterSpec.class);
- } catch (InvalidParameterSpecException ipse) {
-+ if (debug != null) {
-+ debug.println("Invalid parameter specification: " + ipse);
-+ }
- return null;
- }
- }
-@@ -135,34 +155,49 @@
- byte[] params)
- throws IOException {
- AlgorithmParameters parameters = getECParameters(p);
-+ if (parameters == null)
-+ return null;
-
- parameters.init(params);
-
- try {
- return parameters.getParameterSpec(ECParameterSpec.class);
- } catch (InvalidParameterSpecException ipse) {
-+ if (debug != null) {
-+ debug.println("Invalid parameter specification: " + ipse);
-+ }
- return null;
- }
- }
-
- public static ECParameterSpec getECParameterSpec(Provider p, String name) {
- AlgorithmParameters parameters = getECParameters(p);
-+ if (parameters == null)
-+ return null;
-
- try {
- parameters.init(new ECGenParameterSpec(name));
- return parameters.getParameterSpec(ECParameterSpec.class);
- } catch (InvalidParameterSpecException ipse) {
-+ if (debug != null) {
-+ debug.println("Invalid parameter specification: " + ipse);
-+ }
- return null;
- }
- }
-
- public static ECParameterSpec getECParameterSpec(Provider p, int keySize) {
- AlgorithmParameters parameters = getECParameters(p);
-+ if (parameters == null)
-+ return null;
-
- try {
- parameters.init(new ECKeySizeParameterSpec(keySize));
- return parameters.getParameterSpec(ECParameterSpec.class);
- } catch (InvalidParameterSpecException ipse) {
-+ if (debug != null) {
-+ debug.println("Invalid parameter specification: " + ipse);
-+ }
- return null;
- }
-
-@@ -171,11 +206,16 @@
- public static String getCurveName(Provider p, ECParameterSpec spec) {
- ECGenParameterSpec nameSpec;
- AlgorithmParameters parameters = getECParameters(p);
-+ if (parameters == null)
-+ return null;
-
- try {
- parameters.init(spec);
- nameSpec = parameters.getParameterSpec(ECGenParameterSpec.class);
- } catch (InvalidParameterSpecException ipse) {
-+ if (debug != null) {
-+ debug.println("Invalid parameter specification: " + ipse);
-+ }
- return null;
- }
-
diff --git a/pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch b/pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch
new file mode 100644
index 0000000..5a619b4
--- /dev/null
+++ b/pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch
@@ -0,0 +1,158 @@
+
+# HG changeset patch
+# User andrew
+# Date 1478057514 0
+# Node ID 1c4d5cb2096ae55106111da200b0bcad304f650c
+# Parent 3d53f19b48384e5252f4ec8891f7a3a82d77af2a
+PR3183: Support Fedora/RHEL system crypto policy
+
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/classes/java/security/Security.java
+--- openjdk/jdk/src/share/classes/java/security/Security.java Wed Oct 26 03:51:39 2016 +0100
++++ openjdk/jdk/src/share/classes/java/security/Security.java Wed Nov 02 03:31:54 2016 +0000
+@@ -43,6 +43,9 @@
+ * implementation-specific location, which is typically the properties file
+ * {@code lib/security/java.security} in the Java installation directory.
+ *
++ * <p>Additional default values of security properties are read from a
++ * system-specific location, if available.</p>
++ *
+ * @author Benjamin Renaud
+ */
+
+@@ -52,6 +55,10 @@
+ private static final Debug sdebug =
+ Debug.getInstance("properties");
+
++ /* System property file*/
++ private static final String SYSTEM_PROPERTIES =
++ "/etc/crypto-policies/back-ends/java.config";
++
+ /* The java.security properties */
+ private static Properties props;
+
+@@ -93,6 +100,7 @@
+ if (sdebug != null) {
+ sdebug.println("reading security properties file: " +
+ propFile);
++ sdebug.println(props.toString());
+ }
+ } catch (IOException e) {
+ if (sdebug != null) {
+@@ -114,6 +122,31 @@
+ }
+
+ if ("true".equalsIgnoreCase(props.getProperty
++ ("security.useSystemPropertiesFile"))) {
++
++ // now load the system file, if it exists, so its values
++ // will win if they conflict with the earlier values
++ try (BufferedInputStream bis =
++ new BufferedInputStream(new FileInputStream(SYSTEM_PROPERTIES))) {
++ props.load(bis);
++ loadedProps = true;
++
++ if (sdebug != null) {
++ sdebug.println("reading system security properties file " +
++ SYSTEM_PROPERTIES);
++ sdebug.println(props.toString());
++ }
++ } catch (IOException e) {
++ if (sdebug != null) {
++ sdebug.println
++ ("unable to load security properties from " +
++ SYSTEM_PROPERTIES);
++ e.printStackTrace();
++ }
++ }
++ }
++
++ if ("true".equalsIgnoreCase(props.getProperty
+ ("security.overridePropertiesFile"))) {
+
+ String extraPropFile = System.getProperty
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-aix
+--- openjdk/jdk/src/share/lib/security/java.security-aix Wed Oct 26 03:51:39 2016 +0100
++++ openjdk/jdk/src/share/lib/security/java.security-aix Wed Nov 02 03:31:54 2016 +0000
+@@ -276,6 +276,13 @@
+ security.overridePropertiesFile=true
+
+ #
++# Determines whether this properties file will be appended to
++# using the system properties file stored at
++# /etc/crypto-policies/back-ends/java.config
++#
++security.useSystemPropertiesFile=false
++
++#
+ # Determines the default key and trust manager factory algorithms for
+ # the javax.net.ssl package.
+ #
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-linux
+--- openjdk/jdk/src/share/lib/security/java.security-linux Wed Oct 26 03:51:39 2016 +0100
++++ openjdk/jdk/src/share/lib/security/java.security-linux Wed Nov 02 03:31:54 2016 +0000
+@@ -276,6 +276,13 @@
+ security.overridePropertiesFile=true
+
+ #
++# Determines whether this properties file will be appended to
++# using the system properties file stored at
++# /etc/crypto-policies/back-ends/java.config
++#
++security.useSystemPropertiesFile=true
++
++#
+ # Determines the default key and trust manager factory algorithms for
+ # the javax.net.ssl package.
+ #
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-macosx
+--- openjdk/jdk/src/share/lib/security/java.security-macosx Wed Oct 26 03:51:39 2016 +0100
++++ openjdk/jdk/src/share/lib/security/java.security-macosx Wed Nov 02 03:31:54 2016 +0000
+@@ -279,6 +279,13 @@
+ security.overridePropertiesFile=true
+
+ #
++# Determines whether this properties file will be appended to
++# using the system properties file stored at
++# /etc/crypto-policies/back-ends/java.config
++#
++security.useSystemPropertiesFile=false
++
++#
+ # Determines the default key and trust manager factory algorithms for
+ # the javax.net.ssl package.
+ #
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-solaris
+--- openjdk/jdk/src/share/lib/security/java.security-solaris Wed Oct 26 03:51:39 2016 +0100
++++ openjdk/jdk/src/share/lib/security/java.security-solaris Wed Nov 02 03:31:54 2016 +0000
+@@ -278,6 +278,13 @@
+ security.overridePropertiesFile=true
+
+ #
++# Determines whether this properties file will be appended to
++# using the system properties file stored at
++# /etc/crypto-policies/back-ends/java.config
++#
++security.useSystemPropertiesFile=false
++
++#
+ # Determines the default key and trust manager factory algorithms for
+ # the javax.net.ssl package.
+ #
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-windows
+--- openjdk/jdk/src/share/lib/security/java.security-windows Wed Oct 26 03:51:39 2016 +0100
++++ openjdk/jdk/src/share/lib/security/java.security-windows Wed Nov 02 03:31:54 2016 +0000
+@@ -279,6 +279,13 @@
+ security.overridePropertiesFile=true
+
+ #
++# Determines whether this properties file will be appended to
++# using the system properties file stored at
++# /etc/crypto-policies/back-ends/java.config
++#
++security.useSystemPropertiesFile=false
++
++#
+ # Determines the default key and trust manager factory algorithms for
+ # the javax.net.ssl package.
+ #
+
diff --git a/pr3183-rh1340845-system-crypto-policy.patch b/pr3183-rh1340845-system-crypto-policy.patch
deleted file mode 100644
index 5a619b4..0000000
--- a/pr3183-rh1340845-system-crypto-policy.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-
-# HG changeset patch
-# User andrew
-# Date 1478057514 0
-# Node ID 1c4d5cb2096ae55106111da200b0bcad304f650c
-# Parent 3d53f19b48384e5252f4ec8891f7a3a82d77af2a
-PR3183: Support Fedora/RHEL system crypto policy
-
-diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/classes/java/security/Security.java
---- openjdk/jdk/src/share/classes/java/security/Security.java Wed Oct 26 03:51:39 2016 +0100
-+++ openjdk/jdk/src/share/classes/java/security/Security.java Wed Nov 02 03:31:54 2016 +0000
-@@ -43,6 +43,9 @@
- * implementation-specific location, which is typically the properties file
- * {@code lib/security/java.security} in the Java installation directory.
- *
-+ * <p>Additional default values of security properties are read from a
-+ * system-specific location, if available.</p>
-+ *
- * @author Benjamin Renaud
- */
-
-@@ -52,6 +55,10 @@
- private static final Debug sdebug =
- Debug.getInstance("properties");
-
-+ /* System property file*/
-+ private static final String SYSTEM_PROPERTIES =
-+ "/etc/crypto-policies/back-ends/java.config";
-+
- /* The java.security properties */
- private static Properties props;
-
-@@ -93,6 +100,7 @@
- if (sdebug != null) {
- sdebug.println("reading security properties file: " +
- propFile);
-+ sdebug.println(props.toString());
- }
- } catch (IOException e) {
- if (sdebug != null) {
-@@ -114,6 +122,31 @@
- }
-
- if ("true".equalsIgnoreCase(props.getProperty
-+ ("security.useSystemPropertiesFile"))) {
-+
-+ // now load the system file, if it exists, so its values
-+ // will win if they conflict with the earlier values
-+ try (BufferedInputStream bis =
-+ new BufferedInputStream(new FileInputStream(SYSTEM_PROPERTIES))) {
-+ props.load(bis);
-+ loadedProps = true;
-+
-+ if (sdebug != null) {
-+ sdebug.println("reading system security properties file " +
-+ SYSTEM_PROPERTIES);
-+ sdebug.println(props.toString());
-+ }
-+ } catch (IOException e) {
-+ if (sdebug != null) {
-+ sdebug.println
-+ ("unable to load security properties from " +
-+ SYSTEM_PROPERTIES);
-+ e.printStackTrace();
-+ }
-+ }
-+ }
-+
-+ if ("true".equalsIgnoreCase(props.getProperty
- ("security.overridePropertiesFile"))) {
-
- String extraPropFile = System.getProperty
-diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-aix
---- openjdk/jdk/src/share/lib/security/java.security-aix Wed Oct 26 03:51:39 2016 +0100
-+++ openjdk/jdk/src/share/lib/security/java.security-aix Wed Nov 02 03:31:54 2016 +0000
-@@ -276,6 +276,13 @@
- security.overridePropertiesFile=true
-
- #
-+# Determines whether this properties file will be appended to
-+# using the system properties file stored at
-+# /etc/crypto-policies/back-ends/java.config
-+#
-+security.useSystemPropertiesFile=false
-+
-+#
- # Determines the default key and trust manager factory algorithms for
- # the javax.net.ssl package.
- #
-diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-linux
---- openjdk/jdk/src/share/lib/security/java.security-linux Wed Oct 26 03:51:39 2016 +0100
-+++ openjdk/jdk/src/share/lib/security/java.security-linux Wed Nov 02 03:31:54 2016 +0000
-@@ -276,6 +276,13 @@
- security.overridePropertiesFile=true
-
- #
-+# Determines whether this properties file will be appended to
-+# using the system properties file stored at
-+# /etc/crypto-policies/back-ends/java.config
-+#
-+security.useSystemPropertiesFile=true
-+
-+#
- # Determines the default key and trust manager factory algorithms for
- # the javax.net.ssl package.
- #
-diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-macosx
---- openjdk/jdk/src/share/lib/security/java.security-macosx Wed Oct 26 03:51:39 2016 +0100
-+++ openjdk/jdk/src/share/lib/security/java.security-macosx Wed Nov 02 03:31:54 2016 +0000
-@@ -279,6 +279,13 @@
- security.overridePropertiesFile=true
-
- #
-+# Determines whether this properties file will be appended to
-+# using the system properties file stored at
-+# /etc/crypto-policies/back-ends/java.config
-+#
-+security.useSystemPropertiesFile=false
-+
-+#
- # Determines the default key and trust manager factory algorithms for
- # the javax.net.ssl package.
- #
-diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-solaris
---- openjdk/jdk/src/share/lib/security/java.security-solaris Wed Oct 26 03:51:39 2016 +0100
-+++ openjdk/jdk/src/share/lib/security/java.security-solaris Wed Nov 02 03:31:54 2016 +0000
-@@ -278,6 +278,13 @@
- security.overridePropertiesFile=true
-
- #
-+# Determines whether this properties file will be appended to
-+# using the system properties file stored at
-+# /etc/crypto-policies/back-ends/java.config
-+#
-+security.useSystemPropertiesFile=false
-+
-+#
- # Determines the default key and trust manager factory algorithms for
- # the javax.net.ssl package.
- #
-diff -r 3d53f19b4838 -r 1c4d5cb2096a src/share/lib/security/java.security-windows
---- openjdk/jdk/src/share/lib/security/java.security-windows Wed Oct 26 03:51:39 2016 +0100
-+++ openjdk/jdk/src/share/lib/security/java.security-windows Wed Nov 02 03:31:54 2016 +0000
-@@ -279,6 +279,13 @@
- security.overridePropertiesFile=true
-
- #
-+# Determines whether this properties file will be appended to
-+# using the system properties file stored at
-+# /etc/crypto-policies/back-ends/java.config
-+#
-+security.useSystemPropertiesFile=false
-+
-+#
- # Determines the default key and trust manager factory algorithms for
- # the javax.net.ssl package.
- #
-
diff --git a/pr3479-rh1486025-sunec_provider_can_have_multiple_instances_leading_to_premature_nss_shutdown.patch b/pr3479-rh1486025-sunec_provider_can_have_multiple_instances_leading_to_premature_nss_shutdown.patch
new file mode 100644
index 0000000..14c693b
--- /dev/null
+++ b/pr3479-rh1486025-sunec_provider_can_have_multiple_instances_leading_to_premature_nss_shutdown.patch
@@ -0,0 +1,67 @@
+# HG changeset patch
+# User andrew
+# Date 1508194072 -3600
+# Mon Oct 16 23:47:52 2017 +0100
+# Node ID 5dcb55da00c1531264934559c9f10c2e0ae46420
+# Parent bf62c56e3604fee0018b19f65fd56c76dc156630
+PR3479, RH1486025: ECC and NSS JVM crash
+Summary: SunEC provider can have multiple instances, leading to premature NSS shutdown
+Contributed-by: Martin Balao <mbalao(a)redhat.com>
+
+diff --git a/make/mapfiles/libsunec/mapfile-vers b/make/mapfiles/libsunec/mapfile-vers
+--- openjdk/jdk/make/mapfiles/libsunec/mapfile-vers
++++ openjdk/jdk/make/mapfiles/libsunec/mapfile-vers
+@@ -32,7 +32,6 @@
+ Java_sun_security_ec_ECDSASignature_verifySignedDigest;
+ Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
+ Java_sun_security_ec_SunEC_initialize;
+- Java_sun_security_ec_SunEC_cleanup;
+ local:
+ *;
+ };
+diff --git a/src/share/classes/sun/security/ec/SunEC.java b/src/share/classes/sun/security/ec/SunEC.java
+--- openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java
++++ openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java
+@@ -83,21 +83,8 @@
+ }
+
+ /**
+- * Cleanup native resources during finalisation.
+- */
+- @Override
+- protected void finalize() {
+- cleanup();
+- }
+-
+- /**
+ * Initialize the native code.
+ */
+ private static native void initialize();
+
+- /**
+- * Cleanup in the native layer.
+- */
+- private static native void cleanup();
+-
+ }
+diff --git a/src/share/native/sun/security/ec/ECC_JNI.cpp b/src/share/native/sun/security/ec/ECC_JNI.cpp
+--- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
++++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
+@@ -525,14 +525,12 @@
+ }
+
+ JNIEXPORT void
+-JNICALL Java_sun_security_ec_SunEC_cleanup
+- (JNIEnv *env, jclass UNUSED(clazz))
++JNICALL JNI_OnUnload
++ (JavaVM *vm, void *reserved)
+ {
+ #ifdef SYSTEM_NSS
+ RNG_RNGShutdown();
+- if (SECOID_Shutdown() != SECSuccess) {
+- ThrowException(env, INTERNAL_ERROR);
+- }
++ SECOID_Shutdown();
+ #endif
+ }
+
diff --git a/pr3479-rh1486025.patch b/pr3479-rh1486025.patch
deleted file mode 100644
index 14c693b..0000000
--- a/pr3479-rh1486025.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1508194072 -3600
-# Mon Oct 16 23:47:52 2017 +0100
-# Node ID 5dcb55da00c1531264934559c9f10c2e0ae46420
-# Parent bf62c56e3604fee0018b19f65fd56c76dc156630
-PR3479, RH1486025: ECC and NSS JVM crash
-Summary: SunEC provider can have multiple instances, leading to premature NSS shutdown
-Contributed-by: Martin Balao <mbalao(a)redhat.com>
-
-diff --git a/make/mapfiles/libsunec/mapfile-vers b/make/mapfiles/libsunec/mapfile-vers
---- openjdk/jdk/make/mapfiles/libsunec/mapfile-vers
-+++ openjdk/jdk/make/mapfiles/libsunec/mapfile-vers
-@@ -32,7 +32,6 @@
- Java_sun_security_ec_ECDSASignature_verifySignedDigest;
- Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
- Java_sun_security_ec_SunEC_initialize;
-- Java_sun_security_ec_SunEC_cleanup;
- local:
- *;
- };
-diff --git a/src/share/classes/sun/security/ec/SunEC.java b/src/share/classes/sun/security/ec/SunEC.java
---- openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java
-+++ openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java
-@@ -83,21 +83,8 @@
- }
-
- /**
-- * Cleanup native resources during finalisation.
-- */
-- @Override
-- protected void finalize() {
-- cleanup();
-- }
--
-- /**
- * Initialize the native code.
- */
- private static native void initialize();
-
-- /**
-- * Cleanup in the native layer.
-- */
-- private static native void cleanup();
--
- }
-diff --git a/src/share/native/sun/security/ec/ECC_JNI.cpp b/src/share/native/sun/security/ec/ECC_JNI.cpp
---- openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
-+++ openjdk/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
-@@ -525,14 +525,12 @@
- }
-
- JNIEXPORT void
--JNICALL Java_sun_security_ec_SunEC_cleanup
-- (JNIEnv *env, jclass UNUSED(clazz))
-+JNICALL JNI_OnUnload
-+ (JavaVM *vm, void *reserved)
- {
- #ifdef SYSTEM_NSS
- RNG_RNGShutdown();
-- if (SECOID_Shutdown() != SECSuccess) {
-- ThrowException(env, INTERNAL_ERROR);
-- }
-+ SECOID_Shutdown();
- #endif
- }
-
diff --git a/pr3519-fix_further_functions_with_a_missing_return_value.patch b/pr3519-fix_further_functions_with_a_missing_return_value.patch
new file mode 100644
index 0000000..51ca7f1
--- /dev/null
+++ b/pr3519-fix_further_functions_with_a_missing_return_value.patch
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User andrew
+# Date 1518669922 0
+# Thu Feb 15 04:45:22 2018 +0000
+# Node ID adaf109718c10888cce5b6e73af7f3e15a7ab0db
+# Parent 3ade0115344b77e6d00462044e0cf68722685bfe
+PR3519: Fix further functions with a missing return value.
+
+diff --git openjdk.orig/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
+--- openjdk.orig/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
++++ openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
+@@ -205,6 +205,7 @@
+ return Address(base, tmp, Address::lsl(addr->scale()));
+ }
+ }
++ return Address();
+ }
+
+ Address LIR_Assembler::as_Address_hi(LIR_Address* addr) {
diff --git a/pr3559-use_ldrexd_for_atomic_reads_on_armv7_zero.patch b/pr3559-use_ldrexd_for_atomic_reads_on_armv7_zero.patch
new file mode 100644
index 0000000..1c322fa
--- /dev/null
+++ b/pr3559-use_ldrexd_for_atomic_reads_on_armv7_zero.patch
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User aph
+# Date 1338206478 14400
+# Mon May 28 08:01:18 2012 -0400
+# Node ID 6275d7b419091092752d5a1854194c98897892ba
+# Parent be1379a186ba527b32c93a83e04c9600735fe44b
+PR3559: Use ldrexd for atomic reads on ARMv7.
+
+2012-05-28 Andrew Haley <aph(a)redhat.com>
+
+ * os_linux_zero.hpp (atomic_copy64): Use ldrexd for atomic reads
+ on ARMv7.
+
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
+@@ -54,6 +54,12 @@
+ "std %0, %1\n"
+ : "=&f"(tmp), "=Q"(*(volatile double*)dst)
+ : "Q"(*(volatile double*)src));
++#elif defined(__ARM_ARCH_7A__)
++ jlong tmp;
++ asm volatile ("ldrexd %0, [%1]\n"
++ : "=r"(tmp)
++ : "r"(src), "m"(src));
++ *(jlong *) dst = tmp;
+ #else
+ *(jlong *) dst = *(jlong *) src;
+ #endif
diff --git a/pr3559.patch b/pr3559.patch
deleted file mode 100644
index 48211dc..0000000
--- a/pr3559.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# HG changeset patch
-# User aph
-# Date 1338206478 14400
-# Mon May 28 08:01:18 2012 -0400
-# Node ID 6275d7b419091092752d5a1854194c98897892ba
-# Parent be1379a186ba527b32c93a83e04c9600735fe44b
-PR3559: Use ldrexd for atomic reads on ARMv7.
-
-2012-05-28 Andrew Haley <aph(a)redhat.com>
-
- * os_linux_zero.hpp (atomic_copy64): Use ldrexd for atomic reads
- on ARMv7.
-
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-@@ -54,6 +54,12 @@
- "std %0, 0(%2)\n"
- : "=r"(tmp)
- : "a"(src), "a"(dst));
-+#elif defined(__ARM_ARCH_7A__)
-+ jlong tmp;
-+ asm volatile ("ldrexd %0, [%1]\n"
-+ : "=r"(tmp)
-+ : "r"(src), "m"(src));
-+ *(jlong *) dst = tmp;
- #else
- *(jlong *) dst = *(jlong *) src;
- #endif
diff --git a/pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch b/pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch
new file mode 100644
index 0000000..ce24c59
--- /dev/null
+++ b/pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch
@@ -0,0 +1,42 @@
+# HG changeset patch
+# User andrew
+# Date 1525111445 -3600
+# Mon Apr 30 19:04:05 2018 +0100
+# Node ID 388fc8da23044317c160678ffa8ff541c216a255
+# Parent 556adf3a76aa81bf3918d7d46554dae7cc1d5c5c
+PR3575: System cacerts database handling should not affect jssecacerts
+
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
++++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
+@@ -162,7 +162,7 @@
+ * Try:
+ * javax.net.ssl.trustStore (if this variable exists, stop)
+ * jssecacerts
+- * cacerts
++ * cacerts (system and local)
+ *
+ * If none exists, we use an empty keystore.
+ */
+@@ -174,14 +174,14 @@
+ storeFile = new File(storeFileName);
+ fis = getFileInputStream(storeFile);
+ } else {
+- /* Check system cacerts DB first; /etc/pki/java/cacerts */
+- storeFile = new File(sep + "etc" + sep + "pki" + sep
+- + "java" + sep + "cacerts");
++ String javaHome = props.get("javaHome");
++ storeFile = new File(javaHome + sep + "lib" + sep
++ + "security" + sep +
++ "jssecacerts");
+ if ((fis = getFileInputStream(storeFile)) == null) {
+- String javaHome = props.get("javaHome");
+- storeFile = new File(javaHome + sep + "lib" + sep
+- + "security" + sep +
+- "jssecacerts");
++ /* Check system cacerts DB first; /etc/pki/java/cacerts */
++ storeFile = new File(sep + "etc" + sep + "pki" + sep
++ + "java" + sep + "cacerts");
+ if ((fis = getFileInputStream(storeFile)) == null) {
+ storeFile = new File(javaHome + sep + "lib" + sep
+ + "security" + sep +
diff --git a/pr3575-rh1567204.patch b/pr3575-rh1567204.patch
deleted file mode 100644
index ce24c59..0000000
--- a/pr3575-rh1567204.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1525111445 -3600
-# Mon Apr 30 19:04:05 2018 +0100
-# Node ID 388fc8da23044317c160678ffa8ff541c216a255
-# Parent 556adf3a76aa81bf3918d7d46554dae7cc1d5c5c
-PR3575: System cacerts database handling should not affect jssecacerts
-
-diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
---- openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
-+++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
-@@ -162,7 +162,7 @@
- * Try:
- * javax.net.ssl.trustStore (if this variable exists, stop)
- * jssecacerts
-- * cacerts
-+ * cacerts (system and local)
- *
- * If none exists, we use an empty keystore.
- */
-@@ -174,14 +174,14 @@
- storeFile = new File(storeFileName);
- fis = getFileInputStream(storeFile);
- } else {
-- /* Check system cacerts DB first; /etc/pki/java/cacerts */
-- storeFile = new File(sep + "etc" + sep + "pki" + sep
-- + "java" + sep + "cacerts");
-+ String javaHome = props.get("javaHome");
-+ storeFile = new File(javaHome + sep + "lib" + sep
-+ + "security" + sep +
-+ "jssecacerts");
- if ((fis = getFileInputStream(storeFile)) == null) {
-- String javaHome = props.get("javaHome");
-- storeFile = new File(javaHome + sep + "lib" + sep
-- + "security" + sep +
-- "jssecacerts");
-+ /* Check system cacerts DB first; /etc/pki/java/cacerts */
-+ storeFile = new File(sep + "etc" + sep + "pki" + sep
-+ + "java" + sep + "cacerts");
- if ((fis = getFileInputStream(storeFile)) == null) {
- storeFile = new File(javaHome + sep + "lib" + sep
- + "security" + sep +
diff --git a/pr3591.patch b/pr3591.patch
deleted file mode 100644
index e287590..0000000
--- a/pr3591.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1526489197 -3600
-# Wed May 16 17:46:37 2018 +0100
-# Node ID 64e87a408afd2b56d59dad73dee28d4b99463810
-# Parent 00ccc73498628a51a45301322e64ce2ad06e49be
-PR3591: Fix for bug 3533 doesn't add -mstackrealign to JDK code
-
-diff --git openjdk.orig///common/autoconf/toolchain.m4 openjdk///common/autoconf/toolchain.m4
---- openjdk.orig///common/autoconf/toolchain.m4
-+++ openjdk///common/autoconf/toolchain.m4
-@@ -794,6 +794,8 @@
- TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([$REALIGN_CFLAG -Werror], [],
- AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.])
- )
-+ CFLAGS_JDK="${CFLAGS_JDK} ${REALIGN_CFLAG}"
-+ CXXFLAGS_JDK="${CXXFLAGS_JDK} ${REALIGN_CFLAG}"
- AC_SUBST([REALIGN_CFLAG])
- fi
-
diff --git a/pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_equals_to_int.patch b/pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_equals_to_int.patch
new file mode 100644
index 0000000..2700f3c
--- /dev/null
+++ b/pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_equals_to_int.patch
@@ -0,0 +1,143 @@
+diff --git openjdk.orig/hotspot/src/share/vm/asm/codeBuffer.cpp openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp
+--- openjdk.orig/hotspot/src/share/vm/asm/codeBuffer.cpp
++++ openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp
+@@ -977,7 +977,7 @@
+ for (int n = (int) CodeBuffer::SECT_FIRST; n < (int) CodeBuffer::SECT_LIMIT; n++) {
+ CodeSection* sect = code_section(n);
+ if (!sect->is_allocated() || sect->is_empty()) continue;
+- xtty->print_cr("<sect index='%d' size='" SIZE_FORMAT "' free='" SIZE_FORMAT "'/>",
++ xtty->print_cr("<sect index='%d' size='" INTX_FORMAT "' free='" INTX_FORMAT "'/>",
+ n, sect->limit() - sect->start(), sect->limit() - sect->end());
+ }
+ xtty->print_cr("</blob>");
+diff --git openjdk.orig/hotspot/src/share/vm/code/codeCache.cpp openjdk/hotspot/src/share/vm/code/codeCache.cpp
+--- openjdk.orig/hotspot/src/share/vm/code/codeCache.cpp
++++ openjdk/hotspot/src/share/vm/code/codeCache.cpp
+@@ -192,7 +192,7 @@
+ }
+ if (PrintCodeCacheExtension) {
+ ResourceMark rm;
+- tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" SSIZE_FORMAT " bytes)",
++ tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" INTX_FORMAT " bytes)",
+ (intptr_t)_heap->low_boundary(), (intptr_t)_heap->high(),
+ (address)_heap->high() - (address)_heap->low_boundary());
+ }
+diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
+@@ -598,7 +598,7 @@
+ " [Table]\n"
+ " [Memory Usage: " G1_STRDEDUP_BYTES_FORMAT_NS "]\n"
+ " [Size: " SIZE_FORMAT ", Min: " SIZE_FORMAT ", Max: " SIZE_FORMAT "]\n"
+- " [Entries: " UINTX_FORMAT ", Load: " G1_STRDEDUP_PERCENT_FORMAT_NS ", Cached: " UINTX_FORMAT ", Added: " UINTX_FORMAT ", Removed: " UINTX_FORMAT "]\n"
++ " [Entries: " UINTX_FORMAT ", Load: " G1_STRDEDUP_PERCENT_FORMAT_NS ", Cached: " SIZE_FORMAT ", Added: " UINTX_FORMAT ", Removed: " UINTX_FORMAT "]\n"
+ " [Resize Count: " UINTX_FORMAT ", Shrink Threshold: " UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS "), Grow Threshold: " UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS ")]\n"
+ " [Rehash Count: " UINTX_FORMAT ", Rehash Threshold: " UINTX_FORMAT ", Hash Seed: 0x%x]\n"
+ " [Age Threshold: " UINTX_FORMAT "]",
+diff --git openjdk.orig/hotspot/src/share/vm/memory/blockOffsetTable.cpp openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp
+--- openjdk.orig/hotspot/src/share/vm/memory/blockOffsetTable.cpp
++++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp
+@@ -57,7 +57,7 @@
+ gclog_or_tty->print_cr("BlockOffsetSharedArray::BlockOffsetSharedArray: ");
+ gclog_or_tty->print_cr(" "
+ " rs.base(): " INTPTR_FORMAT
+- " rs.size(): " INTPTR_FORMAT
++ " rs.size(): " SIZE_FORMAT
+ " rs end(): " INTPTR_FORMAT,
+ p2i(rs.base()), rs.size(), p2i(rs.base() + rs.size()));
+ gclog_or_tty->print_cr(" "
+diff --git openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
+--- openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp
++++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
+@@ -1055,7 +1055,8 @@
+ size_t expected = msp.scale_by_NewRatio_aligned(initial_heap_size);
+ assert(msp.initial_gen0_size() == expected, err_msg("%zu != %zu", msp.initial_gen0_size(), expected));
+ assert(FLAG_IS_ERGO(NewSize) && NewSize == expected,
+- err_msg("NewSize should have been set ergonomically to %zu, but was %zu", expected, NewSize));
++ err_msg("NewSize should have been set ergonomically to " SIZE_FORMAT ", but was " UINTX_FORMAT,
++ expected, NewSize));
+ }
+
+ private:
+diff --git openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+@@ -1291,14 +1291,14 @@
+ }
+ if (PrintGCDetails && Verbose) {
+ // Too early to use gclog_or_tty
+- tty->print_cr("CMS ergo set MaxNewSize: " SIZE_FORMAT, MaxNewSize);
++ tty->print_cr("CMS ergo set MaxNewSize: " UINTX_FORMAT, MaxNewSize);
+ }
+
+ // Code along this path potentially sets NewSize and OldSize
+ if (PrintGCDetails && Verbose) {
+ // Too early to use gclog_or_tty
+- tty->print_cr("CMS set min_heap_size: " SIZE_FORMAT
+- " initial_heap_size: " SIZE_FORMAT
++ tty->print_cr("CMS set min_heap_size: " UINTX_FORMAT
++ " initial_heap_size: " UINTX_FORMAT
+ " max_heap: " SIZE_FORMAT,
+ min_heap_size(), InitialHeapSize, max_heap);
+ }
+@@ -1314,7 +1314,7 @@
+ 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);
++ tty->print_cr("CMS ergo set NewSize: " UINTX_FORMAT, NewSize);
+ }
+ }
+ // Unless explicitly requested otherwise, size old gen
+@@ -1324,7 +1324,7 @@
+ FLAG_SET_ERGO(uintx, OldSize, MIN2((size_t)(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);
++ tty->print_cr("CMS ergo set OldSize: " UINTX_FORMAT, OldSize);
+ }
+ }
+ }
+@@ -2043,7 +2043,7 @@
+
+ if (PrintGCDetails && Verbose) {
+ // Cannot use gclog_or_tty yet.
+- tty->print_cr(" Initial heap size " SIZE_FORMAT, (uintx)reasonable_initial);
++ tty->print_cr(" Initial heap size " SIZE_FORMAT, (size_t)reasonable_initial);
+ }
+ FLAG_SET_ERGO(uintx, InitialHeapSize, (uintx)reasonable_initial);
+ }
+@@ -2053,7 +2053,7 @@
+ set_min_heap_size(MIN2((uintx)reasonable_minimum, InitialHeapSize));
+ if (PrintGCDetails && Verbose) {
+ // Cannot use gclog_or_tty yet.
+- tty->print_cr(" Minimum heap size " SIZE_FORMAT, min_heap_size());
++ tty->print_cr(" Minimum heap size " UINTX_FORMAT, min_heap_size());
+ }
+ }
+ }
+diff --git openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp
++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+@@ -1389,12 +1389,21 @@
+
+ #define INTPTR_FORMAT_W(width) "%" #width PRIxPTR
+
++#if defined(S390) && !defined(_LP64)
++#define SSIZE_FORMAT "%z" PRIdPTR
++#define SIZE_FORMAT "%z" PRIuPTR
++#define SIZE_FORMAT_HEX "0x%z" PRIxPTR
++#define SSIZE_FORMAT_W(width) "%" #width "z" PRIdPTR
++#define SIZE_FORMAT_W(width) "%" #width "z" PRIuPTR
++#define SIZE_FORMAT_HEX_W(width) "0x%" #width "z" PRIxPTR
++#else // !S390
+ #define SSIZE_FORMAT "%" PRIdPTR
+ #define SIZE_FORMAT "%" PRIuPTR
+ #define SIZE_FORMAT_HEX "0x%" PRIxPTR
+ #define SSIZE_FORMAT_W(width) "%" #width PRIdPTR
+ #define SIZE_FORMAT_W(width) "%" #width PRIuPTR
+ #define SIZE_FORMAT_HEX_W(width) "0x%" #width PRIxPTR
++#endif // S390
+
+ #define INTX_FORMAT "%" PRIdPTR
+ #define UINTX_FORMAT "%" PRIuPTR
diff --git a/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch b/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
new file mode 100644
index 0000000..d1e9576
--- /dev/null
+++ b/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
@@ -0,0 +1,38 @@
+# HG changeset patch
+# User andrew
+# Date 1529475043 -3600
+# Wed Jun 20 07:10:43 2018 +0100
+# Node ID f6341f4635dacb56678264d29a88cd052b74036b
+# Parent 30520d5018b509b0ae68f5fcc9a5c540e3e5b2de
+PR3601: Fix additional -Wreturn-type issues introduced by 8061651
+
+diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
+--- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
++++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
+@@ -835,7 +835,7 @@
+ JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname))
+ JVMWrapper("JVM_KnownToNotExist");
+ #if INCLUDE_CDS
+- return ClassLoaderExt::known_to_not_exist(env, loader, classname, CHECK_(false));
++ return ClassLoaderExt::known_to_not_exist(env, loader, classname, THREAD);
+ #else
+ return false;
+ #endif
+@@ -845,7 +845,7 @@
+ JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader))
+ JVMWrapper("JVM_GetResourceLookupCacheURLs");
+ #if INCLUDE_CDS
+- return ClassLoaderExt::get_lookup_cache_urls(env, loader, CHECK_NULL);
++ return ClassLoaderExt::get_lookup_cache_urls(env, loader, THREAD);
+ #else
+ return NULL;
+ #endif
+@@ -855,7 +855,7 @@
+ JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name))
+ JVMWrapper("JVM_GetResourceLookupCache");
+ #if INCLUDE_CDS
+- return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, CHECK_NULL);
++ return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, THREAD);
+ #else
+ return NULL;
+ #endif
diff --git a/pr3601.patch b/pr3601.patch
deleted file mode 100644
index d1e9576..0000000
--- a/pr3601.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1529475043 -3600
-# Wed Jun 20 07:10:43 2018 +0100
-# Node ID f6341f4635dacb56678264d29a88cd052b74036b
-# Parent 30520d5018b509b0ae68f5fcc9a5c540e3e5b2de
-PR3601: Fix additional -Wreturn-type issues introduced by 8061651
-
-diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
---- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
-+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
-@@ -835,7 +835,7 @@
- JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname))
- JVMWrapper("JVM_KnownToNotExist");
- #if INCLUDE_CDS
-- return ClassLoaderExt::known_to_not_exist(env, loader, classname, CHECK_(false));
-+ return ClassLoaderExt::known_to_not_exist(env, loader, classname, THREAD);
- #else
- return false;
- #endif
-@@ -845,7 +845,7 @@
- JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader))
- JVMWrapper("JVM_GetResourceLookupCacheURLs");
- #if INCLUDE_CDS
-- return ClassLoaderExt::get_lookup_cache_urls(env, loader, CHECK_NULL);
-+ return ClassLoaderExt::get_lookup_cache_urls(env, loader, THREAD);
- #else
- return NULL;
- #endif
-@@ -855,7 +855,7 @@
- JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name))
- JVMWrapper("JVM_GetResourceLookupCache");
- #if INCLUDE_CDS
-- return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, CHECK_NULL);
-+ return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, THREAD);
- #else
- return NULL;
- #endif
diff --git a/pr3634-fix_shenandoah_for_size_t_on_s390.patch b/pr3634-fix_shenandoah_for_size_t_on_s390.patch
new file mode 100644
index 0000000..20a4625
--- /dev/null
+++ b/pr3634-fix_shenandoah_for_size_t_on_s390.patch
@@ -0,0 +1,14 @@
+diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp
+@@ -524,8 +524,8 @@
+ region_size = max_heap_size / ShenandoahTargetNumRegions;
+
+ // Now make sure that we don't go over or under our limits.
+- region_size = MAX2(ShenandoahMinRegionSize, region_size);
+- region_size = MIN2(ShenandoahMaxRegionSize, region_size);
++ region_size = MAX2<size_t>(ShenandoahMinRegionSize, region_size);
++ region_size = MIN2<size_t>(ShenandoahMaxRegionSize, region_size);
+
+ } else {
+ if (ShenandoahHeapRegionSize > initial_heap_size / MIN_NUM_REGIONS) {
diff --git a/repackReproduciblePolycies.sh b/repackReproduciblePolycies.sh
index 271cb74..f356bd3 100644
--- a/repackReproduciblePolycies.sh
+++ b/repackReproduciblePolycies.sh
@@ -1,13 +1,17 @@
#!/bin/sh
+set -e
# https://bugzilla.redhat.com/show_bug.cgi?id=1142153
M=META-INF/MANIFEST.MF
-#P=/usr/lib/jvm/java/jre/lib/security
-P=$1/lib/security
+#P=/usr/lib/jvm/java/jre/lib/security/policy
+P=$1/lib/security/policy
+ERRORS=0
+ for type in unlimited limited ; do
for f in local_policy.jar US_export_policy.jar ; do
-ORIG=$P/$f
+ORIG=$P/$type/$f
echo "processing $f ($ORIG)"
if [ ! -f $ORIG ]; then
echo "File not found! $ORIG"
+ let ERRORS=$ERRORS+1
continue
fi
d=`mktemp -d`
@@ -35,3 +39,6 @@ NW=$d/$f
touch -t 201401010000 $ORIG
rm -rfv $d
done
+ done
+
+exit $ERRORS
diff --git a/rh1163501-increase_2048_bit_dh_upper_bound_fedora_infrastructure_in_dhparametergenerator.patch b/rh1163501-increase_2048_bit_dh_upper_bound_fedora_infrastructure_in_dhparametergenerator.patch
new file mode 100644
index 0000000..d9cbac4
--- /dev/null
+++ b/rh1163501-increase_2048_bit_dh_upper_bound_fedora_infrastructure_in_dhparametergenerator.patch
@@ -0,0 +1,66 @@
+diff --git a/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java b/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
+--- openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
++++ openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
+@@ -1,5 +1,6 @@
+ /*
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2014 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
+@@ -61,13 +62,13 @@
+
+ private static void checkKeySize(int keysize)
+ throws InvalidParameterException {
+- boolean supported = ((keysize == 2048) || (keysize == 3072) ||
++ boolean supported = ((keysize == 2048) || (keysize == 3072) || (keysize == 4096) ||
+ ((keysize >= 512) && (keysize <= 1024) && ((keysize & 0x3F) == 0)));
+
+ if (!supported) {
+ throw new InvalidParameterException(
+ "DH key size must be multiple of 64 and range " +
+- "from 512 to 1024 (inclusive), or 2048, 3072. " +
++ "from 512 to 1024 (inclusive), or 2048, 3072, 4096. " +
+ "The specific key size " + keysize + " is not supported");
+ }
+ }
+diff --git a/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java b/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
+--- openjdk/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
++++ openjdk/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
+@@ -1,5 +1,6 @@
+ /*
+ * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2014 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
+@@ -58,7 +59,7 @@
+ */
+ private enum Sizes {
+ two56(256), three84(384), five12(512), seven68(768), ten24(1024),
+- twenty48(2048);
++ twenty48(2048), forty96(4096);
+
+ private final int intSize;
+ private final BigInteger bigIntValue;
+@@ -130,6 +131,19 @@
+ kp = kpg.generateKeyPair();
+ checkKeyPair(kp, Sizes.twenty48, Sizes.five12);
+
++ kpg.initialize(Sizes.forty96.getIntSize());
++ kp = kpg.generateKeyPair();
++ checkKeyPair(kp, Sizes.forty96, Sizes.twenty48);
++
++ publicKey = (DHPublicKey)kp.getPublic();
++ p = publicKey.getParams().getP();
++ g = publicKey.getParams().getG();
++
++ // test w/ all values specified
++ kpg.initialize(new DHParameterSpec(p, g, Sizes.ten24.getIntSize()));
++ kp = kpg.generateKeyPair();
++ checkKeyPair(kp, Sizes.forty96, Sizes.ten24);
++
+ System.out.println("OK");
+ }
+
+
diff --git a/rh1163501.patch b/rh1163501.patch
deleted file mode 100644
index d9cbac4..0000000
--- a/rh1163501.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java b/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
---- openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
-+++ openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
-@@ -1,5 +1,6 @@
- /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2014 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
-@@ -61,13 +62,13 @@
-
- private static void checkKeySize(int keysize)
- throws InvalidParameterException {
-- boolean supported = ((keysize == 2048) || (keysize == 3072) ||
-+ boolean supported = ((keysize == 2048) || (keysize == 3072) || (keysize == 4096) ||
- ((keysize >= 512) && (keysize <= 1024) && ((keysize & 0x3F) == 0)));
-
- if (!supported) {
- throw new InvalidParameterException(
- "DH key size must be multiple of 64 and range " +
-- "from 512 to 1024 (inclusive), or 2048, 3072. " +
-+ "from 512 to 1024 (inclusive), or 2048, 3072, 4096. " +
- "The specific key size " + keysize + " is not supported");
- }
- }
-diff --git a/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java b/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
---- openjdk/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
-+++ openjdk/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
-@@ -1,5 +1,6 @@
- /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2014 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
-@@ -58,7 +59,7 @@
- */
- private enum Sizes {
- two56(256), three84(384), five12(512), seven68(768), ten24(1024),
-- twenty48(2048);
-+ twenty48(2048), forty96(4096);
-
- private final int intSize;
- private final BigInteger bigIntValue;
-@@ -130,6 +131,19 @@
- kp = kpg.generateKeyPair();
- checkKeyPair(kp, Sizes.twenty48, Sizes.five12);
-
-+ kpg.initialize(Sizes.forty96.getIntSize());
-+ kp = kpg.generateKeyPair();
-+ checkKeyPair(kp, Sizes.forty96, Sizes.twenty48);
-+
-+ publicKey = (DHPublicKey)kp.getPublic();
-+ p = publicKey.getParams().getP();
-+ g = publicKey.getParams().getG();
-+
-+ // test w/ all values specified
-+ kpg.initialize(new DHParameterSpec(p, g, Sizes.ten24.getIntSize()));
-+ kp = kpg.generateKeyPair();
-+ checkKeyPair(kp, Sizes.forty96, Sizes.ten24);
-+
- System.out.println("OK");
- }
-
-
diff --git a/rh1176206-jdk.patch b/rh1176206-jdk.patch
deleted file mode 100644
index 23b8e52..0000000
--- a/rh1176206-jdk.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- openjdk/jdk/make/lib/Awt2dLibraries.gmk 2016-02-29 17:11:00.497484904 +0100
-+++ openjdk/jdk/make/lib/Awt2dLibraries.gmk 2016-02-29 17:11:00.402486574 +0100
-@@ -618,7 +618,7 @@
- XRSurfaceData.c \
- XRBackendNative.c
-
-- LIBAWT_XAWT_LDFLAGS_SUFFIX := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc
-+ LIBAWT_XAWT_LDFLAGS_SUFFIX := $(LIBM) -lawt -lXext -lX11 -lXrender -lXcomposite $(LIBDL) -lXtst -lXi -ljava -ljvm -lc
-
- ifeq ($(OPENJDK_TARGET_OS), linux)
- # To match old build, add this to LDFLAGS instead of suffix.
---- openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c 2016-02-29 17:11:00.777479982 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c 2016-02-29 17:11:00.677481740 +0100
-@@ -38,6 +38,7 @@
- #include <X11/extensions/XTest.h>
- #include <X11/extensions/XInput.h>
- #include <X11/extensions/XI.h>
-+#include <X11/extensions/Xcomposite.h>
- #include <jni.h>
- #include <sizecalc.h>
- #include "robot_common.h"
-@@ -88,6 +89,32 @@
- return isXTestAvailable;
- }
-
-+static Bool hasXCompositeOverlayExtension(Display *display) {
-+
-+ int xoverlay = False;
-+ int eventBase, errorBase;
-+ if (XCompositeQueryExtension(display, &eventBase, &errorBase)) {
-+ int major = 0;
-+ int minor = 0;
-+
-+ XCompositeQueryVersion(display, &major, &minor);
-+ if (major > 0 || minor >= 3)
-+ xoverlay = True;
-+ }
-+
-+ return xoverlay;
-+}
-+
-+static jboolean isXCompositeDisplay(Display *display, int screenNumber) {
-+
-+ char NET_WM_CM_Sn[25];
-+ snprintf(NET_WM_CM_Sn, sizeof(NET_WM_CM_Sn), "_NET_WM_CM_S%d\0", screenNumber);
-+
-+ Atom managerSelection = XInternAtom(display, NET_WM_CM_Sn, 0);
-+ Window owner = XGetSelectionOwner(display, managerSelection);
-+
-+ return owner != 0;
-+}
-
- static XImage *getWindowImage(Display * display, Window window,
- int32_t x, int32_t y,
-@@ -232,6 +259,12 @@
- DASSERT(adata != NULL);
-
- rootWindow = XRootWindow(awt_display, adata->awt_visInfo.screen);
-+ if (isXCompositeDisplay(awt_display, adata->awt_visInfo.screen) &&
-+ hasXCompositeOverlayExtension(awt_display))
-+ {
-+ rootWindow = XCompositeGetOverlayWindow(awt_display, rootWindow);
-+ }
-+
- image = getWindowImage(awt_display, rootWindow, x, y, width, height);
-
- /* Array to use to crunch around the pixel values */
diff --git a/rh1176206-root.patch b/rh1176206-root.patch
deleted file mode 100644
index db1061c..0000000
--- a/rh1176206-root.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- openjdk/common/autoconf/help.m4 2016-02-29 17:10:45.542747800 +0100
-+++ openjdk/common/autoconf/help.m4 2016-02-29 17:10:45.500748539 +0100
-@@ -112,7 +112,7 @@
- pulse)
- PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
- x11)
-- PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;;
-+ PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev libXcomposite-dev" ;;
- ccache)
- PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
- esac
---- openjdk/common/autoconf/libraries.m4 2016-02-29 17:10:45.716744742 +0100
-+++ openjdk/common/autoconf/libraries.m4 2016-02-29 17:10:45.675745462 +0100
-@@ -153,7 +153,7 @@
- CFLAGS="$CFLAGS $X_CFLAGS"
-
- # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
-- AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h],
-+ AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h X11/extensions/Xcomposite.h],
- [X11_A_OK=yes],
- [X11_A_OK=no; break],
- [
-@@ -167,7 +167,7 @@
-
- if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then
- HELP_MSG_MISSING_DEPENDENCY([x11])
-- AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG])
-+ AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h Xcomposite.h). $HELP_MSG])
- fi
-
- AC_SUBST(X_CFLAGS)
diff --git a/rh1566890_embargoed20180521.patch b/rh1566890_embargoed20180521.patch
deleted file mode 100644
index e29bdb9..0000000
--- a/rh1566890_embargoed20180521.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-# ssbd2.patch
---- ./openjdk/hotspot/src/os/linux/vm/os_linux.cpp~ 2018-05-02 13:02:51.924489199 -0400
-+++ ./openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2018-05-02 13:04:57.274216581 -0400
-@@ -102,6 +102,8 @@
- # include <inttypes.h>
- # include <sys/ioctl.h>
-
-+#include <sys/prctl.h>
-+
- PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
- #ifndef _GNU_SOURCE
-@@ -4892,6 +4894,31 @@
- }
- }
-
-+/* Per task speculation control */
-+#ifndef PR_GET_SPECULATION_CTRL
-+#define PR_GET_SPECULATION_CTRL 52
-+#endif
-+#ifndef PR_SET_SPECULATION_CTRL
-+#define PR_SET_SPECULATION_CTRL 53
-+#endif
-+/* Speculation control variants */
-+# undef PR_SPEC_STORE_BYPASS
-+# define PR_SPEC_STORE_BYPASS 0
-+/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
-+# undef PR_SPEC_NOT_AFFECTED
-+# undef PR_SPEC_PRCTL
-+# undef PR_SPEC_ENABLE
-+# undef PR_SPEC_DISABLE
-+# define PR_SPEC_NOT_AFFECTED 0
-+# define PR_SPEC_PRCTL (1UL << 0)
-+# define PR_SPEC_ENABLE (1UL << 1)
-+# define PR_SPEC_DISABLE (1UL << 2)
-+
-+static void set_speculation() __attribute__((constructor));
-+static void set_speculation() {
-+ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
-+}
-+
- // this is called _before_ the most of global arguments have been parsed
- void os::init(void) {
- char dummy; /* used to get a guess on initial stack address */
diff --git a/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch b/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch
new file mode 100644
index 0000000..d8f3a5a
--- /dev/null
+++ b/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch
@@ -0,0 +1,44 @@
+diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -103,6 +103,8 @@
+ # include <inttypes.h>
+ # include <sys/ioctl.h>
+
++#include <sys/prctl.h>
++
+ PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
+
+ #ifndef _GNU_SOURCE
+@@ -4997,6 +4999,31 @@
+ }
+ }
+
++/* Per task speculation control */
++#ifndef PR_GET_SPECULATION_CTRL
++#define PR_GET_SPECULATION_CTRL 52
++#endif
++#ifndef PR_SET_SPECULATION_CTRL
++#define PR_SET_SPECULATION_CTRL 53
++#endif
++/* Speculation control variants */
++# undef PR_SPEC_STORE_BYPASS
++# define PR_SPEC_STORE_BYPASS 0
++/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
++# undef PR_SPEC_NOT_AFFECTED
++# undef PR_SPEC_PRCTL
++# undef PR_SPEC_ENABLE
++# undef PR_SPEC_DISABLE
++# define PR_SPEC_NOT_AFFECTED 0
++# define PR_SPEC_PRCTL (1UL << 0)
++# define PR_SPEC_ENABLE (1UL << 1)
++# define PR_SPEC_DISABLE (1UL << 2)
++
++static void set_speculation() __attribute__((constructor));
++static void set_speculation() {
++ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
++}
++
+ // this is called _before_ most of the global arguments have been parsed
+ void os::init(void) {
+ char dummy; /* used to get a guess on initial stack address */
diff --git a/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch b/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
new file mode 100644
index 0000000..bddd702
--- /dev/null
+++ b/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
@@ -0,0 +1,16 @@
+diff -uNr openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java jdk8/jdk/src/share/classes/java/awt/Toolkit.java
+--- openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 11:59:47.000000000 -0500
++++ jdk8/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 12:05:20.000000000 -0500
+@@ -883,7 +883,11 @@
+ return null;
+ }
+ });
+- loadAssistiveTechnologies();
++ try {
++ loadAssistiveTechnologies();
++ } catch ( AWTError error) {
++ // ignore silently
++ }
+ }
+ return toolkit;
+ }
diff --git a/rh1648246-always_instruct_vm_to_assume_multiple_processors_are_available.patch b/rh1648246-always_instruct_vm_to_assume_multiple_processors_are_available.patch
new file mode 100644
index 0000000..b0a874d
--- /dev/null
+++ b/rh1648246-always_instruct_vm_to_assume_multiple_processors_are_available.patch
@@ -0,0 +1,12 @@
+diff --git a/src/share/vm/runtime/globals.hpp b/src/share/vm/runtime/globals.hpp
+--- openjdk/hotspot/src/share/vm/runtime/globals.hpp
++++ openjdk/hotspot/src/share/vm/runtime/globals.hpp
+@@ -530,7 +530,7 @@
+ lp64_product(intx, ObjectAlignmentInBytes, 8, \
+ "Default object alignment in bytes, 8 is minimum") \
+ \
+- product(bool, AssumeMP, false, \
++ product(bool, AssumeMP, true, \
+ "Instruct the VM to assume multiple processors are available") \
+ \
+ /* UseMembar is theoretically a temp flag used for memory barrier \
diff --git a/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch b/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
new file mode 100644
index 0000000..febd87e
--- /dev/null
+++ b/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
@@ -0,0 +1,11 @@
+diff -r 5b86f66575b7 src/share/lib/security/java.security-linux
+--- openjdk/jdk/src/share/lib/security/java.security-linux Tue May 16 13:29:05 2017 -0700
++++ openjdk/jdk/src/share/lib/security/java.security-linux Tue Jun 06 14:05:12 2017 +0200
+@@ -74,6 +74,7 @@
+ security.provider.7=com.sun.security.sasl.Provider
+ security.provider.8=org.jcp.xml.dsig.internal.dom.XMLDSigRI
+ security.provider.9=sun.security.smartcardio.SunPCSC
++#security.provider.10=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/nss.cfg
+
+ #
+ # Sun Provider SecureRandom seed source.
diff --git a/rh1648644-java_access_bridge_privileged_security.patch b/rh1648644-java_access_bridge_privileged_security.patch
new file mode 100644
index 0000000..538468a
--- /dev/null
+++ b/rh1648644-java_access_bridge_privileged_security.patch
@@ -0,0 +1,24 @@
+--- jdk8/jdk/src/share/lib/security/java.security-linux.orig
++++ jdk8/jdk/src/share/lib/security/java.security-linux
+@@ -223,7 +223,9 @@
+ jdk.nashorn.internal.,\
+ jdk.nashorn.tools.,\
+ jdk.xml.internal.,\
+- com.sun.activation.registries.
++ com.sun.activation.registries.,\
++ org.GNOME.Accessibility.,\
++ org.GNOME.Bonobo.
+
+ #
+ # List of comma-separated packages that start with or equal this string
+@@ -273,7 +275,9 @@
+ jdk.nashorn.internal.,\
+ jdk.nashorn.tools.,\
+ jdk.xml.internal.,\
+- com.sun.activation.registries.
++ com.sun.activation.registries.,\
++ org.GNOME.Accessibility.,\
++ org.GNOME.Bonobo.
+
+ #
+ # Determines whether this properties file can be appended to
diff --git a/rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch b/rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch
new file mode 100644
index 0000000..e319492
--- /dev/null
+++ b/rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch
@@ -0,0 +1,16 @@
+diff --git openjdk.orig/jdk/make/lib/Awt2dLibraries.gmk openjdk/jdk/make/lib/Awt2dLibraries.gmk
+--- openjdk.orig/jdk/make/lib/Awt2dLibraries.gmk
++++ openjdk/jdk/make/lib/Awt2dLibraries.gmk
+@@ -891,6 +891,12 @@
+ BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
+ endif
+
++# Turn off strict overflow with GCC for IndicRearrangementProcessor.cpp
++ifeq ($(OPENJDK_TARGET_OS), linux)
++ BUILD_LIBFONTMANAGER_IndicRearrangementProcessor.cpp_CXXFLAGS := -fno-strict-overflow
++ BUILD_LIBFONTMANAGER_IndicRearrangementProcessor2.cpp_CXXFLAGS := -fno-strict-overflow
++endif
++
+ # LDFLAGS clarification:
+ # Filter relevant linker flags disallowing unresolved symbols as we cannot
+ # build-time decide to which library to link against (libawt_headless or
diff --git a/s390-size_t_format_flags.patch b/s390-size_t_format_flags.patch
deleted file mode 100644
index 451c806..0000000
--- a/s390-size_t_format_flags.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -r cf43a852f486 src/share/vm/asm/codeBuffer.cpp
---- openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp Wed Jan 13 05:30:26 2016 +0000
-@@ -977,7 +977,7 @@
- for (int n = (int) CodeBuffer::SECT_FIRST; n < (int) CodeBuffer::SECT_LIMIT; n++) {
- CodeSection* sect = code_section(n);
- if (!sect->is_allocated() || sect->is_empty()) continue;
-- xtty->print_cr("<sect index='%d' size='" SIZE_FORMAT "' free='" SIZE_FORMAT "'/>",
-+ xtty->print_cr("<sect index='%d' size='" INTX_FORMAT "' free='" INTX_FORMAT "'/>",
- n, sect->limit() - sect->start(), sect->limit() - sect->end());
- }
- xtty->print_cr("</blob>");
-diff -r cf43a852f486 src/share/vm/code/codeCache.cpp
---- openjdk/hotspot/src/share/vm/code/codeCache.cpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/code/codeCache.cpp Wed Jan 13 05:30:26 2016 +0000
-@@ -191,7 +191,7 @@
- }
- if (PrintCodeCacheExtension) {
- ResourceMark rm;
-- tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" SSIZE_FORMAT " bytes)",
-+ tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" INTX_FORMAT " bytes)",
- (intptr_t)_heap->low_boundary(), (intptr_t)_heap->high(),
- (address)_heap->high() - (address)_heap->low_boundary());
- }
-diff -r cf43a852f486 src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp Wed Jan 13 05:30:26 2016 +0000
-@@ -556,7 +556,7 @@
- " [Table]\n"
- " [Memory Usage: "G1_STRDEDUP_BYTES_FORMAT_NS"]\n"
- " [Size: "SIZE_FORMAT", Min: "SIZE_FORMAT", Max: "SIZE_FORMAT"]\n"
-- " [Entries: "UINTX_FORMAT", Load: "G1_STRDEDUP_PERCENT_FORMAT_NS", Cached: " UINTX_FORMAT ", Added: "UINTX_FORMAT", Removed: "UINTX_FORMAT"]\n"
-+ " [Entries: "UINTX_FORMAT", Load: "G1_STRDEDUP_PERCENT_FORMAT_NS", Cached: " SIZE_FORMAT ", Added: "UINTX_FORMAT", Removed: "UINTX_FORMAT"]\n"
- " [Resize Count: "UINTX_FORMAT", Shrink Threshold: "UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS"), Grow Threshold: "UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS")]\n"
- " [Rehash Count: "UINTX_FORMAT", Rehash Threshold: "UINTX_FORMAT", Hash Seed: 0x%x]\n"
- " [Age Threshold: "UINTX_FORMAT"]",
-diff -r cf43a852f486 src/share/vm/memory/blockOffsetTable.cpp
---- openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp Wed Jan 13 05:30:26 2016 +0000
-@@ -57,7 +57,7 @@
- gclog_or_tty->print_cr("BlockOffsetSharedArray::BlockOffsetSharedArray: ");
- gclog_or_tty->print_cr(" "
- " rs.base(): " INTPTR_FORMAT
-- " rs.size(): " INTPTR_FORMAT
-+ " rs.size(): " SIZE_FORMAT
- " rs end(): " INTPTR_FORMAT,
- p2i(rs.base()), rs.size(), p2i(rs.base() + rs.size()));
- gclog_or_tty->print_cr(" "
-diff -r cf43a852f486 src/share/vm/runtime/arguments.cpp
---- openjdk/hotspot/src/share/vm/runtime/arguments.cpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp Wed Jan 13 05:30:26 2016 +0000
-@@ -1285,14 +1285,14 @@
- }
- if (PrintGCDetails && Verbose) {
- // Too early to use gclog_or_tty
-- tty->print_cr("CMS ergo set MaxNewSize: " SIZE_FORMAT, MaxNewSize);
-+ tty->print_cr("CMS ergo set MaxNewSize: " UINTX_FORMAT, MaxNewSize);
- }
-
- // Code along this path potentially sets NewSize and OldSize
- if (PrintGCDetails && Verbose) {
- // Too early to use gclog_or_tty
-- tty->print_cr("CMS set min_heap_size: " SIZE_FORMAT
-- " initial_heap_size: " SIZE_FORMAT
-+ tty->print_cr("CMS set min_heap_size: " UINTX_FORMAT
-+ " initial_heap_size: " UINTX_FORMAT
- " max_heap: " SIZE_FORMAT,
- min_heap_size(), InitialHeapSize, max_heap);
- }
-@@ -1308,7 +1308,7 @@
- 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);
-+ tty->print_cr("CMS ergo set NewSize: " UINTX_FORMAT, NewSize);
- }
- }
- // Unless explicitly requested otherwise, size old gen
-@@ -1318,7 +1318,7 @@
- FLAG_SET_ERGO(uintx, OldSize, MIN2((size_t)(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);
-+ tty->print_cr("CMS ergo set OldSize: " UINTX_FORMAT, OldSize);
- }
- }
- }
-@@ -1834,7 +1834,7 @@
-
- if (PrintGCDetails && Verbose) {
- // Cannot use gclog_or_tty yet.
-- tty->print_cr(" Initial heap size " SIZE_FORMAT, (uintx)reasonable_initial);
-+ tty->print_cr(" Initial heap size " SIZE_FORMAT, (size_t)reasonable_initial);
- }
- FLAG_SET_ERGO(uintx, InitialHeapSize, (uintx)reasonable_initial);
- }
-@@ -1844,7 +1844,7 @@
- set_min_heap_size(MIN2((uintx)reasonable_minimum, InitialHeapSize));
- if (PrintGCDetails && Verbose) {
- // Cannot use gclog_or_tty yet.
-- tty->print_cr(" Minimum heap size " SIZE_FORMAT, min_heap_size());
-+ tty->print_cr(" Minimum heap size " UINTX_FORMAT, min_heap_size());
- }
- }
- }
-diff -r cf43a852f486 src/share/vm/utilities/globalDefinitions.hpp
---- openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp Wed Jan 13 05:30:26 2016 +0000
-@@ -1382,12 +1382,21 @@
-
- #define INTPTR_FORMAT_W(width) "%" #width PRIxPTR
-
-+#if defined(S390) && !defined(_LP64)
-+#define SSIZE_FORMAT "%z" PRIdPTR
-+#define SIZE_FORMAT "%z" PRIuPTR
-+#define SIZE_FORMAT_HEX "0x%z" PRIxPTR
-+#define SSIZE_FORMAT_W(width) "%" #width "z" PRIdPTR
-+#define SIZE_FORMAT_W(width) "%" #width "z" PRIuPTR
-+#define SIZE_FORMAT_HEX_W(width) "0x%" #width "z" PRIxPTR
-+#else // !S390
- #define SSIZE_FORMAT "%" PRIdPTR
- #define SIZE_FORMAT "%" PRIuPTR
- #define SIZE_FORMAT_HEX "0x%" PRIxPTR
- #define SSIZE_FORMAT_W(width) "%" #width PRIdPTR
- #define SIZE_FORMAT_W(width) "%" #width PRIuPTR
- #define SIZE_FORMAT_HEX_W(width) "0x%" #width PRIxPTR
-+#endif // S390
-
- #define INTX_FORMAT "%" PRIdPTR
- #define UINTX_FORMAT "%" PRIuPTR
diff --git a/soundFontPatch.patch b/soundFontPatch.patch
deleted file mode 100644
index 2009642..0000000
--- a/soundFontPatch.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-# HG changeset patch
-# User omajid
-# Date 1445973555 14400
-# Node ID 3e006ea10d21a7fcf15725c51f2ab7ededce53ab
-# Parent dfeaf40df80032570558c031f37f6630dc729e3f
-8140620: Find and load default.sf2 as the default soundbank on Linux
-Reviewed-by: serb
-
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java
---- openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java
-@@ -671,6 +671,40 @@
- actions.add(new PrivilegedAction<InputStream>() {
- public InputStream run() {
- if (System.getProperties().getProperty("os.name")
-+ .startsWith("Linux")) {
-+
-+ File[] systemSoundFontsDir = new File[] {
-+ /* Arch, Fedora, Mageia */
-+ new File("/usr/share/soundfonts/"),
-+ new File("/usr/local/share/soundfonts/"),
-+ /* Debian, Gentoo, OpenSUSE, Ubuntu */
-+ new File("/usr/share/sounds/sf2/"),
-+ new File("/usr/local/share/sounds/sf2/"),
-+ };
-+
-+ /*
-+ * Look for a default.sf2
-+ */
-+ for (File systemSoundFontDir : systemSoundFontsDir) {
-+ if (systemSoundFontDir.exists()) {
-+ File defaultSoundFont = new File(systemSoundFontDir, "default.sf2");
-+ if (defaultSoundFont.exists()) {
-+ try {
-+ return new FileInputStream(defaultSoundFont);
-+ } catch (IOException e) {
-+ // continue with lookup
-+ }
-+ }
-+ }
-+ }
-+ }
-+ return null;
-+ }
-+ });
-+
-+ actions.add(new PrivilegedAction<InputStream>() {
-+ public InputStream run() {
-+ if (System.getProperties().getProperty("os.name")
- .startsWith("Windows")) {
- File gm_dls = new File(System.getenv("SystemRoot")
- + "\\system32\\drivers\\gm.dls");
-
-
diff --git a/sources b/sources
index 4f77f62..107fb21 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (aarch32-port-jdk8u-jdk8u191-b12-aarch32-181022.tar.xz) = fa2de38295c71c3eddbfdf41983804dd65419ad94deb362a838cda6ea29fb6e6e6c78addd3b877007c875a1ab8d457b02914d4e0b6d078b1e93f497999b3c543
-SHA512 (systemtap-tapset-3.4.0pre01.tar.xz) = 4446fa20f88bbce53b583484bf06cb2b476c9372beb898dc2b7739eaa5c98b9979fbd72e12474fb344833d831a19366b82216ee03b452411745e6cd3527faa4e
+SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = d2a1e463487982fff24c398d51b4549dbf4bb5da89bb145238313185373164a57ce9a05de352624d196d129f5a6d52518fee9d792205298fa7a663827eb5c230
+SHA512 (aarch32-port-jdk8u-jdk8u201-b09-aarch32-190124.tar.xz) = 4cfb62206d0f66f0c579e5512786b07fd0598f5403dad69d6d07e09fc184681880584f629e09f9ef23b86b12d1b3cb64eaa6bd0095c252a5d505e2c3cb840d99
diff --git a/system-lcms.patch b/system-lcms.patch
deleted file mode 100644
index 6f39b57..0000000
--- a/system-lcms.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
---- openjdk/common/autoconf/libraries.m4 2013-11-14 22:04:38.039440136 -0500
-+++ openjdk/common/autoconf/libraries.m4 2013-11-14 22:05:11.474356424 -0500
-@@ -676,6 +676,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
- #
-
-diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.gmk
---- openjdk/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 22:04:38.040440133 -0500
-+++ openjdk/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 22:05:11.475356411 -0500
-@@ -666,18 +666,35 @@
-
- ##########################################################################################
-
-+LIBLCMS_DIR := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms
-+
-+ifeq ($(USE_EXTERNAL_LCMS), true)
-+ # If we're using an external library, we'll just need the wrapper part.
-+ # By including it explicitely, all other files will be excluded.
-+ BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c
-+ BUILD_LIBLCMS_HEADERS :=
-+else
-+ BUILD_LIBLCMS_INCLUDE_FILES :=
-+ # If we're using the bundled library, we'll need to include it in the
-+ # include path explicitly. Otherwise the system headers will be used.
-+ BUILD_LIBLCMS_HEADERS := -I$(LIBLCMS_DIR)
-+endif
-+
- # TODO: Update awt lib path when awt is converted
- $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
- LIBRARY := lcms, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-- SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
-+ SRC := $(LIBLCMS_DIR), \
-+ INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
- LANG := C, \
- OPTIMIZATION := HIGHEST, \
- CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
- -DCMS_DONT_USE_FAST_FLOOR \
- $(SHARED_LIBRARY_FLAGS) \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
-- -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
-+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
-+ $(BUILD_LIBLCMS_HEADERS) \
-+ $(LCMS_CFLAGS), \
- CFLAGS_solaris := -xc99=no_lib, \
- CFLAGS_windows := -DCMS_IS_WINDOWS_, \
- MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
-@@ -685,10 +702,10 @@
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
- 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_aix := -lm -lawt -ljava -ljvm,\
-+ LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc $(LCMS_LIBS), \
-+ LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm $(LCMS_LIBS), \
-+ LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm $(LCMS_LIBS), \
-+ LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm $(LCMS_LIBS),\
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=lcms.dll" \
-diff -r 3d1c3b0b73a3 src/share/native/sun/java2d/cmm/lcms/LCMS.c
---- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Tue Sep 08 22:31:26 2015 +0300
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Thu Oct 15 05:29:28 2015 +0100
-@@ -30,7 +30,7 @@
- #include "jni_util.h"
- #include "Trace.h"
- #include "Disposer.h"
--#include "lcms2.h"
-+#include <lcms2.h>
- #include "jlong.h"
-
-
diff --git a/system-libjpeg.patch b/system-libjpeg.patch
deleted file mode 100644
index fa01115..0000000
--- a/system-libjpeg.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
---- jdk8/common/autoconf/libraries.m4 2013-10-31 19:24:33.000000000 -0400
-+++ jdk8/common/autoconf/libraries.m4 2013-11-14 21:55:20.249903347 -0500
-@@ -601,12 +601,42 @@
- #
-
- 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])
-- ])
-+ AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg],
-+ [use libjpeg from build system or OpenJDK sources (system, bundled) @<:@bundled@:>@])])
-+
-+ AC_CHECK_LIB(jpeg, jpeg_destroy_compress,
-+ [ LIBJPEG_FOUND=yes ],
-+ [ LIBJPEG_FOUND=no ])
-+
-+ 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
-+
-+ if test "x${with_libjpeg}" = "xbundled"; then
-+ USE_EXTERNAL_LIBJPEG=false
-+ AC_MSG_RESULT([bundled])
-+ elif test "x${with_libjpeg}" = "xsystem"; then
-+ if test "x${LIBJPEG_FOUND}" = "xyes"; then
-+ USE_EXTERNAL_LIBJPEG=true
-+ AC_MSG_RESULT([system])
-+ else
-+ AC_MSG_RESULT([system not found])
-+ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])
-+ fi
-+ else
-+ AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled'])
-+ fi
- AC_SUBST(USE_EXTERNAL_LIBJPEG)
-
-+
- ###############################################################################
- #
- # Check for the gif library
-diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.gmk
---- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-10-31 19:44:18.000000000 -0400
-+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 21:56:01.020796703 -0500
-@@ -696,17 +696,17 @@
- ##########################################################################################
-
- 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_LIBJPEG_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
-
-@@ -721,37 +721,37 @@
- # $(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, \
-+$(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \
-+ LIBRARY := javajpeg, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-- SRC := $(BUILD_LIBJPEG_CLOSED_SRC) \
-+ SRC := $(BUILD_LIBJAVAJPEG_CLOSED_SRC) \
- $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
- LANG := C, \
- OPTIMIZATION := HIGHEST, \
- CFLAGS := $(CFLAGS_JDKLIB) \
-- $(BUILD_LIBJPEG_CLOSED_INCLUDES) \
-+ $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
-- MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \
-- LDFLAGS := $(LDFLAGS_JDKLIB) \
-+ MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
-+ LDFLAGS := $(LDFLAGS_JDKLIB) -ljpeg \
- $(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), \
-- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \
-+ REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
-+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavajpeg, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
--$(BUILD_LIBJPEG): $(BUILD_LIBJAVA)
-+$(BUILD_LIBJAVAJPEG): $(BUILD_LIBJAVA)
-
--BUILD_LIBRARIES += $(BUILD_LIBJPEG)
-+BUILD_LIBRARIES += $(BUILD_LIBJAVAJPEG)
-
- ##########################################################################################
-
-@@ -1183,7 +1183,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
-
-@@ -1194,6 +1193,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/jpeg
-+ endif
-+
- ifneq ($(OPENJDK_TARGET_OS), macosx)
- LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
- else
-@@ -1256,11 +1262,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) \
-diff -ruN jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
---- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2013-10-31 19:44:18.000000000 -0400
-+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2013-11-14 21:55:20.250903340 -0500
-@@ -89,7 +89,7 @@
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction<Void>() {
- public Void run() {
-- System.loadLibrary("jpeg");
-+ System.loadLibrary("javajpeg");
- return null;
- }
- });
-diff -ruN jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
---- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2013-10-31 19:44:18.000000000 -0400
-+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2013-11-14 21:55:20.250903340 -0500
-@@ -179,7 +179,7 @@
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction<Void>() {
- public Void run() {
-- System.loadLibrary("jpeg");
-+ System.loadLibrary("javajpeg");
- return null;
- }
- });
-diff -ruN jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java
---- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2013-10-31 19:44:18.000000000 -0400
-+++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2013-11-14 21:55:20.251903376 -0500
-@@ -56,7 +56,7 @@
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction<Void>() {
- public Void run() {
-- System.loadLibrary("jpeg");
-+ System.loadLibrary("javajpeg");
- return null;
- }
- });
-diff -ruN jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
---- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-10-31 19:44:18.000000000 -0400
-+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-11-14 21:55:20.251903376 -0500
-@@ -25,7 +25,6 @@
-
- #include "splashscreen_impl.h"
-
--#include "jinclude.h"
- #include "jpeglib.h"
- #include "jerror.h"
-
-@@ -107,11 +106,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;
diff --git a/system-libpng.patch b/system-libpng.patch
deleted file mode 100644
index 53661d8..0000000
--- a/system-libpng.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
---- jdk8/common/autoconf/libraries.m4 2013-11-14 20:08:01.845065585 -0500
-+++ jdk8/common/autoconf/libraries.m4 2013-11-14 20:10:56.186553066 -0500
-@@ -676,6 +676,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
- #
-
-diff -ruN jdk8/common/autoconf/spec.gmk.in jdk8/common/autoconf/spec.gmk.in
---- jdk8/common/autoconf/spec.gmk.in 2013-10-31 19:24:33.000000000 -0400
-+++ jdk8/common/autoconf/spec.gmk.in 2013-11-14 21:10:56.365976518 -0500
-@@ -548,6 +548,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@
-diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.gmk
---- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 20:08:01.845065585 -0500
-+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2013-11-14 20:14:10.791982343 -0500
-@@ -1183,7 +1183,6 @@
-
- ifndef BUILD_HEADLESS_ONLY
- LIBSPLASHSCREEN_DIRS := \
-- $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
- $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
-
- ifeq ($(USE_EXTERNAL_LIBGIF), true)
-@@ -1200,6 +1199,13 @@
- LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/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
-@@ -1263,12 +1269,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), \
-+ $(LIBZ) $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(LIBPNG_LDFLAGS), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
-diff -ruN jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
---- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2013-10-31 19:44:18.000000000 -0400
-+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2013-11-14 20:14:41.363892797 -0500
-@@ -25,8 +25,7 @@
-
- #include "splashscreen_impl.h"
-
--#include "../libpng/png.h"
--
-+#include <png.h>
- #include <setjmp.h>
-
- #define SIG_BYTES 8
diff --git a/update_main_sources.sh b/update_main_sources.sh
new file mode 100755
index 0000000..5f78b8d
--- /dev/null
+++ b/update_main_sources.sh
@@ -0,0 +1,95 @@
+#!/bin/bash -x
+# Generates the 'source tarball' for JDK 8 projects and update spec infrastructure
+# By default, this script regenerate source as they are currently used.
+# so if the version of sources change, this file changes and is pushed
+#
+# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
+# PROJECT_NAME=jdk8u OR aarch64-port
+# REPO_NAME=jdk8u60 OR jdk8u60
+# VERSION=jdk8u60-b27 OR aarch64-jdk8u65-b17 OR for head, keyword 'tip' should do the job there
+#
+# If you don't, default are used and so already uploaded tarball regenerated
+# They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set)
+#
+# For other useful variables see generate_source_tarball.sh
+#
+# the used values are then substituted to spec and sources
+
+if [ ! "x$PR2126" = "x" ] ; then
+ if [ ! -f "$PR2126" ] ; then
+ echo "You have specified PR2126 as $PR2126 but it does not exists. exiting"
+ exit 1
+ fi
+fi
+
+set -e
+
+if [ "x$PROJECT_NAME" = "x" ] ; then
+ PROJECT_NAME="aarch64-port"
+fi
+if [ "x$REPO_NAME" = "x" ] ; then
+ REPO_NAME="jdk8u-shenandoah"
+fi
+if [ "x$VERSION" = "x" ] ; then
+ VERSION="aarch64-shenandoah-jdk8u181-b15"
+fi
+
+if [ "x$COMPRESSION" = "x" ] ; then
+# rhel 5 needs tar.gz
+ COMPRESSION=xz
+fi
+if [ "x$FILE_NAME_ROOT" = "x" ] ; then
+ FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
+fi
+if [ "x$PKG" = "x" ] ; then
+ URL=`cat .git/config | grep url`
+ PKG=${URL##*/}
+fi
+if [ "x$SPEC" = "x" ] ; then
+ SPEC=${PKG}.spec
+fi
+if [ "x$RELEASE" = "x" ] ; then
+ RELEASE=1
+fi
+
+FILENAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
+
+if [ ! -f ${FILENAME} ] ; then
+echo "Generating ${FILENAME}"
+. ./generate_source_tarball.sh
+else
+echo "${FILENAME} already exists, using"
+fi
+
+
+echo "Touching spec: $SPEC"
+echo sed -i "s/^%global\s\+project.*/%global project ${PROJECT_NAME}/" $SPEC
+echo sed -i "s/^%global\s\+repo.*/%global repo ${REPO_NAME}/" $SPEC
+echo sed -i "s/^%global\s\+revision.*/%global revision ${VERSION}/" $SPEC
+# updated sources, resetting release
+echo sed -i "s/^Release:.*/Release: $RELEASE.%{buildver}%{?dist}/" $SPEC
+
+echo "New sources"
+cat sources
+a_sources=`cat sources | sed "s/.*(//g" | sed "s/).*//g" | sed "s/.*\s\+//g"`
+echo " you can get inspired by following %changelog template:"
+user_name=`whoami`
+user_record=$(getent passwd $user_name)
+user_gecos_field=$(echo "$user_record" | cut -d ':' -f 5)
+user_full_name=$(echo "$user_gecos_field" | cut -d ',' -f 1)
+spec_date=`date +"%a %b %d %Y"`
+# See spec:
+revision_helper=`echo ${MAIN_VERSION%-*}`
+updatever=`echo ${revision_helper##*u}`
+buildver=`echo ${MAIN_VERSION##*-}`
+echo "* $spec_date $user_full_name <$user_name(a)redhat.com> - 1:1.8.0.$updatever-$RELEASE.$buildver"
+echo "- updated to $MAIN_VERSION (from $PROJECT_NAME/$MAIN_REPO_NAME)"
+echo "- updated to $VERSION (from $PROJECT_NAME/$REPO_NAME) of hotspot"
+echo "- used $FILENAME as new sources"
+echo "- used $FILENAME_SH as new sources for hotspot"
+
+echo " execute:"
+echo "fedpkg/rhpkg new-sources "$a_sources
+echo " to upload sources"
+echo "you can verify by fedpkg/rhpkg prep --arch XXXX on all architectures: x86_64 i386 i586 i686 ppc ppc64 ppc64le s390 s390x aarch64 armv7hl"
+
diff --git a/update_systemtap.sh b/update_systemtap.sh
new file mode 100644
index 0000000..1a3e3c8
--- /dev/null
+++ b/update_systemtap.sh
@@ -0,0 +1,32 @@
+#!/bin/bash -x
+# this file contains defaults for currently generated source tarball of systemtap
+
+set -e
+
+# TAPSET
+export PROJECT_NAME="hg"
+export REPO_NAME="icedtea8"
+export VERSION="9d464368e06d"
+export COMPRESSION=xz
+export OPENJDK_URL=http://icedtea.classpath.org
+export FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
+export TO_COMPRESS="*/tapset"
+# warning, filename and filenameroot creation is duplicated here from generate_source_tarball.sh
+CLONED_FILENAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
+TAPSET_VERSION=3.2
+TAPSET=systemtap_"$TAPSET_VERSION"_tapsets_$CLONED_FILENAME
+if [ ! -f ${TAPSET} ] ; then
+ if [ ! -f ${CLONED_FILENAME} ] ; then
+ echo "Generating ${CLONED_FILENAME}"
+ sh ./generate_singlerepo_source_tarball.sh
+ else
+ echo "exists exists exists exists exists exists exists "
+ echo "reusing reusing reusing reusing reusing reusing "
+ echo ${CLONED_FILENAME}
+ fi
+ mv -v $CLONED_FILENAME $TAPSET
+else
+ echo "exists exists exists exists exists exists exists "
+ echo "reusing reusing reusing reusing reusing reusing "
+ echo ${TAPSET}
+fi
5 years, 3 months
Architecture specific change in rpms/clang.git
by githook-noreply@fedoraproject.org
The package rpms/clang.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/clang.git/commit/?id=478f0a1e6b9b....
Change:
+%ifarch s390 s390x %{arm} %ix86
Thanks.
Full change:
============
commit 478f0a1e6b9b730fa01e329819e9f7f38ca04227
Author: sergesanspaille <sguelton(a)redhat.com>
Date: Thu Feb 14 21:12:15 2019 +0000
Decrease debug info verbosity for some target and prevent parallel linking
diff --git a/clang.spec b/clang.spec
index b7dc87d..730695d 100644
--- a/clang.spec
+++ b/clang.spec
@@ -233,12 +233,13 @@ sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@//g' test/lit.cfg.py
mkdir -p _build
cd _build
-%ifarch %{arm}
+%ifarch s390 s390x %{arm} %ix86
# Decrease debuginfo verbosity to reduce memory consumption during final library linking
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
%endif
%cmake .. -G Ninja \
+ -DLLVM_PARALLEL_LINK_JOBS=1 \
-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DPYTHON_EXECUTABLE=%{__python3} \
5 years, 3 months
Architecture specific change in rpms/llvm.git
by githook-noreply@fedoraproject.org
The package rpms/llvm.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/llvm.git/commit/?id=e917285b3e322....
Change:
+%ifarch s390 s390x %{arm} %ix86
Thanks.
Full change:
============
commit e917285b3e322d0a4e6678c266fdf521a8c091d6
Author: serge-sans-paille <sguelton(a)redhat.com>
Date: Thu Feb 14 16:18:03 2019 +0000
Decrease debug info level for s390x
diff --git a/llvm.spec b/llvm.spec
index 32cf4de..4cc4b96 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -172,7 +172,7 @@ sed -i 's~@TOOLS_DIR@~%{llvm_bindir}~' %{SOURCE1}
mkdir -p _build
cd _build
-%ifarch s390 %{arm} %ix86
+%ifarch s390 s390x %{arm} %ix86
# Decrease debuginfo verbosity to reduce memory consumption during final library linking
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
%endif
commit 317b7917e67bcde03d799531bce7292914b99bf7
Author: serge-sans-paille <sguelton(a)redhat.com>
Date: Thu Feb 14 15:11:46 2019 +0000
Limit the number of linker jobs to 1
diff --git a/llvm.spec b/llvm.spec
index 28e2f32..32cf4de 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -180,6 +180,7 @@ cd _build
# force off shared libs as cmake macros turns it on.
%cmake .. -G Ninja \
-DBUILD_SHARED_LIBS:BOOL=OFF \
+ -DLLVM_PARALLEL_LINK_JOBS=1 \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
%ifarch s390 %{arm} %ix86
-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
5 years, 3 months
Architecture specific change in rpms/goldendict.git
by githook-noreply@fedoraproject.org
The package rpms/goldendict.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/goldendict.git/commit/?id=dd835e2....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit dd835e2edc227e58503a056109659a08c9dc828c
Author: Mosaab Alzoubi <moceap(a)hotmail.com>
Date: Thu Feb 14 18:13:51 2019 +0300
exclude s390x
diff --git a/goldendict.spec b/goldendict.spec
index fe2b5a4..4643b06 100644
--- a/goldendict.spec
+++ b/goldendict.spec
@@ -33,6 +33,7 @@ BuildRequires: libtiff-devel
BuildRequires: eb-devel
BuildRequires: qtsingleapplication-qt5-devel
BuildRequires: libappstream-glib
+ExcludeArch: s390x
%description
Goldendict is a feature-rich dictionary lookup program.
@@ -116,6 +117,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{name}.a
%{_datadir}/%{name}/help
%changelog
+* Thu Feb 14 2019 Mosaab Alzoubi <moceap(a)hotmail.com> - 1.5-0.20.RC2
+- Cant build on s390x check koji #1210158
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5-0.19.RC2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 3 months
Architecture specific change in rpms/netcdf-fortran.git
by githook-noreply@fedoraproject.org
The package rpms/netcdf-fortran.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/netcdf-fortran.git/commit/?id=7a6....
Change:
-%ifarch s390 s390x
Thanks.
Full change:
============
commit 7a61d8dab78d2e00fb784af99150b06e7f418601
Author: Orion Poplawski <orion(a)nwra.com>
Date: Thu Feb 14 08:06:28 2019 -0700
Rebuild for openmpi 3.1.3
diff --git a/netcdf-fortran.spec b/netcdf-fortran.spec
index 1629695..b0efd4c 100644
--- a/netcdf-fortran.spec
+++ b/netcdf-fortran.spec
@@ -1,6 +1,6 @@
Name: netcdf-fortran
Version: 4.4.4
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Fortran libraries for NetCDF-4
License: NetCDF and ASL 2.0
@@ -28,10 +28,6 @@ BuildRequires: libtool
%global with_mpich 0
%endif
%endif
-%ifarch s390 s390x
-# No openmpi on s390(x)
-%global with_openmpi 0
-%endif
%if %{with_mpich}
%global mpi_list mpich
@@ -278,6 +274,9 @@ done
%changelog
+* Thu Feb 14 2019 Orion Poplawski <orion(a)nwra.com> - 4.4.4-12
+- Rebuild for openmpi 3.1.3
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.4.4-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 3 months
Architecture specific change in rpms/netcdf-cxx4.git
by githook-noreply@fedoraproject.org
The package rpms/netcdf-cxx4.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/netcdf-cxx4.git/commit/?id=428589....
Change:
-%ifarch s390 s390x
Thanks.
Full change:
============
commit 428589f0e55e4930465eb9a047afb783b2325b7a
Author: Orion Poplawski <orion(a)nwra.com>
Date: Thu Feb 14 08:05:20 2019 -0700
Rebuild for openmpi 3.1.3
diff --git a/netcdf-cxx4.spec b/netcdf-cxx4.spec
index ce44a5e..18da7fe 100644
--- a/netcdf-cxx4.spec
+++ b/netcdf-cxx4.spec
@@ -1,6 +1,6 @@
Name: netcdf-cxx4
Version: 4.3.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: NetCDF-4 C++ library
License: NetCDF
@@ -24,10 +24,6 @@ BuildRequires: openssh-clients
%global with_mpich 0
%endif
%endif
-%ifarch s390 s390x
-# No openmpi on s390(x)
-%global with_openmpi 0
-%endif
%if %{with_mpich}
%global mpi_list mpich
@@ -239,6 +235,9 @@ done
%changelog
+* Thu Feb 14 2019 Orion Poplawski <orion(a)nwra.com> - 4.3.0-9
+- Rebuild for openmpi 3.1.3
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.3.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 3 months
Architecture specific change in rpms/rust-erased-serde.git
by githook-noreply@fedoraproject.org
The package rpms/rust-erased-serde.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-erased-serde.git/commit/?id=....
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit bdb3952a02eb2a1df39e56bae243fe7932bf2cad
Author: Sayan Chowdhury <sayan.chowdhury2012(a)gmail.com>
Date: Thu Feb 14 18:25:50 2019 +0530
Intial import for rust-erased-serde
Signed-off-by: Sayan Chowdhury <sayan.chowdhury2012(a)gmail.com>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f5d652d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/erased-serde-0.3.9.crate
diff --git a/rust-erased-serde.spec b/rust-erased-serde.spec
new file mode 100644
index 0000000..4125394
--- /dev/null
+++ b/rust-erased-serde.spec
@@ -0,0 +1,87 @@
+# Generated by rust2rpm
+%bcond_with check
+%global debug_package %{nil}
+
+%global crate erased-serde
+
+Name: rust-%{crate}
+Version: 0.3.9
+Release: 1%{?dist}
+Summary: Type-erased Serialize and Serializer traits
+
+# Upstream license specification: MIT/Apache-2.0
+License: MIT or ASL 2.0
+URL: https://crates.io/crates/erased-serde
+Source: %{crates_source}
+
+ExclusiveArch: %{rust_arches}
+
+BuildRequires: rust-packaging
+BuildRequires: (crate(serde/default) >= 1.0.63 with crate(serde/default) < 2.0.0)
+%if %{with check}
+BuildRequires: (crate(serde_cbor/default) >= 0.9.0 with crate(serde_cbor/default) < 0.10.0)
+BuildRequires: (crate(serde_derive/default) >= 1.0.0 with crate(serde_derive/default) < 2.0.0)
+BuildRequires: (crate(serde_json/default) >= 1.0.0 with crate(serde_json/default) < 2.0.0)
+%endif
+
+%global _description \
+Type-erased Serialize and Serializer traits.
+
+%description %{_description}
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files devel
+%doc README.md
+%license LICENSE-APACHE LICENSE-MIT
+%{cargo_registry}/%{crate}-%{version}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "default" feature of "%{crate}" crate.
+
+%files -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package -n %{name}+unstable-debug-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+unstable-debug-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "unstable-debug" feature of "%{crate}" crate.
+
+%files -n %{name}+unstable-debug-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version_no_tilde} -p1
+%cargo_prep
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%changelog
+* Mon Feb 11 2019 Sayan Chowdhury <sayanchowdhury(a)fedoraproject.org> - 0.3.9-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..e6b9fe5
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (erased-serde-0.3.9.crate) = 8226554d5606088dd11f68414e10e822b54caee6ec051fde2267be41de1f06485a47639e910ac1d8a32c72c3212738734dd58aa6958a0f0a96c8c178bf31f3af
diff --git a/tests/.fmf/version b/tests/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/tests/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/tests/provision.fmf b/tests/provision.fmf
new file mode 100644
index 0000000..e860f10
--- /dev/null
+++ b/tests/provision.fmf
@@ -0,0 +1,6 @@
+---
+standard-inventory-qcow2:
+ qemu:
+ # `cargo test` usually eats more than 1G.
+ m: 4G
+
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..f8ab7e7
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,14 @@
+---
+- hosts: localhost
+ roles:
+ - role: standard-test-basic
+ tags:
+ - classic
+ repositories:
+ - repo: "https://src.fedoraproject.org/tests/rust.git"
+ dest: rust
+ tests:
+ - rust/cargo-test
+ environment:
+ pkg: rust-erased-serde
+
5 years, 3 months
Architecture specific change in rpms/mozjs60.git
by githook-noreply@fedoraproject.org
The package rpms/mozjs60.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/mozjs60.git/commit/?id=44b31ba543....
Change:
+%ifarch aarch64
Thanks.
Full change:
============
commit 44b31ba5436981a2f8b4a08b97f588d0ce38576f
Author: Frantiek Zatloukal <fzatlouk(a)redhat.com>
Date: Wed Feb 13 23:39:26 2019 +0100
Build aarch64 with -O0
diff --git a/mozjs60.spec b/mozjs60.spec
index 81e767d..03403c9 100644
--- a/mozjs60.spec
+++ b/mozjs60.spec
@@ -12,7 +12,7 @@
Name: mozjs%{major}
Version: 60.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: SpiderMonkey JavaScript library
License: MPLv2.0 and MPLv1.1 and BSD and GPLv2+ and GPLv3+ and LGPLv2+ and AFL and ASL 2.0
@@ -96,6 +96,12 @@ rm -rf ../../modules/zlib
%build
# Disable null pointer gcc6 optimization in gcc6 (rhbz#1328045)
export CFLAGS="%{optflags} -fno-tree-vrp -fno-strict-aliasing -fno-delete-null-pointer-checks"
+
+# Use O0 on aarch64 to fix FTBFS (rhbz#1676292)
+%ifarch aarch64
+export CFLAGS=$(echo "$CFLAGS" | sed 's/O2/O0/g')
+%endif
+
export CXXFLAGS="$CFLAGS"
export LINKFLAGS="%{?__global_ldflags}"
export PYTHON="%{__python2}"
@@ -171,6 +177,9 @@ ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so
%{_includedir}/mozjs-%{major}/
%changelog
+* Thu Feb 14 2019 Frantisek Zatloukal <fzatlouk(a)redhat.com> - 60.4.0-3
+- Build aarch64 with -O0 because of rhbz#1676292
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 60.4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 3 months