- security update to CPU 19.1.2016 to u71b15

- and sync with rhel7
2016-01-20 14:03:36 +01:00 · 2016-01-20 14:03:36 +01:00 · 993373a2a0
commit 993373a2a0
parent 8a6194ff5a
12 changed files with 363 additions and 147 deletions
--- a/.gitignore
+++ b/.gitignore
@ -49,3 +49,4 @@
 /jdk8u60-aarch64-jdk8u60-b28.tar.xz
 /jdk8u60-aarch64-jdk8u65-b17.tar.xz
 /aarch64-port-jdk8u60-aarch64-jdk8u65-b17.tar.xz
+/aarch64-jdk8u71-b15.tar.xz
--- a/8146566.patch
+++ b/8146566.patch
@ -0,0 +1,23 @@
+diff -r 3bde96c2f7f5 make/CompileDemos.gmk
+--- openjdk.orig/jdk/make/CompileDemos.gmk	Tue Jan 12 11:47:16 2016 +0000
+++ openjdk/jdk/make/CompileDemos.gmk	Tue Jan 12 15:47:25 2016 +0000
+@@ -229,7 +229,7 @@
+     BUILD_DEMO_JVMTI_$1_LANG := $4
+   endif
+   ifeq (C++, $4)
+-    $1_EXTRA_CXX := $(LDFLAGS_CXX_JDK) $(LIBCXX)
+    $1_EXTRA_CXX := $$(LDFLAGS_CXX_JDK) $(LIBCXX)
+   endif
+ 
+   $1_CXXFLAGS := $(CXXFLAGS_JDKLIB) -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 \
+@@ -251,8 +251,8 @@
+       LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \
+       OPTIMIZATION := LOW, \
+       CXXFLAGS := $$($1_CXXFLAGS), \
+-      LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \
+-      LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \
+      LDFLAGS := $(filter-out -incremental:no -opt:ref, $$(LDFLAGS_JDKLIB)), \
+      LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN), \
+       LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \
+       LDFLAGS_SUFFIX_posix := $5, \
+       LDFLAGS_SUFFIX_windows := $6, \
--- a/aarch64-ifdefbugfix.patch
+++ b/aarch64-ifdefbugfix.patch
@ -1,12 +0,0 @@
-diff --git a/src/share/vm/interpreter/abstractInterpreter.hpp b/src/share/vm/interpreter/abstractInterpreter.hpp
--- openjdk/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp
-+++ openjdk/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp
-@@ -34,7 +34,7 @@
- # include INTERP_MASM_MD_HPP
- #elif defined TARGET_ARCH_x86
- # include "interp_masm_x86.hpp"
-#elif TARGET_ARCH_MODEL_aarch64
-+#elif defined TARGET_ARCH_MODEL_aarch64
- # include "interp_masm_aarch64.hpp"
- #elif defined TARGET_ARCH_MODEL_sparc
- # include "interp_masm_sparc.hpp"
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 # Generates the 'source tarball' for JDK 8 projects.
 #
 # Example:
@ -21,36 +21,69 @@

 set -e

-if [ "x$PROJECT_NAME" = "x" ] ; then
-	echo "no PROJECT_NAME"
-    exit 1
-fi
-if [ "x$REPO_NAME" = "x" ] ; then
-	echo "no REPO_NAME"
-    exit 2
+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 retrive 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 "PR2126 - the path to the PR2126 patch to apply (optional; downloaded if unavailable)"
+    exit 1;
 fi
+
+
 if [ "x$VERSION" = "x" ] ; then
-	echo "no VERSION"
-    exit 3
+    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=http://hg.openjdk.java.net
+    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=xz
+    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
 	
@ -59,6 +92,7 @@ repos="hotspot corba jaxws jaxp langtools nashorn jdk"

 for subrepo in $repos
 do
+    echo "Cloning ${VERSION} ${subrepo} repository from ${REPO_ROOT}"
    hg clone ${REPO_ROOT}/${subrepo} -r ${VERSION}
 done

@ -74,6 +108,7 @@ if [ "x$PR2126" = "x" ] ; then
    patch -Np1 < pr2126.patch
    rm pr2126.patch
 else
+    echo "Applying ${PR2126}"
    patch -Np1 < $PR2126
 fi;

--- a/java-1.8.0-openjdk-rh1191652-jdk.patch
+++ b/java-1.8.0-openjdk-rh1191652-jdk.patch
@ -1,5 +1,6 @@
--- openjdk/jdk/make/lib/SoundLibraries.gmk.orig	2015-03-03 20:52:33.000000000 -0500
-+++ openjdk/jdk/make/lib/SoundLibraries.gmk	2015-03-03 20:54:39.000000000 -0500
+diff -r 1fe56343ecc8 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
@ -11,21 +12,21 @@
   ifeq ($(OPENJDK_TARGET_CPU), aarch64)
 	LIBJSOUND_CFLAGS += -DX_ARCH=X_AARCH64
   endif
-diff -r 87c95759b92b src/share/native/com/sun/media/sound/SoundDefs.h
--- openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Wed Feb 11 18:55:05 2015 -0800
-+++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Tue Feb 17 18:25:01 2015 +0000
-@@ -43,6 +43,8 @@
+diff -r 1fe56343ecc8 src/share/native/com/sun/media/sound/SoundDefs.h
+--- openjdk/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         9
-+#define X_PPC64LE      10
+#define X_PPC64        10
+#define X_PPC64LE      11
 
 // **********************************
 // Make sure you set X_PLATFORM and X_ARCH defines correctly.
-diff -r 87c95759b92b src/solaris/bin/ppc64le/jvm.cfg
+diff -r 1fe56343ecc8 src/solaris/bin/ppc64le/jvm.cfg
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ openjdk/jdk/src/solaris/bin/ppc64le/jvm.cfg	Tue Feb 17 18:25:01 2015 +0000
+++ openjdk/jdk/src/solaris/bin/ppc64le/jvm.cfg	Wed Jan 13 00:18:02 2016 +0000
@@ -0,0 +1,33 @@
 +# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@ -38,6 +38,14 @@
 # note, that order  normal_suffix debug_suffix, in case of both enabled,
 # is expected in one single case at the end of build

+%global bootstrap_build 0
+
+%if %{bootstrap_build}
+%global targets bootcycle-images docs
+%else
+%global targets all
+%endif
+
 %global aarch64         aarch64 arm64 armv8
 # sometimes we need to distinguish big and little endian PPC64
 %global ppc64le         ppc64le
@ -51,6 +59,12 @@
 %global ourcppflags %{nil}
 %global ourldflags %{nil}
 %else
+%ifarch %{aarch64}
+# Disable hardened build on AArch64 as it didn't bootcycle
+%undefine _hardened_build
+%global ourcppflags "-fstack-protector-strong"
+%global ourldflags %{nil}
+%else
 # Filter out flags from the optflags macro that cause problems with the OpenJDK build
 # We filter out -O flags so that the optimisation of HotSpot is not lowered from O3 to O2
 # We filter out -Wall which will otherwise cause HotSpot to produce hundreds of thousands of warnings (100+mb logs)
@ -60,6 +74,7 @@
 %global ourcppflags %(echo %ourflags | sed -e 's|-fexceptions||')
 %global ourldflags %{__global_ldflags}
 %endif
+%endif

 # With diabled nss is NSS deactivated, so in NSS_LIBDIR can be wrong path
 # the initialisation must be here. LAter the pkg-connfig have bugy behaviour
@ -134,7 +149,7 @@
 # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
 %global project         aarch64-port
 %global repo            jdk8u60
-%global revision        aarch64-jdk8u65-b17
+%global revision        aarch64-jdk8u71-b15
 # eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60  (dont forget spec escape % by %%)
 %global whole_update    %(VERSION=%{revision}; echo ${VERSION%%-*})
 # eg  jdk8u60 -> 60 or aarch64-jdk8u60 -> 60
@ -197,8 +212,9 @@ exit 0
 # The pretrans lua scriptlet prevents an unmodified java.security
 # from being replaced via an update. It gets created as
 # java.security.rpmnew instead. This invalidates the patch of
-# JDK-8061210 of the January 2015 CPU or JDK-8043201 of the
-# July 2015 CPU. We fix this via a post scriptlet which runs on updates.
+# JDK-8061210 of the January 2015 CPU, JDK-8043201 of the
+# July 2015 CPU and JDK-8141287 of the January 2016 CPU. We
+# fix this via a post scriptlet which runs on updates.
 if [ "$1" -gt 1 ]; then
  javasecurity="%{_jvmdir}/%{uniquesuffix}/jre/lib/security/java.security"
  sum=$(md5sum "${javasecurity}" | cut -d' ' -f1)
@ -207,7 +223,8 @@ if [ "$1" -gt 1 ]; then
       "${sum}" = 'b138695d0c0ea947e64a21a627d973ba' -o \\
       "${sum}" = 'd17958676bdb9f9d941c8a59655311fb' -o \\
       "${sum}" = '5463aef7dbf0bbcfe79e0336a7f92701' -o \\
-       "${sum}" = '400cc64d4dd31f36dc0cc2c701d603db' ]; then
+       "${sum}" = '400cc64d4dd31f36dc0cc2c701d603db' -o \\
+       "${sum}" = '321342219bb130d238ff144b9e5dbfc1' ]; then
    if [ -f "${javasecurity}.rpmnew" ]; then
      mv -f "${javasecurity}.rpmnew" "${javasecurity}"
    fi
@ -735,10 +752,11 @@ Group:   Development/Languages
 License:  ASL 1.1 and ASL 2.0 and GPL+ and GPLv2 and GPLv2 with exceptions and LGPL+ and LGPLv2 and MPLv1.0 and MPLv1.1 and Public Domain and W3C
 URL:      http://openjdk.java.net/

-# Source from upstrem OpenJDK8 project. To regenerate, use
 # aarch64-port now contains integration forest of both aarch64 and normal jdk
-# ./generate_source_tarball.sh aarch64-port jdk8u60 aarch64-jdk8u65-b17
-Source0:  %{project}-%{repo}-%{revision}.tar.xz
+# Source from upstream OpenJDK8 project. To regenerate, use
+# VERSION=aarch64-jdk8u71-b15 FILE_NAME_ROOT=${VERSION}
+# REPO_ROOT=<path to checked-out repository> generate_source_tarball.sh
+Source0:  %{revision}.tar.xz

 # Custom README for -src subpackage
 Source2:  README.src
@ -772,54 +790,65 @@ Source101: config.sub

 # Ignore AWTError when assistive technologies are loaded 
 Patch1:   %{name}-accessible-toolkit.patch
-
 # Restrict access to java-atk-wrapper classes
 Patch3: java-atk-wrapper-security.patch
-# Allow multiple initialization of PKCS11 libraries
+
+# Upstreamable patches
+# PR2737: Allow multiple initialization of PKCS11 libraries
 Patch5: multiple-pkcs11-library-init.patch
-# Include all sources in src.zip
-Patch7: include-all-srcs.patch
-# Problem discovered with make 4.0
-Patch12: removeSunEcProvider-RH1154143.patch
-
-#
-# OpenJDK specific patches
-#
+# PR2095, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure (sync with IcedTea 2.x)
+Patch504: rh1163501.patch
+# S4890063, PR2304, RH1214835: HPROF: default text truncated when using doe=n option (upstreaming post-CPU 2015/07)
+Patch511: rh1214835.patch
+# Turn off strict overflow on IndicRearrangementProcessor{,2}.cpp following 8140543: Arrange font actions
+Patch512: no_strict_overflow.patch

+# Arch-specific upstreamable patches
 # JVM heap size changes for s390 (thanks to aph)
 Patch100: %{name}-s390-java-opts.patch
 # Type fixing for s390
 Patch102: %{name}-size_t.patch
+# Use "%z" for size_t on s390 as size_t != intptr_t
+Patch103: s390-size_t_format_flags.patch

-Patch201: system-libjpeg.patch
+# Patches which need backporting to 8u
+# S8073139, RH1191652; fix name of ppc64le architecture
+Patch601: %{name}-rh1191652-root.patch
+Patch602: %{name}-rh1191652-jdk.patch
+Patch603: %{name}-rh1191652-hotspot-aarch64.patch
+# Include all sources in src.zip
+Patch7: include-all-srcs.patch
+# 8035341: Allow using a system installed libpng
 Patch202: system-libpng.patch
+# 8042159: Allow using a system-installed lcms2
 Patch203: system-lcms.patch
-
-Patch300: jstack-pr1845.patch
-
-# Fixes StackOverflowError on ARM32 bit Zero. See RHBZ#1206656
-Patch403: rhbz1206656_fix_current_stack_pointer.patch
-
-# PR2428: OpenJDK build can't handle commas in LDFLAGS
-Patch501: pr2428.patch
 # PR2462: Backport "8074839: 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-01.patch
 Patch503: pr2462-02.patch
-# PR2095, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure (sync with IcedTea 2.x)
-Patch504: rh1163501.patch
-# S8143855: Bad printf formatting in frame_zero.cpp (upstream from u76)
-Patch505: 8143855.patch
-# S4890063, PR2304, RH1214835: HPROF: default text truncated when using doe=n option (upstreaming post-CPU 2015/07)
-Patch511: rh1214835.patch
-
-# RH1191652; fix name of ppc64le architecture
-Patch601: %{name}-rh1191652-root.patch
-Patch602: %{name}-rh1191652-jdk.patch
-Patch603: %{name}-rh1191652-hotspot-aarch64.patch
-Patch604: aarch64-ifdefbugfix.patch
+# S8140620, PR2769: Find and load default.sf2 as the default soundbank on Linux
 Patch605: soundFontPatch.patch

+# Patches upstream and appearing in 8u76
+# Fixes StackOverflowError on ARM32 bit Zero. See RHBZ#1206656
+# 8087120: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms
+Patch403: rhbz1206656_fix_current_stack_pointer.patch
+# S8146566, PR2428: OpenJDK build can't handle commas in LDFLAGS
+Patch501: 8146566.patch
+# S8143855: Bad printf formatting in frame_zero.cpp 
+Patch505: 8143855.patch
+
+# Patches ineligible for 8u
+# 8043805: Allow using a system-installed libjpeg
+Patch201: system-libjpeg.patch
+
+# Local fixes
+# Turns off ECC support as we don't ship the SunEC provider currently
+Patch12: removeSunEcProvider-RH1154143.patch
+
+# Non-OpenJDK fixes
+Patch300: jstack-pr1845.patch
+
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: alsa-lib-devel
@ -855,7 +884,6 @@ BuildRequires: tzdata-java >= 2015d

 # cacerts build requirement.
 BuildRequires: openssl
-#prelink was removed from fedora
 %if %{with_systemtap}
 BuildRequires: systemtap-sdt-devel
 %endif
@ -1078,6 +1106,7 @@ sh %{SOURCE12}
 %ifarch s390
 %patch100
 %patch102
+%patch103
 %endif

 # Zero PPC fixes.
@ -1086,7 +1115,6 @@ sh %{SOURCE12}
 %patch603
 %patch601
 %patch602
-%patch604
 %patch605

 %patch501
@ -1095,6 +1123,7 @@ sh %{SOURCE12}
 %patch504
 %patch505
 %patch511
+%patch512

 # Extract systemtap tapsets
 %if %{with_systemtap}
@ -1220,7 +1249,7 @@ make \
    STRIP_POLICY=no_strip \
    POST_STRIP_CMD="" \
    LOG=trace \
-    all
+    %{targets}

 # the build (erroneously) removes read permissions from some jars
 # this is a regression in OpenJDK 7 (our compiler):
@ -1652,6 +1681,10 @@ require "copy_jdk_configs.lua"
 %endif

 %changelog
+* Wed Jan 20 2016 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.71-2.b15
+- sync with rhel7
+- security update to CPU 19.1.2016 to u71b15
+
 * Tue Dec 15 2015 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.65-14.b17
 - pretrans moved back to lua nd now includes file from copy-jdk-configs instead of call it

--- a/no_strict_overflow.patch
+++ b/no_strict_overflow.patch
@ -0,0 +1,16 @@
+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), \
--- a/pr2428.patch
+++ b/pr2428.patch
@ -1,27 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1434497865 -3600
-#      Wed Jun 17 00:37:45 2015 +0100
-# Node ID adf1b3700c5ba6c13eb8f9d8eb4d6d32085bd483
-# Parent  9e470ada9ea747f711ad2bd5b69e8124fbad384f
-PR2428: OpenJDK build can't handle commas in LDFLAGS
-Summary: Expand LDFLAGS outside function call, as is done with CFLAGS
-
-diff -r 9e470ada9ea7 -r adf1b3700c5b make/CompileDemos.gmk
--- openjdk/jdk/make/CompileDemos.gmk	Mon Jun 08 19:25:43 2015 +0100
-+++ openjdk/jdk/make/CompileDemos.gmk	Wed Jun 17 00:37:45 2015 +0100
-@@ -246,12 +246,13 @@
-       -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3
- 
-   # Remove the -incremental:no setting to get .ilk-files like in the old build.
-+  BUILD_DEMO_JVMTI_$1_LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB))
-+  
-   $$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1, \
-       SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \
-       LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \
-       OPTIMIZATION := LOW, \
-       CXXFLAGS := $$($1_CXXFLAGS), \
-      LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \
-       LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \
-       LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \
-       LDFLAGS_SUFFIX_posix := $5, \
--- a/removeSunEcProvider-RH1154143.patch
+++ b/removeSunEcProvider-RH1154143.patch
@ -1,6 +1,6 @@
-diff -r 135101850ef1 src/share/lib/security/java.security-linux
--- openjdk/jdk/src/share/lib/security/java.security-linux	Wed Jun 03 20:23:19 2015 -0700
-+++ openjdk/jdk/src/share/lib/security/java.security-linux	Thu Jul 02 04:02:18 2015 +0100
+diff -r 1fe56343ecc8 src/share/lib/security/java.security-linux
+--- openjdk/jdk/src/share/lib/security/java.security-linux	Tue Jan 12 21:01:12 2016 +0000
+++ openjdk/jdk/src/share/lib/security/java.security-linux	Tue Jan 12 23:59:19 2016 +0000
@@ -67,13 +67,13 @@
 #
 security.provider.1=sun.security.provider.Sun
@ -22,12 +22,12 @@ diff -r 135101850ef1 src/share/lib/security/java.security-linux
 
 #
 # Sun Provider SecureRandom seed source.
-@@ -500,7 +500,7 @@
+@@ -509,7 +509,7 @@
 #
 # Example:
 #   jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048
-jdk.tls.disabledAlgorithms=SSLv3, RC4, DH keySize < 768
-+jdk.tls.disabledAlgorithms=SSLv3, RC4, DH keySize < 768, EC, ECDHE, ECDH
+-jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768
+jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768, EC, ECDHE, ECDH
 
 # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS)
 # processing in JSSE implementation.
--- a/s390-size_t_format_flags.patch
+++ b/s390-size_t_format_flags.patch
@ -0,0 +1,130 @@
+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
+ 
+#ifdef S390
+#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
--- a/2
+++ b/2
@ -1,2 +1,2 @@
 94ca5a45c3cb3b85c4577d0891166007  systemtap-tapset.tar.gz
-f6ee06389f8ac0890ce5d003b2c0fb0a  aarch64-port-jdk8u60-aarch64-jdk8u65-b17.tar.xz
+07a99eb8771002d80862dbefd7629212  aarch64-jdk8u71-b15.tar.xz
--- a/system-lcms.patch
+++ b/system-lcms.patch
@ -51,52 +51,68 @@ diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
 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
-@@ -661,8 +661,8 @@
+@@ -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, \
-+$(eval $(call SetupNativeCompilation,BUILD_LIBJAVALCMS, \
-+    LIBRARY := javalcms, \
+ $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
+     LIBRARY := lcms, \
     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-     SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
+-    SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
+    SRC := $(LIBLCMS_DIR), \
+    INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
     LANG := C, \
-@@ -680,19 +680,19 @@
+     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_solaris := -lawt -ljava -ljvm -lc, \
+-    LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \
 -    LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \
-+    LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm -llcms2, \
-     LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm,\
+-    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" \
-        -D "JDK_INTERNAL_NAME=lcms" \
-+        -D "JDK_FNAME=javalcms.dll" \
-+        -D "JDK_INTERNAL_NAME=javalcms" \
-         -D "JDK_FTYPE=0x2L", \
-    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/liblcms, \
-+    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavalcms, \
-     DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+         -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"
 
-BUILD_LIBRARIES += $(BUILD_LIBLCMS)
-+BUILD_LIBRARIES += $(BUILD_LIBJAVALCMS)
 
-$(BUILD_LIBLCMS): $(BUILD_LIBAWT)
-+$(BUILD_LIBJAVALCMS): $(BUILD_LIBAWT)
- 
- ##########################################################################################
- 
-diff -ruN jdk8/jdk/src/share/classes/sun/cmm/lcms/LCMS.java jdk8/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java
--- jdk8/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java	2013-10-31 19:44:18.000000000 -0400
-+++ jdk8/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java	2013-11-14 22:05:11.476356403 -0500
-@@ -207,7 +207,7 @@
-                          * disposer frameworks
-                          */
-                         System.loadLibrary("awt");
-                        System.loadLibrary("lcms");
-+                        System.loadLibrary("javalcms");
-                         return null;
-                     }
-                 });