diff --git a/094308b2ca1c.tar.bz2 b/094308b2ca1c.tar.bz2
deleted file mode 100644
index 06c3349..0000000
--- a/094308b2ca1c.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:45d4a28319e475c97a8704bd8f1eb196182837302b8a1cf7aebf0101b3ac8185
-size 2384057
diff --git a/1015432.patch b/1015432.patch
index 615dd16..ebaa07c 100644
--- a/1015432.patch
+++ b/1015432.patch
@@ -1,5 +1,5 @@
---- jdk8/hotspot/src/os/linux/vm/os_linux.cpp Wed Oct 23 15:44:12 2013 -0700
-+++ jdk8/hotspot/src/os/linux/vm/os_linux.cpp Thu Dec 19 16:03:33 2013 +0000
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp Wed Oct 23 15:44:12 2013 -0700
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Thu Dec 19 16:03:33 2013 +0000
@@ -4797,9 +4797,19 @@
// size. Add a page for compiler2 recursion in main thread.
// Add in 2*BytesPerWord times page size to account for VM stack during
diff --git a/1c71899e8566.tar.bz2 b/1c71899e8566.tar.bz2
deleted file mode 100644
index b7a5fcb..0000000
--- a/1c71899e8566.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c8a7d2a2d3b03ed789c0dec7700cd380382169387409dd2326958aeb47821cd0
-size 2734305
diff --git a/223b64a19e94.tar.bz2 b/223b64a19e94.tar.bz2
deleted file mode 100644
index c5d6142..0000000
--- a/223b64a19e94.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65d138f228d2fe02488247bb9a00e87c39d2dbc2789298fadeef75b79358add0
-size 7802769
diff --git a/3fbef9f4cddf.tar.bz2 b/3fbef9f4cddf.tar.bz2
deleted file mode 100644
index 3a9106f..0000000
--- a/3fbef9f4cddf.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:83f2dc73d48d739b6b73cda4aa5045252634ca75d235acff21769d68ff6b5022
-size 407402
diff --git a/43c11664317a.tar.bz2 b/43c11664317a.tar.bz2
deleted file mode 100644
index f0aace7..0000000
--- a/43c11664317a.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8d707df27a09328d91ec71317770f9e6aa63631097f15f20538c4a79871cdc9d
-size 8136498
diff --git a/PStack-808293.patch b/PStack-808293.patch
deleted file mode 100644
index bb83c60..0000000
--- a/PStack-808293.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- jdk8/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java 2012-04-06 02:26:33.322164601 +0200
-+++ jdk8/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java 2012-04-06 02:26:57.958514071 +0200
-@@ -1,5 +1,6 @@
- /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2012, Red Hat Inc.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -84,7 +85,8 @@
- out.print("----------------- ");
- out.print(th);
- out.println(" -----------------");
-- while (f != null) {
-+ int maxStack = 256;
-+ while (f != null && maxStack-- > 0) {
- ClosestSymbol sym = f.closestSymbolToPC();
- Address pc = f.pc();
- out.print(pc + "\t");
-@@ -158,10 +160,19 @@
- }
- }
- }
-+ Address oldPC = f.pc();
-+ Address oldFP = f.localVariableBase();
- f = f.sender(th);
-+ if (f != null
-+ && oldPC.equals(f.pc())
-+ && oldFP.equals(f.localVariableBase())) {
-+ // We didn't make any progress
-+ f = null;
-+ }
- }
- } catch (Exception exp) {
-- exp.printStackTrace();
-+ // exp.printStackTrace();
-+ out.println("bad stack: " + exp);
- // continue, may be we can do a better job for other threads
- }
- if (concurrentLocks) {
diff --git a/TestCryptoLevel.java b/TestCryptoLevel.java
deleted file mode 100644
index 325a89c..0000000
--- a/TestCryptoLevel.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* TestCryptoLevel -- Ensure unlimited crypto policy is in use.
- Copyright (C) 2012 Red Hat, Inc.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program. If not, see .
-*/
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-
-import java.security.Permission;
-import java.security.PermissionCollection;
-
-public class TestCryptoLevel
-{
- public static void main(String[] args)
- throws NoSuchFieldException, ClassNotFoundException,
- IllegalAccessException, InvocationTargetException
- {
- Class cls = null;
- Method def = null, exempt = null;
-
- try
- {
- cls = Class.forName("javax.crypto.JceSecurity");
- }
- catch (ClassNotFoundException ex)
- {
- System.err.println("Running a non-Sun JDK.");
- System.exit(0);
- }
- try
- {
- def = cls.getDeclaredMethod("getDefaultPolicy");
- exempt = cls.getDeclaredMethod("getExemptPolicy");
- }
- catch (NoSuchMethodException ex)
- {
- System.err.println("Running IcedTea with the original crypto patch.");
- System.exit(0);
- }
- def.setAccessible(true);
- exempt.setAccessible(true);
- PermissionCollection defPerms = (PermissionCollection) def.invoke(null);
- PermissionCollection exemptPerms = (PermissionCollection) exempt.invoke(null);
- Class apCls = Class.forName("javax.crypto.CryptoAllPermission");
- Field apField = apCls.getDeclaredField("INSTANCE");
- apField.setAccessible(true);
- Permission allPerms = (Permission) apField.get(null);
- if (defPerms.implies(allPerms) && (exemptPerms == null || exemptPerms.implies(allPerms)))
- {
- System.err.println("Running with the unlimited policy.");
- System.exit(0);
- }
- else
- {
- System.err.println("WARNING: Running with a restricted crypto policy.");
- System.exit(-1);
- }
- }
-}
diff --git a/_constraints b/_constraints
index dd4c265..34ffef9 100644
--- a/_constraints
+++ b/_constraints
@@ -4,7 +4,7 @@
2048
- 6
+ 20
diff --git a/aarch64-misc.patch b/aarch64-misc.patch
deleted file mode 100644
index 3efcf03..0000000
--- a/aarch64-misc.patch
+++ /dev/null
@@ -1,211 +0,0 @@
---- jdk8/common/autoconf/build-aux/autoconf-config.sub 2015-07-10 06:29:38.191114297 +0200
-+++ jdk8/common/autoconf/build-aux/autoconf-config.sub 2015-07-10 07:44:34.468972246 +0200
-@@ -264,6 +264,7 @@
- # Some are omitted here because they have special meanings below.
- 1750a | 580 \
- | a29k \
-+ | aarch64 \
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
-@@ -340,6 +341,7 @@
- # Recognize the basic CPU types with company name.
- 580-* \
- | a29k-* \
-+ | aarch64-* \
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
---- jdk8/common/autoconf/generated-configure.sh 2015-07-10 06:29:38.193114252 +0200
-+++ jdk8/common/autoconf/generated-configure.sh 2015-07-10 07:44:34.477972040 +0200
-@@ -6835,6 +6835,12 @@
- VAR_CPU_BITS=64
- VAR_CPU_ENDIAN=little
- ;;
-+ aarch64)
-+ VAR_CPU=aarch64
-+ VAR_CPU_ARCH=aarch64
-+ VAR_CPU_BITS=64
-+ VAR_CPU_ENDIAN=little
-+ ;;
- powerpc)
- VAR_CPU=ppc
- VAR_CPU_ARCH=ppc
-@@ -6972,6 +6978,12 @@
- VAR_CPU_BITS=64
- VAR_CPU_ENDIAN=little
- ;;
-+ aarch64)
-+ VAR_CPU=aarch64
-+ VAR_CPU_ARCH=aarch64
-+ VAR_CPU_BITS=64
-+ VAR_CPU_ENDIAN=little
-+ ;;
- powerpc)
- VAR_CPU=ppc
- VAR_CPU_ARCH=ppc
-@@ -7942,11 +7954,6 @@
- JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
- JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'`
-
-- if test "x$JVM_VARIANT_CLIENT" = xtrue; then
-- if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-- as_fn_error $? "You cannot build a client JVM for a 64-bit machine." "$LINENO" 5
-- fi
-- fi
- if test "x$JVM_VARIANT_KERNEL" = xtrue; then
- if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
- as_fn_error $? "You cannot build a kernel JVM for a 64-bit machine." "$LINENO" 5
-@@ -7989,6 +7996,9 @@
- if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
- INCLUDE_SA=false
- fi
-+ if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-+ INCLUDE_SA=false
-+ fi
-
-
- if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
-@@ -29654,7 +29664,7 @@
- #
- case $COMPILER_NAME in
- gcc )
-- CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
-+ CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses \
- -pipe \
- -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
- case $OPENJDK_TARGET_CPU_ARCH in
-@@ -29899,6 +29909,9 @@
- s390)
- ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}31"
- ;;
-+ aarch64)
-+ ZERO_ARCHFLAG=""
-+ ;;
- *)
- ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
- esac
---- jdk8/common/autoconf/jdk-options.m4 2015-07-10 06:29:38.193114252 +0200
-+++ jdk8/common/autoconf/jdk-options.m4 2015-07-10 07:44:34.479971994 +0200
-@@ -164,6 +164,9 @@
- if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
- INCLUDE_SA=false
- fi
-+ if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-+ INCLUDE_SA=false
-+ fi
- AC_SUBST(INCLUDE_SA)
-
- if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
---- jdk8/common/autoconf/platform.m4 2015-07-10 06:29:38.194114229 +0200
-+++ jdk8/common/autoconf/platform.m4 2015-07-10 07:44:34.479971994 +0200
-@@ -54,6 +54,12 @@
- VAR_CPU_BITS=64
- VAR_CPU_ENDIAN=little
- ;;
-+ aarch64)
-+ VAR_CPU=aarch64
-+ VAR_CPU_ARCH=aarch64
-+ VAR_CPU_BITS=64
-+ VAR_CPU_ENDIAN=little
-+ ;;
- powerpc)
- VAR_CPU=ppc
- VAR_CPU_ARCH=ppc
---- jdk8/common/autoconf/toolchain.m4 2015-07-10 06:29:38.194114229 +0200
-+++ jdk8/common/autoconf/toolchain.m4 2015-07-10 07:44:34.479971994 +0200
-@@ -957,7 +957,7 @@
- #
- case $COMPILER_NAME in
- gcc )
-- CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
-+ CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses \
- -pipe \
- -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
- case $OPENJDK_TARGET_CPU_ARCH in
-@@ -1237,6 +1237,9 @@
- s390)
- ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}31"
- ;;
-+ aarch64)
-+ ZERO_ARCHFLAG=""
-+ ;;
- *)
- ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
- esac
---- jdk8/jdk/make/gensrc/GensrcMisc.gmk 2015-07-02 06:53:30.000000000 +0200
-+++ jdk8/jdk/make/gensrc/GensrcMisc.gmk 2015-07-10 07:44:34.480971971 +0200
-@@ -76,7 +76,7 @@
- INCLUDE_FILES := $(GENSRC_SOR_SRC_FILE), \
- LANG := C, \
- CC := $(BUILD_CC), \
-- LDEXE := $(BUILD_LD), \
-+ LDEXE := $(BUILD_CC), \
- OBJECT_DIR := $(GENSRC_SOR_BIN), \
- OUTPUT_DIR := $(GENSRC_SOR_BIN), \
- PROGRAM := genSocketOptionRegistry))
---- jdk8/jdk/make/lib/SoundLibraries.gmk 2015-07-02 06:53:30.000000000 +0200
-+++ jdk8/jdk/make/lib/SoundLibraries.gmk 2015-07-10 07:44:34.480971971 +0200
-@@ -139,6 +139,10 @@
- ifeq ($(OPENJDK_TARGET_CPU), ppc64)
- LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC64
- endif
-+
-+ ifeq ($(OPENJDK_TARGET_CPU), aarch64)
-+ LIBJSOUND_CFLAGS += -DX_ARCH=X_AARCH64
-+ endif
- endif
-
- LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"'
---- jdk8/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2015-07-02 06:53:30.000000000 +0200
-+++ jdk8/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2015-07-10 07:44:34.480971971 +0200
-@@ -43,6 +43,7 @@
- #define X_ZERO 6
- #define X_ARM 7
- #define X_PPC 8
-+#define X_AARCH64 9
-
- // **********************************
- // Make sure you set X_PLATFORM and X_ARCH defines correctly.
---- jdk8/jdk/src/solaris/bin/aarch64/jvm.cfg 1970-01-01 01:00:00.000000000 +0100
-+++ jdk8/jdk/src/solaris/bin/aarch64/jvm.cfg 2015-07-10 07:44:34.480971971 +0200
-@@ -0,0 +1,39 @@
-+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# This code is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License version 2 only, as
-+# published by the Free Software Foundation. Oracle designates this
-+# particular file as subject to the "Classpath" exception as provided
-+# by Oracle in the LICENSE file that accompanied this code.
-+#
-+# This code is distributed in the hope that it will be useful, but WITHOUT
-+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+# version 2 for more details (a copy is included in the LICENSE file that
-+# accompanied this code).
-+#
-+# You should have received a copy of the GNU General Public License version
-+# 2 along with this work; if not, write to the Free Software Foundation,
-+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+#
-+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+# or visit www.oracle.com if you need additional information or have any
-+# questions.
-+#
-+# List of JVMs that can be used as an option to java, javac, etc.
-+# Order is important -- first in this list is the default JVM.
-+# NOTE that this both this file and its format are UNSUPPORTED and
-+# WILL GO AWAY in a future release.
-+#
-+# You may also select a JVM in an arbitrary location with the
-+# "-XXaltjvm=" option, but that too is unsupported
-+# and may not be available in a future release.
-+#
-+# n.b. server must be first so it is used as the default
-+-server KNOWN
-+-minimal ERROR
-+-cacao ERROR
-+-zero KNOWN
-+-shark ERROR
-+-jamvm ERROR
diff --git a/adlc-parser.patch b/adlc-parser.patch
index fdb113c..f1b93af 100644
--- a/adlc-parser.patch
+++ b/adlc-parser.patch
@@ -1,5 +1,5 @@
---- jdk8/hotspot/src/share/vm/adlc/formsopt.cpp 2014-07-03 21:56:12.000000000 +0200
-+++ jdk8/hotspot/src/share/vm/adlc/formsopt.cpp 2014-07-14 11:43:21.900408570 +0200
+--- openjdk/hotspot/src/share/vm/adlc/formsopt.cpp 2014-07-03 21:56:12.000000000 +0200
++++ openjdk/hotspot/src/share/vm/adlc/formsopt.cpp 2014-07-14 11:43:21.900408570 +0200
@@ -347,6 +347,7 @@
_return_value = NULL;
_c_return_value = NULL;
diff --git a/b6ee21a35619.tar.bz2 b/b6ee21a35619.tar.bz2
deleted file mode 100644
index 795ba54..0000000
--- a/b6ee21a35619.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3832f21a9e9e98be67642213d92a78767a355ff66b941852ab465d02cc680910
-size 2841928
diff --git a/c44179bce874.tar.bz2 b/c44179bce874.tar.bz2
deleted file mode 100644
index 6c94bc2..0000000
--- a/c44179bce874.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eed50b69d174e8d5143d76641dfa91336eee9ec7cbd1792a6cf6e10de2cd95ed
-size 45953534
diff --git a/c6f67bea4466.tar.bz2 b/c6f67bea4466.tar.bz2
deleted file mode 100644
index aeeb378..0000000
--- a/c6f67bea4466.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e307899ddf4ca9e6bf613c877bc99a2bcc781d4f4b61afc0e5ab8ac113939fcb
-size 2534293
diff --git a/compare-pointer-with-literal.patch b/compare-pointer-with-literal.patch
index ca60a10..2091d54 100644
--- a/compare-pointer-with-literal.patch
+++ b/compare-pointer-with-literal.patch
@@ -1,5 +1,5 @@
---- jdk8/jdk/src/solaris/native/sun/awt/awt_Font.c 2014-06-23 01:01:34.000000000 +0200
-+++ jdk8/jdk/src/solaris/native/sun/awt/awt_Font.c 2014-07-08 23:22:33.235559628 +0200
+--- openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c 2014-06-23 01:01:34.000000000 +0200
++++ openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c 2014-07-08 23:22:33.235559628 +0200
@@ -502,7 +502,7 @@
jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10,
nativename, size * 10);
diff --git a/config.guess b/config.guess
deleted file mode 100644
index 49ec48b..0000000
--- a/config.guess
+++ /dev/null
@@ -1,1420 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-# Copyright 1992-2014 Free Software Foundation, Inc.
-
-timestamp='2014-03-23'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see .
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program. This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-#
-# Originally written by Per Bothner.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-#
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
-
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
- -h, --help print this help, then exit
- -t, --time-stamp print date of last modification, then exit
- -v, --version print version number, then exit
-
-Report bugs and patches to ."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
- case $1 in
- --time-stamp | --time* | -t )
- echo "$timestamp" ; exit ;;
- --version | -v )
- echo "$version" ; exit ;;
- --help | --h* | -h )
- echo "$usage"; exit ;;
- -- ) # Stop option processing
- shift; break ;;
- - ) # Use stdin as input.
- break ;;
- -* )
- echo "$me: invalid option $1$help" >&2
- exit 1 ;;
- * )
- break ;;
- esac
-done
-
-if test $# != 0; then
- echo "$me: too many arguments$help" >&2
- exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int x;" > $dummy.c ;
- for c in cc gcc c89 c99 ; do
- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
- CC_FOR_BUILD="$c"; break ;
- fi ;
- done ;
- if test x"$CC_FOR_BUILD" = x ; then
- CC_FOR_BUILD=no_compiler_found ;
- fi
- ;;
- ,,*) CC_FOR_BUILD=$CC ;;
- ,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
- PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-case "${UNAME_SYSTEM}" in
-Linux|GNU|GNU/*)
- # If the system lacks a compiler, then just pick glibc.
- # We could probably try harder.
- LIBC=gnu
-
- eval $set_cc_for_build
- cat <<-EOF > $dummy.c
- #include
- #if defined(__UCLIBC__)
- LIBC=uclibc
- #elif defined(__dietlibc__)
- LIBC=dietlibc
- #else
- LIBC=gnu
- #endif
- EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
- ;;
-esac
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- *:NetBSD:*:*)
- # NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
- # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
- # switched to ELF, *-*-netbsd* would select the old
- # object file format. This provides both forward
- # compatibility and a consistent mechanism for selecting the
- # object file format.
- #
- # Note: NetBSD doesn't particularly care about the vendor
- # portion of the name. We always set it to "unknown".
- sysctl="sysctl -n hw.machine_arch"
- UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
- case "${UNAME_MACHINE_ARCH}" in
- armeb) machine=armeb-unknown ;;
- arm*) machine=arm-unknown ;;
- sh3el) machine=shl-unknown ;;
- sh3eb) machine=sh-unknown ;;
- sh5el) machine=sh5le-unknown ;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- esac
- # The Operating System including object format, if it has switched
- # to ELF recently, or will in the future.
- case "${UNAME_MACHINE_ARCH}" in
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ELF__
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
- os=netbsd
- else
- os=netbsdelf
- fi
- ;;
- *)
- os=netbsd
- ;;
- esac
- # The OS release
- # Debian GNU/NetBSD machines have a different userland, and
- # thus, need a distinct triplet. However, they do not need
- # kernel version information, so it can be replaced with a
- # suitable tag, in the style of linux-gnu.
- case "${UNAME_VERSION}" in
- Debian*)
- release='-gnu'
- ;;
- *)
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- ;;
- esac
- # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
- # contains redundant information, the shorter form:
- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
- exit ;;
- *:Bitrig:*:*)
- UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
- exit ;;
- *:OpenBSD:*:*)
- UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
- exit ;;
- *:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
- exit ;;
- *:SolidBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
- exit ;;
- macppc:MirBSD:*:*)
- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
- *:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
- alpha:OSF1:*:*)
- case $UNAME_RELEASE in
- *4.0)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- ;;
- *5.*)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
- ;;
- esac
- # According to Compaq, /usr/sbin/psrinfo has been available on
- # OSF/1 and Tru64 systems produced since 1995. I hope that
- # covers most systems running today. This code pipes the CPU
- # types through head -n 1, so we only detect the type of CPU 0.
- ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
- case "$ALPHA_CPU_TYPE" in
- "EV4 (21064)")
- UNAME_MACHINE="alpha" ;;
- "EV4.5 (21064)")
- UNAME_MACHINE="alpha" ;;
- "LCA4 (21066/21068)")
- UNAME_MACHINE="alpha" ;;
- "EV5 (21164)")
- UNAME_MACHINE="alphaev5" ;;
- "EV5.6 (21164A)")
- UNAME_MACHINE="alphaev56" ;;
- "EV5.6 (21164PC)")
- UNAME_MACHINE="alphapca56" ;;
- "EV5.7 (21164PC)")
- UNAME_MACHINE="alphapca57" ;;
- "EV6 (21264)")
- UNAME_MACHINE="alphaev6" ;;
- "EV6.7 (21264A)")
- UNAME_MACHINE="alphaev67" ;;
- "EV6.8CB (21264C)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.8AL (21264B)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.8CX (21264D)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.9A (21264/EV69A)")
- UNAME_MACHINE="alphaev69" ;;
- "EV7 (21364)")
- UNAME_MACHINE="alphaev7" ;;
- "EV7.9 (21364A)")
- UNAME_MACHINE="alphaev79" ;;
- esac
- # A Pn.n version is a patched version.
- # A Vn.n version is a released version.
- # A Tn.n version is a released field test version.
- # A Xn.n version is an unreleased experimental baselevel.
- # 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
- exitcode=$?
- trap '' 0
- exit $exitcode ;;
- Alpha\ *:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # Should we change UNAME_MACHINE based on the output of uname instead
- # of the specific Alpha model?
- echo alpha-pc-interix
- exit ;;
- 21064:Windows_NT:50:3)
- echo alpha-dec-winnt3.5
- exit ;;
- Amiga*:UNIX_System_V:4.0:*)
- echo m68k-unknown-sysv4
- exit ;;
- *:[Aa]miga[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-amigaos
- exit ;;
- *:[Mm]orph[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-morphos
- exit ;;
- *:OS/390:*:*)
- echo i370-ibm-openedition
- exit ;;
- *:z/VM:*:*)
- echo s390-ibm-zvmoe
- exit ;;
- *:OS400:*:*)
- echo powerpc-ibm-os400
- exit ;;
- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
- exit ;;
- arm*:riscos:*:*|arm*:RISCOS:*:*)
- echo arm-unknown-riscos
- exit ;;
- SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- echo hppa1.1-hitachi-hiuxmpp
- exit ;;
- Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
- if test "`(/bin/universe) 2>/dev/null`" = att ; then
- echo pyramid-pyramid-sysv3
- else
- echo pyramid-pyramid-bsd
- fi
- exit ;;
- NILE*:*:*:dcosx)
- echo pyramid-pyramid-svr4
- exit ;;
- DRS?6000:unix:4.0:6*)
- echo sparc-icl-nx6
- exit ;;
- DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
- case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7; exit ;;
- esac ;;
- s390x:SunOS:*:*)
- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
- echo i386-pc-auroraux${UNAME_RELEASE}
- exit ;;
- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- eval $set_cc_for_build
- SUN_ARCH="i386"
- # If there is a compiler, see if it is configured for 64-bit objects.
- # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
- # This test works for both compilers.
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- SUN_ARCH="x86_64"
- fi
- fi
- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:6*:*)
- # According to config.sub, this is the proper way to canonicalize
- # SunOS6. Hard to guess exactly what SunOS6 will be like, but
- # it's likely to be more like Solaris than SunOS4.
- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:*:*)
- case "`/usr/bin/arch -k`" in
- Series*|S4*)
- UNAME_RELEASE=`uname -v`
- ;;
- esac
- # Japanese Language versions have a version number like `4.1.3-JL'.
- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit ;;
- sun3*:SunOS:*:*)
- echo m68k-sun-sunos${UNAME_RELEASE}
- exit ;;
- sun*:*:4.2BSD:*)
- UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
- case "`/bin/arch`" in
- sun3)
- echo m68k-sun-sunos${UNAME_RELEASE}
- ;;
- sun4)
- echo sparc-sun-sunos${UNAME_RELEASE}
- ;;
- esac
- exit ;;
- aushp:SunOS:*:*)
- echo sparc-auspex-sunos${UNAME_RELEASE}
- exit ;;
- # The situation for MiNT is a little confusing. The machine name
- # can be virtually everything (everything which is not
- # "atarist" or "atariste" at least should have a processor
- # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
- # to the lowercase version "mint" (or "freemint"). Finally
- # the system name "TOS" denotes a system which is actually not
- # MiNT. But MiNT is downward compatible to TOS, so this should
- # be no problem.
- atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
- m68k:machten:*:*)
- echo m68k-apple-machten${UNAME_RELEASE}
- exit ;;
- powerpc:machten:*:*)
- echo powerpc-apple-machten${UNAME_RELEASE}
- exit ;;
- RISC*:Mach:*:*)
- echo mips-dec-mach_bsd4.3
- exit ;;
- RISC*:ULTRIX:*:*)
- echo mips-dec-ultrix${UNAME_RELEASE}
- exit ;;
- VAX*:ULTRIX*:*:*)
- echo vax-dec-ultrix${UNAME_RELEASE}
- exit ;;
- 2020:CLIX:*:* | 2430:CLIX:*:*)
- echo clipper-intergraph-clix${UNAME_RELEASE}
- exit ;;
- mips:*:*:UMIPS | mips:*:*:RISCos)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
-#ifdef __cplusplus
-#include /* for printf() prototype */
- int main (int argc, char *argv[]) {
-#else
- int main (argc, argv) int argc; char *argv[]; {
-#endif
- #if defined (host_mips) && defined (MIPSEB)
- #if defined (SYSTYPE_SYSV)
- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
- #endif
- #if defined (SYSTYPE_SVR4)
- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
- #endif
- #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
- #endif
- #endif
- exit (-1);
- }
-EOF
- $CC_FOR_BUILD -o $dummy $dummy.c &&
- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
- SYSTEM_NAME=`$dummy $dummyarg` &&
- { echo "$SYSTEM_NAME"; exit; }
- echo mips-mips-riscos${UNAME_RELEASE}
- exit ;;
- Motorola:PowerMAX_OS:*:*)
- echo powerpc-motorola-powermax
- exit ;;
- Motorola:*:4.3:PL8-*)
- echo powerpc-harris-powermax
- exit ;;
- Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
- echo powerpc-harris-powermax
- exit ;;
- Night_Hawk:Power_UNIX:*:*)
- echo powerpc-harris-powerunix
- exit ;;
- m88k:CX/UX:7*:*)
- echo m88k-harris-cxux7
- exit ;;
- m88k:*:4*:R4*)
- echo m88k-motorola-sysv4
- exit ;;
- m88k:*:3*:R3*)
- echo m88k-motorola-sysv3
- exit ;;
- AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
- then
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
- [ ${TARGET_BINARY_INTERFACE}x = x ]
- then
- echo m88k-dg-dgux${UNAME_RELEASE}
- else
- echo m88k-dg-dguxbcs${UNAME_RELEASE}
- fi
- else
- echo i586-dg-dgux${UNAME_RELEASE}
- fi
- exit ;;
- M88*:DolphinOS:*:*) # DolphinOS (SVR3)
- echo m88k-dolphin-sysv3
- exit ;;
- M88*:*:R3*:*)
- # Delta 88k system running SVR3
- echo m88k-motorola-sysv3
- exit ;;
- XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
- echo m88k-tektronix-sysv3
- exit ;;
- Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
- echo m68k-tektronix-bsd
- exit ;;
- *:IRIX*:*:*)
- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit ;;
- ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
- i*86:AIX:*:*)
- echo i386-ibm-aix
- exit ;;
- ia64:AIX:*:*)
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
- else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- fi
- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit ;;
- *:AIX:2:3)
- if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include
-
- main()
- {
- if (!__power_pc())
- exit(1);
- puts("powerpc-ibm-aix3.2.5");
- exit(0);
- }
-EOF
- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
- then
- echo "$SYSTEM_NAME"
- else
- echo rs6000-ibm-aix3.2.5
- fi
- elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- echo rs6000-ibm-aix3.2.4
- else
- echo rs6000-ibm-aix3.2
- fi
- exit ;;
- *:AIX:*:[4567])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- IBM_ARCH=rs6000
- else
- IBM_ARCH=powerpc
- fi
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
- else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- fi
- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit ;;
- *:AIX:*:*)
- echo rs6000-ibm-aix
- exit ;;
- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
- echo romp-ibm-bsd4.4
- exit ;;
- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit ;; # report: romp-ibm BSD 4.3
- *:BOSX:*:*)
- echo rs6000-bull-bosx
- exit ;;
- DPX/2?00:B.O.S.:*:*)
- echo m68k-bull-sysv3
- exit ;;
- 9000/[34]??:4.3bsd:1.*:*)
- echo m68k-hp-bsd
- exit ;;
- hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- echo m68k-hp-bsd4.4
- exit ;;
- 9000/[34678]??:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- case "${UNAME_MACHINE}" in
- 9000/31? ) HP_ARCH=m68000 ;;
- 9000/[34]?? ) HP_ARCH=m68k ;;
- 9000/[678][0-9][0-9])
- if [ -x /usr/bin/getconf ]; then
- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
- fi
- if [ "${HP_ARCH}" = "" ]; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
-
- #define _HPUX_SOURCE
- #include
- #include
-
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);
- #endif
- long cpu = sysconf (_SC_CPU_VERSION);
-
- switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- case CPU_PA_RISC2_0:
- #if defined(_SC_KERNEL_BITS)
- switch (bits)
- {
- case 64: puts ("hppa2.0w"); break;
- case 32: puts ("hppa2.0n"); break;
- default: puts ("hppa2.0"); break;
- } break;
- #else /* !defined(_SC_KERNEL_BITS) */
- puts ("hppa2.0"); break;
- #endif
- default: puts ("hppa1.0"); break;
- }
- exit (0);
- }
-EOF
- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
- test -z "$HP_ARCH" && HP_ARCH=hppa
- fi ;;
- esac
- if [ ${HP_ARCH} = "hppa2.0w" ]
- then
- eval $set_cc_for_build
-
- # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
- # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
- # generating 64-bit code. GNU and HP use different nomenclature:
- #
- # $ CC_FOR_BUILD=cc ./config.guess
- # => hppa2.0w-hp-hpux11.23
- # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
- # => hppa64-hp-hpux11.23
-
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
- grep -q __LP64__
- then
- HP_ARCH="hppa2.0w"
- else
- HP_ARCH="hppa64"
- fi
- fi
- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit ;;
- ia64:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- echo ia64-hp-hpux${HPUX_REV}
- exit ;;
- 3050*:HI-UX:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include
- int
- main ()
- {
- long cpu = sysconf (_SC_CPU_VERSION);
- /* The order matters, because CPU_IS_HP_MC68K erroneously returns
- true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
- results, however. */
- if (CPU_IS_PA_RISC (cpu))
- {
- switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
- case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
- default: puts ("hppa-hitachi-hiuxwe2"); break;
- }
- }
- else if (CPU_IS_HP_MC68K (cpu))
- puts ("m68k-hitachi-hiuxwe2");
- else puts ("unknown-hitachi-hiuxwe2");
- exit (0);
- }
-EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
- { echo "$SYSTEM_NAME"; exit; }
- echo unknown-hitachi-hiuxwe2
- exit ;;
- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
- echo hppa1.1-hp-bsd
- exit ;;
- 9000/8??:4.3bsd:*:*)
- echo hppa1.0-hp-bsd
- exit ;;
- *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- echo hppa1.0-hp-mpeix
- exit ;;
- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- echo hppa1.1-hp-osf
- exit ;;
- hp8??:OSF1:*:*)
- echo hppa1.0-hp-osf
- exit ;;
- i*86:OSF1:*:*)
- if [ -x /usr/sbin/sysversion ] ; then
- echo ${UNAME_MACHINE}-unknown-osf1mk
- else
- echo ${UNAME_MACHINE}-unknown-osf1
- fi
- exit ;;
- parisc*:Lites*:*:*)
- echo hppa1.1-hp-lites
- exit ;;
- C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- echo c1-convex-bsd
- exit ;;
- C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
- exit ;;
- C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- echo c34-convex-bsd
- exit ;;
- C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- echo c38-convex-bsd
- exit ;;
- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- echo c4-convex-bsd
- exit ;;
- CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- CRAY*[A-Z]90:*:*:*)
- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
- | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
- -e 's/\.[^.]*$/.X/'
- exit ;;
- CRAY*TS:*:*:*)
- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- CRAY*T3E:*:*:*)
- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- CRAY*SV1:*:*:*)
- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- *:UNICOS/mp:*:*)
- echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
- 5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
- i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit ;;
- sparc*:BSD/OS:*:*)
- echo sparc-unknown-bsdi${UNAME_RELEASE}
- exit ;;
- *:BSD/OS:*:*)
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit ;;
- *:FreeBSD:*:*)
- UNAME_PROCESSOR=`/usr/bin/uname -p`
- case ${UNAME_PROCESSOR} in
- amd64)
- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- *)
- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- esac
- exit ;;
- i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
- exit ;;
- *:MINGW64*:*)
- echo ${UNAME_MACHINE}-pc-mingw64
- exit ;;
- *:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
- *:MSYS*:*)
- echo ${UNAME_MACHINE}-pc-msys
- exit ;;
- i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
- exit ;;
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit ;;
- *:Interix*:*)
- case ${UNAME_MACHINE} in
- x86)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- authenticamd | genuineintel | EM64T)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
- IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}
- exit ;;
- esac ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
- 8664:Windows_NT:*)
- echo x86_64-pc-mks
- exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- # UNAME_MACHINE based on the output of uname instead of i386?
- echo i586-pc-interix
- exit ;;
- i*:UWIN*:*)
- echo ${UNAME_MACHINE}-pc-uwin
- exit ;;
- amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- echo x86_64-unknown-cygwin
- exit ;;
- p*:CYGWIN*:*)
- echo powerpcle-unknown-cygwin
- exit ;;
- prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- *:GNU:*:*)
- # the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit ;;
- *:GNU/*:*:*)
- # other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
- exit ;;
- i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
- exit ;;
- aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- aarch64_be:Linux:*:*)
- UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- EV5) UNAME_MACHINE=alphaev5 ;;
- EV56) UNAME_MACHINE=alphaev56 ;;
- PCA56) UNAME_MACHINE=alphapca56 ;;
- PCA57) UNAME_MACHINE=alphapca56 ;;
- EV6) UNAME_MACHINE=alphaev6 ;;
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
- objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- arc:Linux:*:* | arceb:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- arm*:Linux:*:*)
- eval $set_cc_for_build
- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ARM_EABI__
- then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- else
- if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ARM_PCS_VFP
- then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
- else
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
- fi
- fi
- exit ;;
- avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- cris:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
- exit ;;
- crisv32:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
- exit ;;
- frv:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- i*86:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
- exit ;;
- ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
- #undef ${UNAME_MACHINE}
- #undef ${UNAME_MACHINE}el
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=${UNAME_MACHINE}el
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=${UNAME_MACHINE}
- #else
- CPU=
- #endif
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
- ;;
- openrisc*:Linux:*:*)
- echo or1k-unknown-linux-${LIBC}
- exit ;;
- or32:Linux:*:* | or1k*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- padre:Linux:*:*)
- echo sparc-unknown-linux-${LIBC}
- exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-${LIBC}
- exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
- *) echo hppa-unknown-linux-${LIBC} ;;
- esac
- exit ;;
- ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-${LIBC}
- exit ;;
- ppc:Linux:*:*)
- echo powerpc-unknown-linux-${LIBC}
- exit ;;
- ppc64le:Linux:*:*)
- echo powerpc64le-unknown-linux-${LIBC}
- exit ;;
- ppcle:Linux:*:*)
- echo powerpcle-unknown-linux-${LIBC}
- exit ;;
- s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
- exit ;;
- sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
- exit ;;
- x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- i*86:DYNIX/ptx:4*:*)
- # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- # earlier versions are messed up and put the nodename in both
- # sysname and nodename.
- echo i386-sequent-sysv4
- exit ;;
- i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
- # I am not positive that other SVR4 systems won't match this,
- # I just have to hope. -- rms.
- # Use sysv4.2uw... so that sysv4* matches it.
- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit ;;
- i*86:OS/2:*:*)
- # If we were able to find `uname', then EMX Unix compatibility
- # is probably installed.
- echo ${UNAME_MACHINE}-pc-os2-emx
- exit ;;
- i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop
- exit ;;
- i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-unknown-atheos
- exit ;;
- i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
- exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- i*86:*DOS:*:*)
- echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit ;;
- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
- else
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
- fi
- exit ;;
- i*86:*:5:[678]*)
- # UnixWare 7.x, OpenUNIX and OpenServer 6.
- case `/bin/uname -X | grep "^Machine"` in
- *486*) UNAME_MACHINE=i486 ;;
- *Pentium) UNAME_MACHINE=i586 ;;
- *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
- esac
- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
- exit ;;
- i*86:*:3.2:*)
- if test -f /usr/options/cb.name; then
- UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then
- UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
- (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
- (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
- && UNAME_MACHINE=i586
- (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
- && UNAME_MACHINE=i686
- (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
- && UNAME_MACHINE=i686
- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
- else
- echo ${UNAME_MACHINE}-pc-sysv32
- fi
- exit ;;
- pc:*:*:*)
- # Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i586.
- # Note: whatever this is, it MUST be the same as what config.sub
- # prints for the "djgpp" host, or else GDB configury will decide that
- # this is a cross-build.
- echo i586-pc-msdosdjgpp
- exit ;;
- Intel:Mach:3*:*)
- echo i386-pc-mach3
- exit ;;
- paragon:*:*:*)
- echo i860-intel-osf1
- exit ;;
- i860:*:4.*:*) # i860-SVR4
- if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
- else # Add other i860-SVR4 vendors below as they are discovered.
- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
- fi
- exit ;;
- mini*:CTIX:SYS*5:*)
- # "miniframe"
- echo m68010-convergent-sysv
- exit ;;
- mc68k:UNIX:SYSTEM5:3.51m)
- echo m68k-convergent-sysv
- exit ;;
- M680?0:D-NIX:5.3:*)
- echo m68k-diab-dnix
- exit ;;
- M68*:*:R3V[5678]*:*)
- test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- OS_REL=''
- test -r /etc/.relid \
- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
- NCR*:*:4.2:* | MPRAS*:*:4.2:*)
- OS_REL='.3'
- test -r /etc/.relid \
- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
- m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- mc68030:UNIX_System_V:4.*:*)
- echo m68k-atari-sysv4
- exit ;;
- TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- SM[BE]S:UNIX_SV:*:*)
- echo mips-dde-sysv${UNAME_RELEASE}
- exit ;;
- RM*:ReliantUNIX-*:*:*)
- echo mips-sni-sysv4
- exit ;;
- RM*:SINIX-*:*:*)
- echo mips-sni-sysv4
- exit ;;
- *:SINIX-*:*:*)
- if uname -p 2>/dev/null >/dev/null ; then
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
- echo ${UNAME_MACHINE}-sni-sysv4
- else
- echo ns32k-sni-sysv
- fi
- exit ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says
- echo i586-unisys-sysv4
- exit ;;
- *:UNIX_System_V:4*:FTX*)
- # From Gerald Hewes .
- # How about differentiating between stratus architectures? -djm
- echo hppa1.1-stratus-sysv4
- exit ;;
- *:*:*:FTX*)
- # From seanf@swdc.stratus.com.
- echo i860-stratus-sysv4
- exit ;;
- i*86:VOS:*:*)
- # From Paul.Green@stratus.com.
- echo ${UNAME_MACHINE}-stratus-vos
- exit ;;
- *:VOS:*:*)
- # From Paul.Green@stratus.com.
- echo hppa1.1-stratus-vos
- exit ;;
- mc68*:A/UX:*:*)
- echo m68k-apple-aux${UNAME_RELEASE}
- exit ;;
- news*:NEWS-OS:6*:*)
- echo mips-sony-newsos6
- exit ;;
- R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
- else
- echo mips-unknown-sysv${UNAME_RELEASE}
- fi
- exit ;;
- BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
- echo powerpc-be-beos
- exit ;;
- BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
- echo powerpc-apple-beos
- exit ;;
- BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
- echo i586-pc-beos
- exit ;;
- BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
- echo i586-pc-haiku
- exit ;;
- x86_64:Haiku:*:*)
- echo x86_64-unknown-haiku
- exit ;;
- SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-5:SUPER-UX:*:*)
- echo sx5-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-6:SUPER-UX:*:*)
- echo sx6-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-7:SUPER-UX:*:*)
- echo sx7-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-8:SUPER-UX:*:*)
- echo sx8-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-8R:SUPER-UX:*:*)
- echo sx8r-nec-superux${UNAME_RELEASE}
- exit ;;
- Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit ;;
- *:Rhapsody:*:*)
- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit ;;
- *:Darwin:*:*)
- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- eval $set_cc_for_build
- if test "$UNAME_PROCESSOR" = unknown ; then
- UNAME_PROCESSOR=powerpc
- fi
- if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- case $UNAME_PROCESSOR in
- i386) UNAME_PROCESSOR=x86_64 ;;
- powerpc) UNAME_PROCESSOR=powerpc64 ;;
- esac
- fi
- fi
- elif test "$UNAME_PROCESSOR" = i386 ; then
- # Avoid executing cc on OS X 10.9, as it ships with a stub
- # that puts up a graphical alert prompting to install
- # developer tools. Any system running Mac OS X 10.7 or
- # later (Darwin 11 and later) is required to have a 64-bit
- # processor. This is not true of the ARM version of Darwin
- # that Apple uses in portable devices.
- UNAME_PROCESSOR=x86_64
- fi
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit ;;
- *:procnto*:*:* | *:QNX:[0123456789]*:*)
- UNAME_PROCESSOR=`uname -p`
- if test "$UNAME_PROCESSOR" = "x86"; then
- UNAME_PROCESSOR=i386
- UNAME_MACHINE=pc
- fi
- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
- exit ;;
- *:QNX:*:4*)
- echo i386-pc-qnx
- exit ;;
- NEO-?:NONSTOP_KERNEL:*:*)
- echo neo-tandem-nsk${UNAME_RELEASE}
- exit ;;
- NSE-*:NONSTOP_KERNEL:*:*)
- echo nse-tandem-nsk${UNAME_RELEASE}
- exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
- echo nsr-tandem-nsk${UNAME_RELEASE}
- exit ;;
- *:NonStop-UX:*:*)
- echo mips-compaq-nonstopux
- exit ;;
- BS2000:POSIX*:*:*)
- echo bs2000-siemens-sysv
- exit ;;
- DS/*:UNIX_System_V:*:*)
- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
- exit ;;
- *:Plan9:*:*)
- # "uname -m" is not consistent, so use $cputype instead. 386
- # is converted to i386 for consistency with other x86
- # operating systems.
- if test "$cputype" = "386"; then
- UNAME_MACHINE=i386
- else
- UNAME_MACHINE="$cputype"
- fi
- echo ${UNAME_MACHINE}-unknown-plan9
- exit ;;
- *:TOPS-10:*:*)
- echo pdp10-unknown-tops10
- exit ;;
- *:TENEX:*:*)
- echo pdp10-unknown-tenex
- exit ;;
- KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
- echo pdp10-dec-tops20
- exit ;;
- XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
- echo pdp10-xkl-tops20
- exit ;;
- *:TOPS-20:*:*)
- echo pdp10-unknown-tops20
- exit ;;
- *:ITS:*:*)
- echo pdp10-unknown-its
- exit ;;
- SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
- exit ;;
- *:DragonFly:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit ;;
- *:*VMS:*:*)
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
- case "${UNAME_MACHINE}" in
- A*) echo alpha-dec-vms ; exit ;;
- I*) echo ia64-dec-vms ; exit ;;
- V*) echo vax-dec-vms ; exit ;;
- esac ;;
- *:XENIX:*:SysV)
- echo i386-pc-xenix
- exit ;;
- i*86:skyos:*:*)
- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
- exit ;;
- i*86:rdos:*:*)
- echo ${UNAME_MACHINE}-pc-rdos
- exit ;;
- i*86:AROS:*:*)
- echo ${UNAME_MACHINE}-pc-aros
- exit ;;
- x86_64:VMkernel:*:*)
- echo ${UNAME_MACHINE}-unknown-esx
- exit ;;
-esac
-
-cat >&2 < in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo = `(hostinfo) 2>/dev/null`
-/bin/universe = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/config.sub b/config.sub
deleted file mode 100644
index 7f94dfb..0000000
--- a/config.sub
+++ /dev/null
@@ -1,1805 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-# Copyright 1992-2014 Free Software Foundation, Inc.
-
-timestamp='2014-09-26'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see .
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program. This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-
-
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support. The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
- $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
- -h, --help print this help, then exit
- -t, --time-stamp print date of last modification, then exit
- -v, --version print version number, then exit
-
-Report bugs and patches to ."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright 1992-2014 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
- case $1 in
- --time-stamp | --time* | -t )
- echo "$timestamp" ; exit ;;
- --version | -v )
- echo "$version" ; exit ;;
- --help | --h* | -h )
- echo "$usage"; exit ;;
- -- ) # Stop option processing
- shift; break ;;
- - ) # Use stdin as input.
- break ;;
- -* )
- echo "$me: invalid option $1$help"
- exit 1 ;;
-
- *local*)
- # First pass through any local machine types.
- echo $1
- exit ;;
-
- * )
- break ;;
- esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
- exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
- exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
- ;;
- android-linux)
- os=-linux-android
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
- ;;
- *)
- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
- if [ $basic_machine != $1 ]
- then os=`echo $1 | sed 's/.*-/-/'`
- else os=; fi
- ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work. We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
- -sun*os*)
- # Prevent following clause from handling this invalid input.
- ;;
- -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
- -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
- -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray | -microblaze*)
- os=
- basic_machine=$1
- ;;
- -bluegene*)
- os=-cnk
- ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
- basic_machine=$1
- ;;
- -scout)
- ;;
- -wrs)
- os=-vxworks
- basic_machine=$1
- ;;
- -chorusos*)
- os=-chorusos
- basic_machine=$1
- ;;
- -chorusrdb)
- os=-chorusrdb
- basic_machine=$1
- ;;
- -hiux*)
- os=-hiuxwe2
- ;;
- -sco6)
- os=-sco5v6
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco5)
- os=-sco3.2v5
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco4)
- os=-sco3.2v4
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco3.2.[4-9]*)
- os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco3.2v[4-9]*)
- # Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco5v6*)
- # Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco*)
- os=-sco3.2v2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -udk*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -isc)
- os=-isc2.2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -clix*)
- basic_machine=clipper-intergraph
- ;;
- -isc*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -lynx*178)
- os=-lynxos178
- ;;
- -lynx*5)
- os=-lynxos5
- ;;
- -lynx*)
- os=-lynxos
- ;;
- -ptx*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
- ;;
- -windowsnt*)
- os=`echo $os | sed -e 's/windowsnt/winnt/'`
- ;;
- -psos*)
- os=-psos
- ;;
- -mint | -mint[0-9]*)
- basic_machine=m68k-atari
- os=-mint
- ;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
- # Recognize the basic CPU types without company name.
- # Some are omitted here because they have special meanings below.
- 1750a | 580 \
- | a29k \
- | aarch64 | aarch64_be \
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
- | arc | arceb \
- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
- | avr | avr32 \
- | be32 | be64 \
- | bfin \
- | c4x | c8051 | clipper \
- | d10v | d30v | dlx | dsp16xx \
- | epiphany \
- | fido | fr30 | frv \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | hexagon \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
- | k1om \
- | le32 | le64 \
- | lm32 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
- | mips64octeon | mips64octeonel \
- | mips64orion | mips64orionel \
- | mips64r5900 | mips64r5900el \
- | mips64vr | mips64vrel \
- | mips64vr4100 | mips64vr4100el \
- | mips64vr4300 | mips64vr4300el \
- | mips64vr5000 | mips64vr5000el \
- | mips64vr5900 | mips64vr5900el \
- | mipsisa32 | mipsisa32el \
- | mipsisa32r2 | mipsisa32r2el \
- | mipsisa32r6 | mipsisa32r6el \
- | mipsisa64 | mipsisa64el \
- | mipsisa64r2 | mipsisa64r2el \
- | mipsisa64r6 | mipsisa64r6el \
- | mipsisa64sb1 | mipsisa64sb1el \
- | mipsisa64sr71k | mipsisa64sr71kel \
- | mipsr5900 | mipsr5900el \
- | mipstx39 | mipstx39el \
- | mn10200 | mn10300 \
- | moxie \
- | mt \
- | msp430 \
- | nds32 | nds32le | nds32be \
- | nios | nios2 | nios2eb | nios2el \
- | ns16k | ns32k \
- | open8 | or1k | or1knd | or32 \
- | pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle \
- | pyramid \
- | riscv32 | riscv64 \
- | rl78 | rx \
- | score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- | spu \
- | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
- | ubicom32 \
- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
- | we32k \
- | x86 | xc16x | xstormy16 | xtensa \
- | z8k | z80)
- basic_machine=$basic_machine-unknown
- ;;
- c54x)
- basic_machine=tic54x-unknown
- ;;
- c55x)
- basic_machine=tic55x-unknown
- ;;
- c6x)
- basic_machine=tic6x-unknown
- ;;
- leon|leon[3-9])
- basic_machine=sparc-$basic_machine
- ;;
- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
- basic_machine=$basic_machine-unknown
- os=-none
- ;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
- ;;
- ms1)
- basic_machine=mt-unknown
- ;;
-
- strongarm | thumb | xscale)
- basic_machine=arm-unknown
- ;;
- xgate)
- basic_machine=$basic_machine-unknown
- os=-none
- ;;
- xscaleeb)
- basic_machine=armeb-unknown
- ;;
-
- xscaleel)
- basic_machine=armel-unknown
- ;;
-
- # We use `pc' rather than `unknown'
- # because (1) that's what they normally are, and
- # (2) the word "unknown" tends to confuse beginning users.
- i*86 | x86_64)
- basic_machine=$basic_machine-pc
- ;;
- # Object if more than one company name word.
- *-*-*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- exit 1
- ;;
- # Recognize the basic CPU types with company name.
- 580-* \
- | a29k-* \
- | aarch64-* | aarch64_be-* \
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* | avr32-* \
- | be32-* | be64-* \
- | bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* \
- | c8051-* | clipper-* | craynv-* | cydra-* \
- | d10v-* | d30v-* | dlx-* \
- | elxsi-* \
- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- | h8300-* | h8500-* \
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | hexagon-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
- | k1om-* \
- | le32-* | le64-* \
- | lm32-* \
- | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
- | microblaze-* | microblazeel-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- | mips16-* \
- | mips64-* | mips64el-* \
- | mips64octeon-* | mips64octeonel-* \
- | mips64orion-* | mips64orionel-* \
- | mips64r5900-* | mips64r5900el-* \
- | mips64vr-* | mips64vrel-* \
- | mips64vr4100-* | mips64vr4100el-* \
- | mips64vr4300-* | mips64vr4300el-* \
- | mips64vr5000-* | mips64vr5000el-* \
- | mips64vr5900-* | mips64vr5900el-* \
- | mipsisa32-* | mipsisa32el-* \
- | mipsisa32r2-* | mipsisa32r2el-* \
- | mipsisa32r6-* | mipsisa32r6el-* \
- | mipsisa64-* | mipsisa64el-* \
- | mipsisa64r2-* | mipsisa64r2el-* \
- | mipsisa64r6-* | mipsisa64r6el-* \
- | mipsisa64sb1-* | mipsisa64sb1el-* \
- | mipsisa64sr71k-* | mipsisa64sr71kel-* \
- | mipsr5900-* | mipsr5900el-* \
- | mipstx39-* | mipstx39el-* \
- | mmix-* \
- | mt-* \
- | msp430-* \
- | nds32-* | nds32le-* | nds32be-* \
- | nios-* | nios2-* | nios2eb-* | nios2el-* \
- | none-* | np1-* | ns16k-* | ns32k-* \
- | open8-* \
- | or1k*-* \
- | orion-* \
- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
- | pyramid-* \
- | rl78-* | romp-* | rs6000-* | rx-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
- | tahoe-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tile*-* \
- | tron-* \
- | ubicom32-* \
- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
- | vax-* \
- | we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* \
- | xstormy16-* | xtensa*-* \
- | ymp-* \
- | z8k-* | z80-*)
- ;;
- # Recognize the basic CPU types without company name, with glob match.
- xtensa*)
- basic_machine=$basic_machine-unknown
- ;;
- # Recognize the various machine names and aliases which stand
- # for a CPU type and a company and sometimes even an OS.
- 386bsd)
- basic_machine=i386-unknown
- os=-bsd
- ;;
- 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
- basic_machine=m68000-att
- ;;
- 3b*)
- basic_machine=we32k-att
- ;;
- a29khif)
- basic_machine=a29k-amd
- os=-udi
- ;;
- abacus)
- basic_machine=abacus-unknown
- ;;
- adobe68k)
- basic_machine=m68010-adobe
- os=-scout
- ;;
- alliant | fx80)
- basic_machine=fx80-alliant
- ;;
- altos | altos3068)
- basic_machine=m68k-altos
- ;;
- am29k)
- basic_machine=a29k-none
- os=-bsd
- ;;
- amd64)
- basic_machine=x86_64-pc
- ;;
- amd64-*)
- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- amdahl)
- basic_machine=580-amdahl
- os=-sysv
- ;;
- amiga | amiga-*)
- basic_machine=m68k-unknown
- ;;
- amigaos | amigados)
- basic_machine=m68k-unknown
- os=-amigaos
- ;;
- amigaunix | amix)
- basic_machine=m68k-unknown
- os=-sysv4
- ;;
- apollo68)
- basic_machine=m68k-apollo
- os=-sysv
- ;;
- apollo68bsd)
- basic_machine=m68k-apollo
- os=-bsd
- ;;
- aros)
- basic_machine=i386-pc
- os=-aros
- ;;
- aux)
- basic_machine=m68k-apple
- os=-aux
- ;;
- balance)
- basic_machine=ns32k-sequent
- os=-dynix
- ;;
- blackfin)
- basic_machine=bfin-unknown
- os=-linux
- ;;
- blackfin-*)
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
- bluegene*)
- basic_machine=powerpc-ibm
- os=-cnk
- ;;
- c54x-*)
- basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- c55x-*)
- basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- c6x-*)
- basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
- ;;
- cegcc)
- basic_machine=arm-unknown
- os=-cegcc
- ;;
- convex-c1)
- basic_machine=c1-convex
- os=-bsd
- ;;
- convex-c2)
- basic_machine=c2-convex
- os=-bsd
- ;;
- convex-c32)
- basic_machine=c32-convex
- os=-bsd
- ;;
- convex-c34)
- basic_machine=c34-convex
- os=-bsd
- ;;
- convex-c38)
- basic_machine=c38-convex
- os=-bsd
- ;;
- cray | j90)
- basic_machine=j90-cray
- os=-unicos
- ;;
- craynv)
- basic_machine=craynv-cray
- os=-unicosmp
- ;;
- cr16 | cr16-*)
- basic_machine=cr16-unknown
- os=-elf
- ;;
- crds | unos)
- basic_machine=m68k-crds
- ;;
- crisv32 | crisv32-* | etraxfs*)
- basic_machine=crisv32-axis
- ;;
- cris | cris-* | etrax*)
- basic_machine=cris-axis
- ;;
- crx)
- basic_machine=crx-unknown
- os=-elf
- ;;
- da30 | da30-*)
- basic_machine=m68k-da30
- ;;
- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
- basic_machine=mips-dec
- ;;
- decsystem10* | dec10*)
- basic_machine=pdp10-dec
- os=-tops10
- ;;
- decsystem20* | dec20*)
- basic_machine=pdp10-dec
- os=-tops20
- ;;
- delta | 3300 | motorola-3300 | motorola-delta \
- | 3300-motorola | delta-motorola)
- basic_machine=m68k-motorola
- ;;
- delta88)
- basic_machine=m88k-motorola
- os=-sysv3
- ;;
- dicos)
- basic_machine=i686-pc
- os=-dicos
- ;;
- djgpp)
- basic_machine=i586-pc
- os=-msdosdjgpp
- ;;
- dpx20 | dpx20-*)
- basic_machine=rs6000-bull
- os=-bosx
- ;;
- dpx2* | dpx2*-bull)
- basic_machine=m68k-bull
- os=-sysv3
- ;;
- ebmon29k)
- basic_machine=a29k-amd
- os=-ebmon
- ;;
- elxsi)
- basic_machine=elxsi-elxsi
- os=-bsd
- ;;
- encore | umax | mmax)
- basic_machine=ns32k-encore
- ;;
- es1800 | OSE68k | ose68k | ose | OSE)
- basic_machine=m68k-ericsson
- os=-ose
- ;;
- fx2800)
- basic_machine=i860-alliant
- ;;
- genix)
- basic_machine=ns32k-ns
- ;;
- gmicro)
- basic_machine=tron-gmicro
- os=-sysv
- ;;
- go32)
- basic_machine=i386-pc
- os=-go32
- ;;
- h3050r* | hiux*)
- basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
- ;;
- h8300hms)
- basic_machine=h8300-hitachi
- os=-hms
- ;;
- h8300xray)
- basic_machine=h8300-hitachi
- os=-xray
- ;;
- h8500hms)
- basic_machine=h8500-hitachi
- os=-hms
- ;;
- harris)
- basic_machine=m88k-harris
- os=-sysv3
- ;;
- hp300-*)
- basic_machine=m68k-hp
- ;;
- hp300bsd)
- basic_machine=m68k-hp
- os=-bsd
- ;;
- hp300hpux)
- basic_machine=m68k-hp
- os=-hpux
- ;;
- hp3k9[0-9][0-9] | hp9[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
- hp9k2[0-9][0-9] | hp9k31[0-9])
- basic_machine=m68000-hp
- ;;
- hp9k3[2-9][0-9])
- basic_machine=m68k-hp
- ;;
- hp9k6[0-9][0-9] | hp6[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
- hp9k7[0-79][0-9] | hp7[0-79][0-9])
- basic_machine=hppa1.1-hp
- ;;
- hp9k78[0-9] | hp78[0-9])
- # FIXME: really hppa2.0-hp
- basic_machine=hppa1.1-hp
- ;;
- hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
- # FIXME: really hppa2.0-hp
- basic_machine=hppa1.1-hp
- ;;
- hp9k8[0-9][13679] | hp8[0-9][13679])
- basic_machine=hppa1.1-hp
- ;;
- hp9k8[0-9][0-9] | hp8[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
- hppa-next)
- os=-nextstep3
- ;;
- hppaosf)
- basic_machine=hppa1.1-hp
- os=-osf
- ;;
- hppro)
- basic_machine=hppa1.1-hp
- os=-proelf
- ;;
- i370-ibm* | ibm*)
- basic_machine=i370-ibm
- ;;
- i*86v32)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv32
- ;;
- i*86v4*)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv4
- ;;
- i*86v)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv
- ;;
- i*86sol2)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-solaris2
- ;;
- i386mach)
- basic_machine=i386-mach
- os=-mach
- ;;
- i386-vsta | vsta)
- basic_machine=i386-unknown
- os=-vsta
- ;;
- iris | iris4d)
- basic_machine=mips-sgi
- case $os in
- -irix*)
- ;;
- *)
- os=-irix4
- ;;
- esac
- ;;
- isi68 | isi)
- basic_machine=m68k-isi
- os=-sysv
- ;;
- leon-*|leon[3-9]-*)
- basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
- ;;
- m68knommu)
- basic_machine=m68k-unknown
- os=-linux
- ;;
- m68knommu-*)
- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
- m88k-omron*)
- basic_machine=m88k-omron
- ;;
- magnum | m3230)
- basic_machine=mips-mips
- os=-sysv
- ;;
- merlin)
- basic_machine=ns32k-utek
- os=-sysv
- ;;
- microblaze*)
- basic_machine=microblaze-xilinx
- ;;
- mingw64)
- basic_machine=x86_64-pc
- os=-mingw64
- ;;
- mingw32)
- basic_machine=i686-pc
- os=-mingw32
- ;;
- mingw32ce)
- basic_machine=arm-unknown
- os=-mingw32ce
- ;;
- miniframe)
- basic_machine=m68000-convergent
- ;;
- *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
- basic_machine=m68k-atari
- os=-mint
- ;;
- mips3*-*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
- ;;
- mips3*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
- ;;
- monitor)
- basic_machine=m68k-rom68k
- os=-coff
- ;;
- morphos)
- basic_machine=powerpc-unknown
- os=-morphos
- ;;
- moxiebox)
- basic_machine=moxie-unknown
- os=-moxiebox
- ;;
- msdos)
- basic_machine=i386-pc
- os=-msdos
- ;;
- ms1-*)
- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
- ;;
- msys)
- basic_machine=i686-pc
- os=-msys
- ;;
- mvs)
- basic_machine=i370-ibm
- os=-mvs
- ;;
- nacl)
- basic_machine=le32-unknown
- os=-nacl
- ;;
- ncr3000)
- basic_machine=i486-ncr
- os=-sysv4
- ;;
- netbsd386)
- basic_machine=i386-unknown
- os=-netbsd
- ;;
- netwinder)
- basic_machine=armv4l-rebel
- os=-linux
- ;;
- news | news700 | news800 | news900)
- basic_machine=m68k-sony
- os=-newsos
- ;;
- news1000)
- basic_machine=m68030-sony
- os=-newsos
- ;;
- news-3600 | risc-news)
- basic_machine=mips-sony
- os=-newsos
- ;;
- necv70)
- basic_machine=v70-nec
- os=-sysv
- ;;
- next | m*-next )
- basic_machine=m68k-next
- case $os in
- -nextstep* )
- ;;
- -ns2*)
- os=-nextstep2
- ;;
- *)
- os=-nextstep3
- ;;
- esac
- ;;
- nh3000)
- basic_machine=m68k-harris
- os=-cxux
- ;;
- nh[45]000)
- basic_machine=m88k-harris
- os=-cxux
- ;;
- nindy960)
- basic_machine=i960-intel
- os=-nindy
- ;;
- mon960)
- basic_machine=i960-intel
- os=-mon960
- ;;
- nonstopux)
- basic_machine=mips-compaq
- os=-nonstopux
- ;;
- np1)
- basic_machine=np1-gould
- ;;
- neo-tandem)
- basic_machine=neo-tandem
- ;;
- nse-tandem)
- basic_machine=nse-tandem
- ;;
- nsr-tandem)
- basic_machine=nsr-tandem
- ;;
- op50n-* | op60c-*)
- basic_machine=hppa1.1-oki
- os=-proelf
- ;;
- openrisc | openrisc-*)
- basic_machine=or32-unknown
- ;;
- os400)
- basic_machine=powerpc-ibm
- os=-os400
- ;;
- OSE68000 | ose68000)
- basic_machine=m68000-ericsson
- os=-ose
- ;;
- os68k)
- basic_machine=m68k-none
- os=-os68k
- ;;
- pa-hitachi)
- basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
- ;;
- paragon)
- basic_machine=i860-intel
- os=-osf
- ;;
- parisc)
- basic_machine=hppa-unknown
- os=-linux
- ;;
- parisc-*)
- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
- pbd)
- basic_machine=sparc-tti
- ;;
- pbb)
- basic_machine=m68k-tti
- ;;
- pc532 | pc532-*)
- basic_machine=ns32k-pc532
- ;;
- pc98)
- basic_machine=i386-pc
- ;;
- pc98-*)
- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentium | p5 | k5 | k6 | nexgen | viac3)
- basic_machine=i586-pc
- ;;
- pentiumpro | p6 | 6x86 | athlon | athlon_*)
- basic_machine=i686-pc
- ;;
- pentiumii | pentium2 | pentiumiii | pentium3)
- basic_machine=i686-pc
- ;;
- pentium4)
- basic_machine=i786-pc
- ;;
- pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentiumpro-* | p6-* | 6x86-* | athlon-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentium4-*)
- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pn)
- basic_machine=pn-gould
- ;;
- power) basic_machine=power-ibm
- ;;
- ppc | ppcbe) basic_machine=powerpc-unknown
- ;;
- ppc-* | ppcbe-*)
- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
- basic_machine=powerpcle-unknown
- ;;
- ppcle-* | powerpclittle-*)
- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppc64) basic_machine=powerpc64-unknown
- ;;
- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppc64le | powerpc64little | ppc64-le | powerpc64-little)
- basic_machine=powerpc64le-unknown
- ;;
- ppc64le-* | powerpc64little-*)
- basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ps2)
- basic_machine=i386-ibm
- ;;
- pw32)
- basic_machine=i586-unknown
- os=-pw32
- ;;
- rdos | rdos64)
- basic_machine=x86_64-pc
- os=-rdos
- ;;
- rdos32)
- basic_machine=i386-pc
- os=-rdos
- ;;
- rom68k)
- basic_machine=m68k-rom68k
- os=-coff
- ;;
- rm[46]00)
- basic_machine=mips-siemens
- ;;
- rtpc | rtpc-*)
- basic_machine=romp-ibm
- ;;
- s390 | s390-*)
- basic_machine=s390-ibm
- ;;
- s390x | s390x-*)
- basic_machine=s390x-ibm
- ;;
- sa29200)
- basic_machine=a29k-amd
- os=-udi
- ;;
- sb1)
- basic_machine=mipsisa64sb1-unknown
- ;;
- sb1el)
- basic_machine=mipsisa64sb1el-unknown
- ;;
- sde)
- basic_machine=mipsisa32-sde
- os=-elf
- ;;
- sei)
- basic_machine=mips-sei
- os=-seiux
- ;;
- sequent)
- basic_machine=i386-sequent
- ;;
- sh)
- basic_machine=sh-hitachi
- os=-hms
- ;;
- sh5el)
- basic_machine=sh5le-unknown
- ;;
- sh64)
- basic_machine=sh64-unknown
- ;;
- sparclite-wrs | simso-wrs)
- basic_machine=sparclite-wrs
- os=-vxworks
- ;;
- sps7)
- basic_machine=m68k-bull
- os=-sysv2
- ;;
- spur)
- basic_machine=spur-unknown
- ;;
- st2000)
- basic_machine=m68k-tandem
- ;;
- stratus)
- basic_machine=i860-stratus
- os=-sysv4
- ;;
- strongarm-* | thumb-*)
- basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- sun2)
- basic_machine=m68000-sun
- ;;
- sun2os3)
- basic_machine=m68000-sun
- os=-sunos3
- ;;
- sun2os4)
- basic_machine=m68000-sun
- os=-sunos4
- ;;
- sun3os3)
- basic_machine=m68k-sun
- os=-sunos3
- ;;
- sun3os4)
- basic_machine=m68k-sun
- os=-sunos4
- ;;
- sun4os3)
- basic_machine=sparc-sun
- os=-sunos3
- ;;
- sun4os4)
- basic_machine=sparc-sun
- os=-sunos4
- ;;
- sun4sol2)
- basic_machine=sparc-sun
- os=-solaris2
- ;;
- sun3 | sun3-*)
- basic_machine=m68k-sun
- ;;
- sun4)
- basic_machine=sparc-sun
- ;;
- sun386 | sun386i | roadrunner)
- basic_machine=i386-sun
- ;;
- sv1)
- basic_machine=sv1-cray
- os=-unicos
- ;;
- symmetry)
- basic_machine=i386-sequent
- os=-dynix
- ;;
- t3e)
- basic_machine=alphaev5-cray
- os=-unicos
- ;;
- t90)
- basic_machine=t90-cray
- os=-unicos
- ;;
- tile*)
- basic_machine=$basic_machine-unknown
- os=-linux-gnu
- ;;
- tx39)
- basic_machine=mipstx39-unknown
- ;;
- tx39el)
- basic_machine=mipstx39el-unknown
- ;;
- toad1)
- basic_machine=pdp10-xkl
- os=-tops20
- ;;
- tower | tower-32)
- basic_machine=m68k-ncr
- ;;
- tpf)
- basic_machine=s390x-ibm
- os=-tpf
- ;;
- udi29k)
- basic_machine=a29k-amd
- os=-udi
- ;;
- ultra3)
- basic_machine=a29k-nyu
- os=-sym1
- ;;
- v810 | necv810)
- basic_machine=v810-nec
- os=-none
- ;;
- vaxv)
- basic_machine=vax-dec
- os=-sysv
- ;;
- vms)
- basic_machine=vax-dec
- os=-vms
- ;;
- vpp*|vx|vx-*)
- basic_machine=f301-fujitsu
- ;;
- vxworks960)
- basic_machine=i960-wrs
- os=-vxworks
- ;;
- vxworks68)
- basic_machine=m68k-wrs
- os=-vxworks
- ;;
- vxworks29k)
- basic_machine=a29k-wrs
- os=-vxworks
- ;;
- w65*)
- basic_machine=w65-wdc
- os=-none
- ;;
- w89k-*)
- basic_machine=hppa1.1-winbond
- os=-proelf
- ;;
- xbox)
- basic_machine=i686-pc
- os=-mingw32
- ;;
- xps | xps100)
- basic_machine=xps100-honeywell
- ;;
- xscale-* | xscalee[bl]-*)
- basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
- ;;
- ymp)
- basic_machine=ymp-cray
- os=-unicos
- ;;
- z8k-*-coff)
- basic_machine=z8k-unknown
- os=-sim
- ;;
- z80-*-coff)
- basic_machine=z80-unknown
- os=-sim
- ;;
- none)
- basic_machine=none-none
- os=-none
- ;;
-
-# Here we handle the default manufacturer of certain CPU types. It is in
-# some cases the only manufacturer, in others, it is the most popular.
- w89k)
- basic_machine=hppa1.1-winbond
- ;;
- op50n)
- basic_machine=hppa1.1-oki
- ;;
- op60c)
- basic_machine=hppa1.1-oki
- ;;
- romp)
- basic_machine=romp-ibm
- ;;
- mmix)
- basic_machine=mmix-knuth
- ;;
- rs6000)
- basic_machine=rs6000-ibm
- ;;
- vax)
- basic_machine=vax-dec
- ;;
- pdp10)
- # there are many clones, so DEC is not a safe bet
- basic_machine=pdp10-unknown
- ;;
- pdp11)
- basic_machine=pdp11-dec
- ;;
- we32k)
- basic_machine=we32k-att
- ;;
- sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
- ;;
- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- basic_machine=sparc-sun
- ;;
- cydra)
- basic_machine=cydra-cydrome
- ;;
- orion)
- basic_machine=orion-highlevel
- ;;
- orion105)
- basic_machine=clipper-highlevel
- ;;
- mac | mpw | mac-mpw)
- basic_machine=m68k-apple
- ;;
- pmac | pmac-mpw)
- basic_machine=powerpc-apple
- ;;
- *-unknown)
- # Make sure to match an already-canonicalized machine name.
- ;;
- *)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- exit 1
- ;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
- *-digital*)
- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
- ;;
- *-commodore*)
- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
- ;;
- *)
- ;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
- # -solaris* is a basic system type, with this one exception.
- -auroraux)
- os=-auroraux
- ;;
- -solaris1 | -solaris1.*)
- os=`echo $os | sed -e 's|solaris1|sunos4|'`
- ;;
- -solaris)
- os=-solaris2
- ;;
- -svr4*)
- os=-sysv4
- ;;
- -unixware*)
- os=-sysv4.2uw
- ;;
- -gnu/linux*)
- os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
- ;;
- # First accept the basic system types.
- # The portable systems comes first.
- # Each alternative MUST END IN A *, to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- | -sym* | -kopensolaris* | -plan9* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- | -bitrig* | -openbsd* | -solidbsd* \
- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
- | -linux-newlib* | -linux-musl* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -qnx*)
- case $basic_machine in
- x86-* | i*86-*)
- ;;
- *)
- os=-nto$os
- ;;
- esac
- ;;
- -nto-qnx*)
- ;;
- -nto*)
- os=`echo $os | sed -e 's|nto|nto-qnx|'`
- ;;
- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
- | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
- ;;
- -mac*)
- os=`echo $os | sed -e 's|mac|macos|'`
- ;;
- -linux-dietlibc)
- os=-linux-dietlibc
- ;;
- -linux*)
- os=`echo $os | sed -e 's|linux|linux-gnu|'`
- ;;
- -sunos5*)
- os=`echo $os | sed -e 's|sunos5|solaris2|'`
- ;;
- -sunos6*)
- os=`echo $os | sed -e 's|sunos6|solaris3|'`
- ;;
- -opened*)
- os=-openedition
- ;;
- -os400*)
- os=-os400
- ;;
- -wince*)
- os=-wince
- ;;
- -osfrose*)
- os=-osfrose
- ;;
- -osf*)
- os=-osf
- ;;
- -utek*)
- os=-bsd
- ;;
- -dynix*)
- os=-bsd
- ;;
- -acis*)
- os=-aos
- ;;
- -atheos*)
- os=-atheos
- ;;
- -syllable*)
- os=-syllable
- ;;
- -386bsd)
- os=-bsd
- ;;
- -ctix* | -uts*)
- os=-sysv
- ;;
- -nova*)
- os=-rtmk-nova
- ;;
- -ns2 )
- os=-nextstep2
- ;;
- -nsk*)
- os=-nsk
- ;;
- # Preserve the version number of sinix5.
- -sinix5.*)
- os=`echo $os | sed -e 's|sinix|sysv|'`
- ;;
- -sinix*)
- os=-sysv4
- ;;
- -tpf*)
- os=-tpf
- ;;
- -triton*)
- os=-sysv3
- ;;
- -oss*)
- os=-sysv3
- ;;
- -svr4)
- os=-sysv4
- ;;
- -svr3)
- os=-sysv3
- ;;
- -sysvr4)
- os=-sysv4
- ;;
- # This must come after -sysvr4.
- -sysv*)
- ;;
- -ose*)
- os=-ose
- ;;
- -es1800*)
- os=-ose
- ;;
- -xenix)
- os=-xenix
- ;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- os=-mint
- ;;
- -aros*)
- os=-aros
- ;;
- -zvmoe)
- os=-zvmoe
- ;;
- -dicos*)
- os=-dicos
- ;;
- -nacl*)
- ;;
- -none)
- ;;
- *)
- # Get rid of the `-' at the beginning of $os.
- os=`echo $os | sed 's/[^-]*-//'`
- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
- exit 1
- ;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system. Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
- score-*)
- os=-elf
- ;;
- spu-*)
- os=-elf
- ;;
- *-acorn)
- os=-riscix1.2
- ;;
- arm*-rebel)
- os=-linux
- ;;
- arm*-semi)
- os=-aout
- ;;
- c4x-* | tic4x-*)
- os=-coff
- ;;
- c8051-*)
- os=-elf
- ;;
- hexagon-*)
- os=-elf
- ;;
- tic54x-*)
- os=-coff
- ;;
- tic55x-*)
- os=-coff
- ;;
- tic6x-*)
- os=-coff
- ;;
- # This must come before the *-dec entry.
- pdp10-*)
- os=-tops20
- ;;
- pdp11-*)
- os=-none
- ;;
- *-dec | vax-*)
- os=-ultrix4.2
- ;;
- m68*-apollo)
- os=-domain
- ;;
- i386-sun)
- os=-sunos4.0.2
- ;;
- m68000-sun)
- os=-sunos3
- ;;
- m68*-cisco)
- os=-aout
- ;;
- mep-*)
- os=-elf
- ;;
- mips*-cisco)
- os=-elf
- ;;
- mips*-*)
- os=-elf
- ;;
- or32-*)
- os=-coff
- ;;
- *-tti) # must be before sparc entry or we get the wrong os.
- os=-sysv3
- ;;
- sparc-* | *-sun)
- os=-sunos4.1.1
- ;;
- *-be)
- os=-beos
- ;;
- *-haiku)
- os=-haiku
- ;;
- *-ibm)
- os=-aix
- ;;
- *-knuth)
- os=-mmixware
- ;;
- *-wec)
- os=-proelf
- ;;
- *-winbond)
- os=-proelf
- ;;
- *-oki)
- os=-proelf
- ;;
- *-hp)
- os=-hpux
- ;;
- *-hitachi)
- os=-hiux
- ;;
- i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
- os=-sysv
- ;;
- *-cbm)
- os=-amigaos
- ;;
- *-dg)
- os=-dgux
- ;;
- *-dolphin)
- os=-sysv3
- ;;
- m68k-ccur)
- os=-rtu
- ;;
- m88k-omron*)
- os=-luna
- ;;
- *-next )
- os=-nextstep
- ;;
- *-sequent)
- os=-ptx
- ;;
- *-crds)
- os=-unos
- ;;
- *-ns)
- os=-genix
- ;;
- i370-*)
- os=-mvs
- ;;
- *-next)
- os=-nextstep3
- ;;
- *-gould)
- os=-sysv
- ;;
- *-highlevel)
- os=-bsd
- ;;
- *-encore)
- os=-bsd
- ;;
- *-sgi)
- os=-irix
- ;;
- *-siemens)
- os=-sysv4
- ;;
- *-masscomp)
- os=-rtu
- ;;
- f30[01]-fujitsu | f700-fujitsu)
- os=-uxpv
- ;;
- *-rom68k)
- os=-coff
- ;;
- *-*bug)
- os=-coff
- ;;
- *-apple)
- os=-macos
- ;;
- *-atari*)
- os=-mint
- ;;
- *)
- os=-none
- ;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer. We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
- *-unknown)
- case $os in
- -riscix*)
- vendor=acorn
- ;;
- -sunos*)
- vendor=sun
- ;;
- -cnk*|-aix*)
- vendor=ibm
- ;;
- -beos*)
- vendor=be
- ;;
- -hpux*)
- vendor=hp
- ;;
- -mpeix*)
- vendor=hp
- ;;
- -hiux*)
- vendor=hitachi
- ;;
- -unos*)
- vendor=crds
- ;;
- -dgux*)
- vendor=dg
- ;;
- -luna*)
- vendor=omron
- ;;
- -genix*)
- vendor=ns
- ;;
- -mvs* | -opened*)
- vendor=ibm
- ;;
- -os400*)
- vendor=ibm
- ;;
- -ptx*)
- vendor=sequent
- ;;
- -tpf*)
- vendor=ibm
- ;;
- -vxsim* | -vxworks* | -windiss*)
- vendor=wrs
- ;;
- -aux*)
- vendor=apple
- ;;
- -hms*)
- vendor=hitachi
- ;;
- -mpw* | -macos*)
- vendor=apple
- ;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- vendor=atari
- ;;
- -vos*)
- vendor=stratus
- ;;
- esac
- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
- ;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/corba.tar.xz b/corba.tar.xz
new file mode 100644
index 0000000..adcfdb9
--- /dev/null
+++ b/corba.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42351003e03f8893435e424e652558ac7e6e7af86a0cf01338c84184b8ab6e50
+size 937360
diff --git a/disable-doclint-by-default.patch b/disable-doclint-by-default.patch
index ee0e3ba..01f18f5 100644
--- a/disable-doclint-by-default.patch
+++ b/disable-doclint-by-default.patch
@@ -10,8 +10,8 @@ See: https://lists.fedoraproject.org/pipermail/java-devel/2014-February/005150.h
Author: Andrew John Hughes
Author: Emmanuel Bourg
---- jdk8/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
-+++ jdk8/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
+--- openjdk/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
++++ openjdk/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
@@ -811,10 +811,9 @@
doclintOpts.add(opt == null ? DocLint.XMSGS_OPTION : DocLint.XMSGS_CUSTOM_PREFIX + opt);
}
@@ -26,8 +26,8 @@ Author: Emmanuel Bourg
return;
}
---- jdk8/langtools/test/tools/javadoc/doclint/DocLintTest.java
-+++ jdk8/langtools/test/tools/javadoc/doclint/DocLintTest.java
+--- openjdk/langtools/test/tools/javadoc/doclint/DocLintTest.java
++++ openjdk/langtools/test/tools/javadoc/doclint/DocLintTest.java
@@ -130,12 +130,12 @@
};
diff --git a/e8dc6eb11c76.tar.bz2 b/e8dc6eb11c76.tar.bz2
deleted file mode 100644
index 19576b3..0000000
--- a/e8dc6eb11c76.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:75f0ea7a8df86a2d3c5e2ca523d80934a0af0aec6e5dfe4e78722b1fe252bd5e
-size 1024247
diff --git a/hotspot.tar.xz b/hotspot.tar.xz
new file mode 100644
index 0000000..2a5b7d2
--- /dev/null
+++ b/hotspot.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c15794ae90ee52222b73a5c8eb0a397062226fe8215aeed72fdf28f9c26780de
+size 6767200
diff --git a/icedtea-3.0.1-sunec.patch b/icedtea-3.0.1-sunec.patch
new file mode 100644
index 0000000..33c8679
--- /dev/null
+++ b/icedtea-3.0.1-sunec.patch
@@ -0,0 +1,22 @@
+--- icedtea-3.0.1/acinclude.m4 2016-04-24 08:37:02.061302798 +0200
++++ icedtea-3.0.1/acinclude.m4 2016-04-25 13:04:21.040872931 +0200
+@@ -1959,7 +1959,7 @@
+ PKG_CHECK_MODULES(NSS_JAVA, nss-java, [NSS_JAVA_FOUND=yes], [NSS_JAVA_FOUND=no])
+ if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
+ SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS;
+- SUNEC_LIBS="-lfreebl $NSS_LIBS";
++ SUNEC_LIBS=$NSS_SOFTOKN_LIBS;
+ elif test "x${NSS_JAVA_FOUND}" = "xyes"; then
+ SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS";
+ SUNEC_LIBS=$NSS_JAVA_LIBS;
+--- icedtea-3.0.1/configure 2016-04-24 08:37:14.373081753 +0200
++++ icedtea-3.0.1/configure 2016-04-25 13:05:26.851392635 +0200
+@@ -7925,7 +7925,7 @@
+ fi
+ if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
+ SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS;
+- SUNEC_LIBS="-lfreebl $NSS_LIBS";
++ SUNEC_LIBS=$NSS_SOFTOKN_LIBS;
+ elif test "x${NSS_JAVA_FOUND}" = "xyes"; then
+ SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS";
+ SUNEC_LIBS=$NSS_JAVA_LIBS;
diff --git a/icedtea-3.0.1.tar.xz b/icedtea-3.0.1.tar.xz
new file mode 100644
index 0000000..f0bb982
--- /dev/null
+++ b/icedtea-3.0.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:346ce30de1de6c493729b79b246f250438fc5b8df7eae47229a97f9000a73af2
+size 1403400
diff --git a/implicit-pointer-decl.patch b/implicit-pointer-decl.patch
index 5cec608..6713726 100644
--- a/implicit-pointer-decl.patch
+++ b/implicit-pointer-decl.patch
@@ -1,5 +1,5 @@
---- jdk8/jdk/src/share/instrument/JarFacade.c 2014-07-03 00:01:31.000000000 +0200
-+++ jdk8/jdk/src/share/instrument/JarFacade.c 2014-07-15 08:45:35.144295472 +0200
+--- openjdk/jdk/src/share/instrument/JarFacade.c 2014-07-03 00:01:31.000000000 +0200
++++ openjdk/jdk/src/share/instrument/JarFacade.c 2014-07-15 08:45:35.144295472 +0200
@@ -23,14 +23,7 @@
* questions.
*/
diff --git a/include-all-srcs.patch b/include-all-srcs.patch
deleted file mode 100644
index 16abb45..0000000
--- a/include-all-srcs.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- jdk8/jdk/make/CreateJars.gmk
-+++ jdk8/jdk/make/CreateJars.gmk
-@@ -569,38 +569,12 @@
- ##########################################################################################
-
- SRC_ZIP_INCLUDES = \
-- com/sun/corba \
-- com/sun/image/codec/jpeg \
-- com/sun/imageio \
-- com/sun/java_cup \
-- com/sun/javadoc \
-- com/sun/java/swing \
-- com/sun/jmx \
-- com/sun/naming \
-- com/sun/org/apache \
-- com/sun/security/auth \
-- com/sun/security/jgss \
-- com/sun/source \
-+ com \
- java \
-- javax/accessibility \
-- javax/annotation \
-- javax/imageio \
-- javax/lang \
-- javax/management \
-- javax/naming \
-- javax/print \
-- javax/rmi \
-- javax/script \
-- javax/security \
-- javax/sound \
-- javax/sql \
-- javax/swing \
-- javax/tools \
-- javax/xml \
-- org/ietf \
-- org/omg \
-- org/w3c/dom \
-- org/xml/sax \
-+ javax \
-+ jdk \
-+ org \
-+ sun \
- #
-
- SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes
-@@ -632,7 +606,6 @@
- $(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
- SRC := $(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src, \
- INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \
-- EXCLUDES := javax/swing/beaninfo, \
- SUFFIXES := .java .c .h, \
- ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
- EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))
diff --git a/java-1_8_0-openjdk-gcc6.patch b/java-1_8_0-openjdk-gcc6.patch
new file mode 100644
index 0000000..afe0c99
--- /dev/null
+++ b/java-1_8_0-openjdk-gcc6.patch
@@ -0,0 +1,2679 @@
+--- openjdk/hotspot/src/share/vm/classfile/dictionary.hpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/classfile/dictionary.hpp 2016-05-26 12:10:00.372271144 +0200
+@@ -370,7 +370,7 @@
+
+ void print_on(outputStream* st) const {
+ symbol()->print_value_on(st);
+- st->print("/mode="INTX_FORMAT, symbol_mode());
++ st->print("/mode=" INTX_FORMAT, symbol_mode());
+ st->print(" -> ");
+ bool printed = false;
+ if (method() != NULL) {
+--- openjdk/hotspot/src/share/vm/code/dependencies.hpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/code/dependencies.hpp 2016-05-26 09:54:26.985052426 +0200
+@@ -166,7 +166,7 @@
+ LG2_TYPE_LIMIT = 4, // assert(TYPE_LIMIT <= (1<print("{");
+ for( uint i=0; iprint("< "INTPTR_FORMAT", "INTPTR_FORMAT" > ",base + *adr(i), base + *(adr(i)+1));
++ tty->print("< " INTPTR_FORMAT ", " INTPTR_FORMAT " > ",base + *adr(i), base + *(adr(i)+1));
+ tty->print_cr("}");
+ }
+
+--- openjdk/hotspot/src/share/vm/code/nmethod.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/code/nmethod.cpp 2016-05-26 13:02:58.606199557 +0200
+@@ -2717,7 +2717,7 @@
+ _nm->print_nmethod(true);
+ _ok = false;
+ }
+- tty->print_cr("*** non-oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)",
++ tty->print_cr("*** non-oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)",
+ (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm));
+ }
+ virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
+@@ -2841,7 +2841,7 @@
+ _nm->print_nmethod(true);
+ _ok = false;
+ }
+- tty->print_cr("*** scavengable oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)",
++ tty->print_cr("*** scavengable oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)",
+ (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm));
+ (*p)->print();
+ }
+@@ -2886,7 +2886,7 @@
+ print_on(tty, NULL);
+
+ if (WizardMode) {
+- tty->print("((nmethod*) "INTPTR_FORMAT ") ", this);
++ tty->print("((nmethod*) " INTPTR_FORMAT ") ", this);
+ tty->print(" for method " INTPTR_FORMAT , (address)method());
+ tty->print(" { ");
+ if (is_in_use()) tty->print("in_use ");
+--- openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp 2016-05-26 11:46:17.171551069 +0200
+@@ -203,7 +203,7 @@
+ }
+
+ void log_nmethod(JavaThread* thread, nmethod* nm) {
+- log(thread, "nmethod %d%s " INTPTR_FORMAT " code ["INTPTR_FORMAT ", " INTPTR_FORMAT "]",
++ log(thread, "nmethod %d%s " INTPTR_FORMAT " code [" INTPTR_FORMAT ", " INTPTR_FORMAT "]",
+ nm->compile_id(), nm->is_osr_method() ? "%" : "",
+ p2i(nm), p2i(nm->code_begin()), p2i(nm->code_end()));
+ }
+--- openjdk/hotspot/src/share/vm/compiler/disassembler.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/compiler/disassembler.cpp 2016-05-26 17:39:50.810335217 +0200
+@@ -63,7 +63,7 @@
+ Disassembler::decode_func_virtual Disassembler::_decode_instructions_virtual = NULL;
+ Disassembler::decode_func Disassembler::_decode_instructions = NULL;
+
+-static const char hsdis_library_name[] = "hsdis-"HOTSPOT_LIB_ARCH;
++static const char hsdis_library_name[] = "hsdis-" HOTSPOT_LIB_ARCH;
+ static const char decode_instructions_virtual_name[] = "decode_instructions_virtual";
+ static const char decode_instructions_name[] = "decode_instructions";
+ static bool use_new_version = true;
+--- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2016-05-26 11:56:14.462435073 +0200
+@@ -844,18 +844,18 @@
+ GenCollectedHeap* gch = GenCollectedHeap::heap();
+ if (PrintGCDetails) {
+ if (Verbose) {
+- gclog_or_tty->print("[%d %s-%s: "SIZE_FORMAT"("SIZE_FORMAT")]",
++ gclog_or_tty->print("[%d %s-%s: " SIZE_FORMAT "(" SIZE_FORMAT ")]",
+ level(), short_name(), s, used(), capacity());
+ } else {
+- gclog_or_tty->print("[%d %s-%s: "SIZE_FORMAT"K("SIZE_FORMAT"K)]",
++ gclog_or_tty->print("[%d %s-%s: " SIZE_FORMAT "K(" SIZE_FORMAT "K)]",
+ level(), short_name(), s, used() / K, capacity() / K);
+ }
+ }
+ if (Verbose) {
+- gclog_or_tty->print(" "SIZE_FORMAT"("SIZE_FORMAT")",
++ gclog_or_tty->print(" " SIZE_FORMAT "(" SIZE_FORMAT ")",
+ gch->used(), gch->capacity());
+ } else {
+- gclog_or_tty->print(" "SIZE_FORMAT"K("SIZE_FORMAT"K)",
++ gclog_or_tty->print(" " SIZE_FORMAT "K(" SIZE_FORMAT "K)",
+ gch->used() / K, gch->capacity() / K);
+ }
+ }
+@@ -885,8 +885,8 @@
+ bool res = (available >= av_promo) || (available >= max_promotion_in_bytes);
+ if (Verbose && PrintGCDetails) {
+ gclog_or_tty->print_cr(
+- "CMS: promo attempt is%s safe: available("SIZE_FORMAT") %s av_promo("SIZE_FORMAT"),"
+- "max_promo("SIZE_FORMAT")",
++ "CMS: promo attempt is%s safe: available(" SIZE_FORMAT ") %s av_promo(" SIZE_FORMAT "),"
++ "max_promo(" SIZE_FORMAT ")",
+ res? "":" not", available, res? ">=":"<",
+ av_promo, max_promotion_in_bytes);
+ }
+@@ -972,8 +972,8 @@
+ desired_free_percentage);
+ gclog_or_tty->print_cr(" Maximum free fraction %f",
+ maximum_free_percentage);
+- gclog_or_tty->print_cr(" Capactiy "SIZE_FORMAT, capacity()/1000);
+- gclog_or_tty->print_cr(" Desired capacity "SIZE_FORMAT,
++ gclog_or_tty->print_cr(" Capactiy " SIZE_FORMAT, capacity()/1000);
++ gclog_or_tty->print_cr(" Desired capacity " SIZE_FORMAT,
+ desired_capacity/1000);
+ int prev_level = level() - 1;
+ if (prev_level >= 0) {
+@@ -981,14 +981,14 @@
+ GenCollectedHeap* gch = GenCollectedHeap::heap();
+ Generation* prev_gen = gch->_gens[prev_level];
+ prev_size = prev_gen->capacity();
+- gclog_or_tty->print_cr(" Younger gen size "SIZE_FORMAT,
++ gclog_or_tty->print_cr(" Younger gen size " SIZE_FORMAT,
+ prev_size/1000);
+ }
+- gclog_or_tty->print_cr(" unsafe_max_alloc_nogc "SIZE_FORMAT,
++ gclog_or_tty->print_cr(" unsafe_max_alloc_nogc " SIZE_FORMAT,
+ unsafe_max_alloc_nogc()/1000);
+- gclog_or_tty->print_cr(" contiguous available "SIZE_FORMAT,
++ gclog_or_tty->print_cr(" contiguous available " SIZE_FORMAT,
+ contiguous_available()/1000);
+- gclog_or_tty->print_cr(" Expand by "SIZE_FORMAT" (bytes)",
++ gclog_or_tty->print_cr(" Expand by " SIZE_FORMAT " (bytes)",
+ expand_bytes);
+ }
+ // safe if expansion fails
+@@ -1519,8 +1519,8 @@
+ stats().print_on(gclog_or_tty);
+ gclog_or_tty->print_cr("time_until_cms_gen_full %3.7f",
+ stats().time_until_cms_gen_full());
+- gclog_or_tty->print_cr("free="SIZE_FORMAT, _cmsGen->free());
+- gclog_or_tty->print_cr("contiguous_available="SIZE_FORMAT,
++ gclog_or_tty->print_cr("free=" SIZE_FORMAT, _cmsGen->free());
++ gclog_or_tty->print_cr("contiguous_available=" SIZE_FORMAT,
+ _cmsGen->contiguous_available());
+ gclog_or_tty->print_cr("promotion_rate=%g", stats().promotion_rate());
+ gclog_or_tty->print_cr("cms_allocation_rate=%g", stats().cms_allocation_rate());
+@@ -2804,8 +2804,8 @@
+ assert(_numObjectsPromoted == 0, "check");
+ assert(_numWordsPromoted == 0, "check");
+ if (Verbose && PrintGC) {
+- gclog_or_tty->print("Allocated "SIZE_FORMAT" objects, "
+- SIZE_FORMAT" bytes concurrently",
++ gclog_or_tty->print("Allocated " SIZE_FORMAT " objects, "
++ SIZE_FORMAT " bytes concurrently",
+ _numObjectsAllocated, _numWordsAllocated*sizeof(HeapWord));
+ }
+ _numObjectsAllocated = 0;
+@@ -2891,8 +2891,8 @@
+ assert(_numObjectsAllocated == 0, "check");
+ assert(_numWordsAllocated == 0, "check");
+ if (Verbose && PrintGC) {
+- gclog_or_tty->print("Promoted "SIZE_FORMAT" objects, "
+- SIZE_FORMAT" bytes",
++ gclog_or_tty->print("Promoted " SIZE_FORMAT " objects, "
++ SIZE_FORMAT " bytes",
+ _numObjectsPromoted, _numWordsPromoted*sizeof(HeapWord));
+ }
+ _numObjectsPromoted = 0;
+@@ -2902,7 +2902,7 @@
+ if (PrintGC && Verbose) {
+ // Call down the chain in contiguous_available needs the freelistLock
+ // so print this out before releasing the freeListLock.
+- gclog_or_tty->print(" Contiguous available "SIZE_FORMAT" bytes ",
++ gclog_or_tty->print(" Contiguous available " SIZE_FORMAT " bytes ",
+ contiguous_available());
+ }
+ }
+@@ -2990,7 +2990,7 @@
+ HeapWord* addr = _marks->offsetToHeapWord(offset);
+ if (!_marks->isMarked(addr)) {
+ oop(addr)->print_on(gclog_or_tty);
+- gclog_or_tty->print_cr(" ("INTPTR_FORMAT" should have been marked)", addr);
++ gclog_or_tty->print_cr(" (" INTPTR_FORMAT " should have been marked)", addr);
+ _failed = true;
+ }
+ return true;
+@@ -5051,7 +5051,7 @@
+
+ SpecializationStats::clear();
+ if (PrintGCDetails) {
+- gclog_or_tty->print("[YG occupancy: "SIZE_FORMAT" K ("SIZE_FORMAT" K)]",
++ gclog_or_tty->print("[YG occupancy: " SIZE_FORMAT " K (" SIZE_FORMAT " K)]",
+ _young_gen->used() / K,
+ _young_gen->capacity() / K);
+ }
+@@ -5184,8 +5184,8 @@
+ if (ser_ovflw > 0) {
+ if (PrintCMSStatistics != 0) {
+ gclog_or_tty->print_cr("Marking stack overflow (benign) "
+- "(pmc_pc="SIZE_FORMAT", pmc_rm="SIZE_FORMAT", kac="SIZE_FORMAT
+- ", kac_preclean="SIZE_FORMAT")",
++ "(pmc_pc=" SIZE_FORMAT ", pmc_rm=" SIZE_FORMAT ", kac=" SIZE_FORMAT
++ ", kac_preclean=" SIZE_FORMAT ")",
+ _ser_pmc_preclean_ovflw, _ser_pmc_remark_ovflw,
+ _ser_kac_ovflw, _ser_kac_preclean_ovflw);
+ }
+@@ -5198,7 +5198,7 @@
+ if (_par_pmc_remark_ovflw > 0 || _par_kac_ovflw > 0) {
+ if (PrintCMSStatistics != 0) {
+ gclog_or_tty->print_cr("Work queue overflow (benign) "
+- "(pmc_rm="SIZE_FORMAT", kac="SIZE_FORMAT")",
++ "(pmc_rm=" SIZE_FORMAT ", kac=" SIZE_FORMAT ")",
+ _par_pmc_remark_ovflw, _par_kac_ovflw);
+ }
+ _par_pmc_remark_ovflw = 0;
+@@ -5206,12 +5206,12 @@
+ }
+ if (PrintCMSStatistics != 0) {
+ if (_markStack._hit_limit > 0) {
+- gclog_or_tty->print_cr(" (benign) Hit max stack size limit ("SIZE_FORMAT")",
++ gclog_or_tty->print_cr(" (benign) Hit max stack size limit (" SIZE_FORMAT ")",
+ _markStack._hit_limit);
+ }
+ if (_markStack._failed_double > 0) {
+- gclog_or_tty->print_cr(" (benign) Failed stack doubling ("SIZE_FORMAT"),"
+- " current capacity "SIZE_FORMAT,
++ gclog_or_tty->print_cr(" (benign) Failed stack doubling (" SIZE_FORMAT "),"
++ " current capacity " SIZE_FORMAT,
+ _markStack._failed_double,
+ _markStack.capacity());
+ }
+@@ -5975,7 +5975,7 @@
+ &markFromDirtyCardsClosure);
+ verify_work_stacks_empty();
+ if (PrintCMSStatistics != 0) {
+- gclog_or_tty->print(" (re-scanned "SIZE_FORMAT" dirty cards in cms gen) ",
++ gclog_or_tty->print(" (re-scanned " SIZE_FORMAT " dirty cards in cms gen) ",
+ markFromDirtyCardsClosure.num_dirty_cards());
+ }
+ }
+@@ -6905,8 +6905,8 @@
+ } else if (_failed_double++ == 0 && !CMSConcurrentMTEnabled && PrintGCDetails) {
+ // Failed to double capacity, continue;
+ // we print a detail message only once per CMS cycle.
+- gclog_or_tty->print(" (benign) Failed to expand marking stack from "SIZE_FORMAT"K to "
+- SIZE_FORMAT"K",
++ gclog_or_tty->print(" (benign) Failed to expand marking stack from " SIZE_FORMAT "K to "
++ SIZE_FORMAT "K",
+ _capacity / K, new_capacity / K);
+ }
+ }
+@@ -8228,25 +8228,25 @@
+ ShouldNotReachHere();
+ }
+ if (Verbose && PrintGC) {
+- gclog_or_tty->print("Collected "SIZE_FORMAT" objects, " SIZE_FORMAT " bytes",
++ gclog_or_tty->print("Collected " SIZE_FORMAT " objects, " SIZE_FORMAT " bytes",
+ _numObjectsFreed, _numWordsFreed*sizeof(HeapWord));
+- gclog_or_tty->print_cr("\nLive "SIZE_FORMAT" objects, "
+- SIZE_FORMAT" bytes "
+- "Already free "SIZE_FORMAT" objects, "SIZE_FORMAT" bytes",
++ gclog_or_tty->print_cr("\nLive " SIZE_FORMAT " objects, "
++ SIZE_FORMAT " bytes "
++ "Already free " SIZE_FORMAT " objects, " SIZE_FORMAT " bytes",
+ _numObjectsLive, _numWordsLive*sizeof(HeapWord),
+ _numObjectsAlreadyFree, _numWordsAlreadyFree*sizeof(HeapWord));
+ size_t totalBytes = (_numWordsFreed + _numWordsLive + _numWordsAlreadyFree)
+ * sizeof(HeapWord);
+- gclog_or_tty->print_cr("Total sweep: "SIZE_FORMAT" bytes", totalBytes);
++ gclog_or_tty->print_cr("Total sweep: " SIZE_FORMAT " bytes", totalBytes);
+
+ if (PrintCMSStatistics && CMSVerifyReturnedBytes) {
+ size_t indexListReturnedBytes = _sp->sumIndexedFreeListArrayReturnedBytes();
+ size_t dict_returned_bytes = _sp->dictionary()->sum_dict_returned_bytes();
+ size_t returned_bytes = indexListReturnedBytes + dict_returned_bytes;
+- gclog_or_tty->print("Returned "SIZE_FORMAT" bytes", returned_bytes);
+- gclog_or_tty->print(" Indexed List Returned "SIZE_FORMAT" bytes",
++ gclog_or_tty->print("Returned " SIZE_FORMAT " bytes", returned_bytes);
++ gclog_or_tty->print(" Indexed List Returned " SIZE_FORMAT " bytes",
+ indexListReturnedBytes);
+- gclog_or_tty->print_cr(" Dictionary Returned "SIZE_FORMAT" bytes",
++ gclog_or_tty->print_cr(" Dictionary Returned " SIZE_FORMAT " bytes",
+ dict_returned_bytes);
+ }
+ }
+@@ -8325,13 +8325,13 @@
+ // coalesced chunk to the appropriate free list.
+ if (inFreeRange()) {
+ assert(freeFinger() >= _sp->bottom() && freeFinger() < _limit,
+- err_msg("freeFinger() " PTR_FORMAT" is out-of-bounds", freeFinger()));
++ err_msg("freeFinger() " PTR_FORMAT " is out-of-bounds", freeFinger()));
+ flush_cur_free_chunk(freeFinger(),
+ pointer_delta(addr, freeFinger()));
+ if (CMSTraceSweeper) {
+ gclog_or_tty->print("Sweep: last chunk: ");
+- gclog_or_tty->print("put_free_blk 0x%x ("SIZE_FORMAT") "
+- "[coalesced:"SIZE_FORMAT"]\n",
++ gclog_or_tty->print("put_free_blk 0x%x (" SIZE_FORMAT ") "
++ "[coalesced:" SIZE_FORMAT "]\n",
+ freeFinger(), pointer_delta(addr, freeFinger()),
+ lastFreeRangeCoalesced());
+ }
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp 2016-05-26 11:27:48.216051826 +0200
+@@ -92,7 +92,7 @@
+ regions_at_put(_curr_index, NULL);
+ assert(hr->reclaimable_bytes() <= _remaining_reclaimable_bytes,
+ err_msg("remaining reclaimable bytes inconsistent "
+- "from region: "SIZE_FORMAT" remaining: "SIZE_FORMAT,
++ "from region: " SIZE_FORMAT " remaining: " SIZE_FORMAT,
+ hr->reclaimable_bytes(), _remaining_reclaimable_bytes));
+ _remaining_reclaimable_bytes -= hr->reclaimable_bytes();
+ _curr_index += 1;
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2016-05-26 11:51:28.440718154 +0200
+@@ -284,7 +284,7 @@
+ if (PrintGCDetails && Verbose) {
+ // Failed to double capacity, continue;
+ gclog_or_tty->print(" (benign) Failed to expand marking stack capacity from "
+- SIZE_FORMAT"K to " SIZE_FORMAT"K",
++ SIZE_FORMAT "K to " SIZE_FORMAT "K",
+ _capacity / K, new_capacity / K);
+ }
+ }
+@@ -581,7 +581,7 @@
+ _verbose_level = verbose_level;
+
+ if (verbose_low()) {
+- gclog_or_tty->print_cr("[global] init, heap start = "PTR_FORMAT", "
++ gclog_or_tty->print_cr("[global] init, heap start = " PTR_FORMAT ", "
+ "heap end = " INTPTR_FORMAT, p2i(_heap_start), p2i(_heap_end));
+ }
+
+@@ -838,7 +838,7 @@
+ // in a STW phase.
+ assert(!concurrent_marking_in_progress(), "invariant");
+ assert(out_of_regions(),
+- err_msg("only way to get here: _finger: "PTR_FORMAT", _heap_end: "PTR_FORMAT,
++ err_msg("only way to get here: _finger: " PTR_FORMAT ", _heap_end: " PTR_FORMAT,
+ p2i(_finger), p2i(_heap_end)));
+ }
+ }
+@@ -1453,7 +1453,7 @@
+
+ assert(start <= hr->end() && start <= ntams && ntams <= hr->end(),
+ err_msg("Preconditions not met - "
+- "start: "PTR_FORMAT", ntams: "PTR_FORMAT", end: "PTR_FORMAT,
++ "start: " PTR_FORMAT ", ntams: " PTR_FORMAT ", end: " PTR_FORMAT,
+ p2i(start), p2i(ntams), p2i(hr->end())));
+
+ // Find the first marked object at or after "start".
+@@ -1770,10 +1770,10 @@
+ }
+
+ assert(end_idx <= _card_bm->size(),
+- err_msg("oob: end_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT,
++ err_msg("oob: end_idx= " SIZE_FORMAT ", bitmap size= " SIZE_FORMAT,
+ end_idx, _card_bm->size()));
+ assert(start_idx < _card_bm->size(),
+- err_msg("oob: start_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT,
++ err_msg("oob: start_idx= " SIZE_FORMAT ", bitmap size= " SIZE_FORMAT,
+ start_idx, _card_bm->size()));
+
+ _cm->set_card_bitmap_range(_card_bm, start_idx, end_idx, true /* is_par */);
+@@ -2278,7 +2278,7 @@
+ oop obj = oopDesc::load_decode_heap_oop(p);
+ if (_cm->verbose_high()) {
+ gclog_or_tty->print_cr("\t[%u] we're looking at location "
+- "*"PTR_FORMAT" = "PTR_FORMAT,
++ "*" PTR_FORMAT " = " PTR_FORMAT,
+ _task->worker_id(), p2i(p), p2i((void*) obj));
+ }
+
+@@ -2847,7 +2847,7 @@
+ }
+ }
+
+- _out->print_cr(" "PTR_FORMAT": "PTR_FORMAT"%s%s",
++ _out->print_cr(" " PTR_FORMAT ": " PTR_FORMAT "%s%s",
+ p2i(p), p2i((void*) obj), str, str2);
+ }
+ };
+@@ -2874,7 +2874,7 @@
+ bool print_it = _all || over_tams || marked;
+
+ if (print_it) {
+- _out->print_cr(" "PTR_FORMAT"%s",
++ _out->print_cr(" " PTR_FORMAT "%s",
+ p2i((void *)o), (over_tams) ? " >" : (marked) ? " M" : "");
+ PrintReachableOopClosure oopCl(_out, _vo, _all);
+ o->oop_iterate_no_header(&oopCl);
+@@ -2895,7 +2895,7 @@
+ HeapWord* e = hr->end();
+ HeapWord* t = hr->top();
+ HeapWord* p = _g1h->top_at_mark_start(hr, _vo);
+- _out->print_cr("** ["PTR_FORMAT", "PTR_FORMAT"] top: "PTR_FORMAT" "
++ _out->print_cr("** [" PTR_FORMAT ", " PTR_FORMAT "] top: " PTR_FORMAT " "
+ "TAMS: " PTR_FORMAT, p2i(b), p2i(e), p2i(t), p2i(p));
+ _out->cr();
+
+@@ -3019,9 +3019,9 @@
+ HeapWord* limit = curr_region->next_top_at_mark_start();
+
+ if (verbose_low()) {
+- gclog_or_tty->print_cr("[%u] curr_region = "PTR_FORMAT" "
+- "["PTR_FORMAT", "PTR_FORMAT"), "
+- "limit = "PTR_FORMAT,
++ gclog_or_tty->print_cr("[%u] curr_region = " PTR_FORMAT " "
++ "[" PTR_FORMAT ", " PTR_FORMAT "), "
++ "limit = " PTR_FORMAT,
+ worker_id, p2i(curr_region), p2i(bottom), p2i(end), p2i(limit));
+ }
+
+@@ -3036,7 +3036,7 @@
+
+ if (limit > bottom) {
+ if (verbose_low()) {
+- gclog_or_tty->print_cr("[%u] region "PTR_FORMAT" is not empty, "
++ gclog_or_tty->print_cr("[%u] region " PTR_FORMAT " is not empty, "
+ "returning it ", worker_id, p2i(curr_region));
+ }
+ return curr_region;
+@@ -3044,7 +3044,7 @@
+ assert(limit == bottom,
+ "the region limit should be at bottom");
+ if (verbose_low()) {
+- gclog_or_tty->print_cr("[%u] region "PTR_FORMAT" is empty, "
++ gclog_or_tty->print_cr("[%u] region " PTR_FORMAT " is empty, "
+ "returning NULL", worker_id, p2i(curr_region));
+ }
+ // we return NULL and the caller should try calling
+@@ -3056,13 +3056,13 @@
+ if (verbose_low()) {
+ if (curr_region == NULL) {
+ gclog_or_tty->print_cr("[%u] found uncommitted region, moving finger, "
+- "global finger = "PTR_FORMAT", "
+- "our finger = "PTR_FORMAT,
++ "global finger = " PTR_FORMAT ", "
++ "our finger = " PTR_FORMAT,
+ worker_id, p2i(_finger), p2i(finger));
+ } else {
+ gclog_or_tty->print_cr("[%u] somebody else moved the finger, "
+- "global finger = "PTR_FORMAT", "
+- "our finger = "PTR_FORMAT,
++ "global finger = " PTR_FORMAT", "
++ "our finger = " PTR_FORMAT,
+ worker_id, p2i(_finger), p2i(finger));
+ }
+ }
+@@ -3098,7 +3098,7 @@
+
+ void do_object_work(oop obj) {
+ guarantee(!_g1h->obj_in_cs(obj),
+- err_msg("obj: "PTR_FORMAT" in CSet, phase: %s, info: %d",
++ err_msg("obj: " PTR_FORMAT " in CSet, phase: %s, info: %d",
+ p2i((void*) obj), phase_str(), _info));
+ }
+
+@@ -3159,7 +3159,7 @@
+ // here.
+ HeapRegion* global_hr = _g1h->heap_region_containing_raw(global_finger);
+ guarantee(global_hr == NULL || global_finger == global_hr->bottom(),
+- err_msg("global finger: "PTR_FORMAT" region: "HR_FORMAT,
++ err_msg("global finger: " PTR_FORMAT " region: " HR_FORMAT,
+ p2i(global_finger), HR_FORMAT_PARAMS(global_hr)));
+ }
+
+@@ -3173,7 +3173,7 @@
+ HeapRegion* task_hr = _g1h->heap_region_containing_raw(task_finger);
+ guarantee(task_hr == NULL || task_finger == task_hr->bottom() ||
+ !task_hr->in_collection_set(),
+- err_msg("task finger: "PTR_FORMAT" region: "HR_FORMAT,
++ err_msg("task finger: " PTR_FORMAT " region: " HR_FORMAT,
+ p2i(task_finger), HR_FORMAT_PARAMS(task_hr)));
+ }
+ }
+@@ -3215,8 +3215,8 @@
+
+ assert(start <= limit && limit <= hr->top() && hr->top() <= hr->end(),
+ err_msg("Preconditions not met - "
+- "start: "PTR_FORMAT", limit: "PTR_FORMAT", "
+- "top: "PTR_FORMAT", end: "PTR_FORMAT,
++ "start: " PTR_FORMAT ", limit: " PTR_FORMAT ", "
++ "top: " PTR_FORMAT ", end: " PTR_FORMAT,
+ p2i(start), p2i(limit), p2i(hr->top()), p2i(hr->end())));
+
+ assert(hr->next_marked_bytes() == 0, "Precondition");
+@@ -3495,7 +3495,7 @@
+ #ifndef PRODUCT
+ // for debugging purposes
+ void ConcurrentMark::print_finger() {
+- gclog_or_tty->print_cr("heap ["PTR_FORMAT", "PTR_FORMAT"), global finger = "PTR_FORMAT,
++ gclog_or_tty->print_cr("heap [" PTR_FORMAT ", " PTR_FORMAT "), global finger = " PTR_FORMAT,
+ p2i(_heap_start), p2i(_heap_end), p2i(_finger));
+ for (uint i = 0; i < _max_worker_id; ++i) {
+ gclog_or_tty->print(" %u: " PTR_FORMAT, i, p2i(_tasks[i]->finger()));
+@@ -3580,7 +3580,7 @@
+ "claim_region() should have filtered out continues humongous regions");
+
+ if (_cm->verbose_low()) {
+- gclog_or_tty->print_cr("[%u] setting up for region "PTR_FORMAT,
++ gclog_or_tty->print_cr("[%u] setting up for region " PTR_FORMAT,
+ _worker_id, p2i(hr));
+ }
+
+@@ -3597,7 +3597,7 @@
+ if (limit == bottom) {
+ if (_cm->verbose_low()) {
+ gclog_or_tty->print_cr("[%u] found an empty region "
+- "["PTR_FORMAT", "PTR_FORMAT")",
++ "[" PTR_FORMAT ", " PTR_FORMAT ")",
+ _worker_id, p2i(bottom), p2i(limit));
+ }
+ // The region was collected underneath our feet.
+@@ -3629,7 +3629,7 @@
+ void CMTask::giveup_current_region() {
+ assert(_curr_region != NULL, "invariant");
+ if (_cm->verbose_low()) {
+- gclog_or_tty->print_cr("[%u] giving up region "PTR_FORMAT,
++ gclog_or_tty->print_cr("[%u] giving up region " PTR_FORMAT,
+ _worker_id, p2i(_curr_region));
+ }
+ clear_region_fields();
+@@ -3751,7 +3751,7 @@
+
+ if (_cm->verbose_medium()) {
+ gclog_or_tty->print_cr("[%u] regular clock, interval = %1.2lfms, "
+- "scanned = "SIZE_FORMAT"%s, refs reached = "SIZE_FORMAT"%s",
++ "scanned = " SIZE_FORMAT "%s, refs reached = " SIZE_FORMAT "%s",
+ _worker_id, last_interval_ms,
+ _words_scanned,
+ (_words_scanned >= _words_scanned_limit) ? " (*)" : "",
+@@ -3920,7 +3920,7 @@
+ statsOnly( ++_local_pops );
+
+ if (_cm->verbose_high()) {
+- gclog_or_tty->print_cr("[%u] popped "PTR_FORMAT, _worker_id,
++ gclog_or_tty->print_cr("[%u] popped " PTR_FORMAT, _worker_id,
+ p2i((void*) obj));
+ }
+
+@@ -4273,8 +4273,8 @@
+
+ if (_cm->verbose_low()) {
+ gclog_or_tty->print_cr("[%u] we're scanning part "
+- "["PTR_FORMAT", "PTR_FORMAT") "
+- "of region "HR_FORMAT,
++ "[" PTR_FORMAT ", " PTR_FORMAT ") "
++ "of region " HR_FORMAT,
+ _worker_id, p2i(_finger), p2i(_region_limit),
+ HR_FORMAT_PARAMS(_curr_region));
+ }
+@@ -4361,7 +4361,7 @@
+
+ if (_cm->verbose_low()) {
+ gclog_or_tty->print_cr("[%u] we successfully claimed "
+- "region "PTR_FORMAT,
++ "region " PTR_FORMAT,
+ _worker_id, p2i(claimed_region));
+ }
+
+@@ -4422,7 +4422,7 @@
+
+ if (_cm->try_stealing(_worker_id, &_hash_seed, obj)) {
+ if (_cm->verbose_medium()) {
+- gclog_or_tty->print_cr("[%u] stolen "PTR_FORMAT" successfully",
++ gclog_or_tty->print_cr("[%u] stolen " PTR_FORMAT " successfully",
+ _worker_id, p2i((void*) obj));
+ }
+
+@@ -4630,7 +4630,7 @@
+ // identify them easily in a large log file.
+ #define G1PPRL_LINE_PREFIX "###"
+
+-#define G1PPRL_ADDR_BASE_FORMAT " "PTR_FORMAT"-"PTR_FORMAT
++#define G1PPRL_ADDR_BASE_FORMAT " " PTR_FORMAT "-" PTR_FORMAT
+ #ifdef _LP64
+ #define G1PPRL_ADDR_BASE_H_FORMAT " %37s"
+ #else // _LP64
+@@ -4640,16 +4640,16 @@
+ // For per-region info
+ #define G1PPRL_TYPE_FORMAT " %-4s"
+ #define G1PPRL_TYPE_H_FORMAT " %4s"
+-#define G1PPRL_BYTE_FORMAT " "SIZE_FORMAT_W(9)
++#define G1PPRL_BYTE_FORMAT " " SIZE_FORMAT_W(9)
+ #define G1PPRL_BYTE_H_FORMAT " %9s"
+ #define G1PPRL_DOUBLE_FORMAT " %14.1f"
+ #define G1PPRL_DOUBLE_H_FORMAT " %14s"
+
+ // For summary info
+-#define G1PPRL_SUM_ADDR_FORMAT(tag) " "tag":"G1PPRL_ADDR_BASE_FORMAT
+-#define G1PPRL_SUM_BYTE_FORMAT(tag) " "tag": "SIZE_FORMAT
+-#define G1PPRL_SUM_MB_FORMAT(tag) " "tag": %1.2f MB"
+-#define G1PPRL_SUM_MB_PERC_FORMAT(tag) G1PPRL_SUM_MB_FORMAT(tag)" / %1.2f %%"
++#define G1PPRL_SUM_ADDR_FORMAT(tag) " " tag ":" G1PPRL_ADDR_BASE_FORMAT
++#define G1PPRL_SUM_BYTE_FORMAT(tag) " " tag ": " SIZE_FORMAT
++#define G1PPRL_SUM_MB_FORMAT(tag) " " tag ": %1.2f MB"
++#define G1PPRL_SUM_MB_PERC_FORMAT(tag) G1PPRL_SUM_MB_FORMAT(tag) " / %1.2f %%"
+
+ G1PrintRegionLivenessInfoClosure::
+ G1PrintRegionLivenessInfoClosure(outputStream* out, const char* phase_name)
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp 2016-05-26 09:53:16.842635850 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp 2016-05-26 10:22:30.895158677 +0200
+@@ -196,8 +196,8 @@
+ assert(_bmStartWord <= (addr) && (addr) < (_bmStartWord + _bmWordSize), \
+ "outside underlying space?"); \
+ assert(G1CollectedHeap::heap()->is_in_exact(addr), \
+- err_msg("Trying to access not available bitmap "PTR_FORMAT \
+- " corresponding to "PTR_FORMAT" (%u)", \
++ err_msg("Trying to access not available bitmap " PTR_FORMAT \
++ " corresponding to " PTR_FORMAT " (%u)", \
+ p2i(this), p2i(addr), G1CollectedHeap::heap()->addr_to_region(addr)));
+
+ inline void CMBitMap::mark(HeapWord* addr) {
+@@ -343,7 +343,7 @@
+
+ inline void CMTask::deal_with_reference(oop obj) {
+ if (_cm->verbose_high()) {
+- gclog_or_tty->print_cr("[%u] we're dealing with reference = "PTR_FORMAT,
++ gclog_or_tty->print_cr("[%u] we're dealing with reference = " PTR_FORMAT,
+ _worker_id, p2i((void*) obj));
+ }
+
+@@ -392,7 +392,7 @@
+ // assert that word_size is under an upper bound which is its
+ // containing region's capacity.
+ assert(word_size * HeapWordSize <= hr->capacity(),
+- err_msg("size: "SIZE_FORMAT" capacity: "SIZE_FORMAT" "HR_FORMAT,
++ err_msg("size: " SIZE_FORMAT " capacity: " SIZE_FORMAT " " HR_FORMAT,
+ word_size * HeapWordSize, hr->capacity(),
+ HR_FORMAT_PARAMS(hr)));
+
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp 2016-05-26 11:26:58.521150295 +0200
+@@ -73,7 +73,7 @@
+
+ void decrease_used(size_t bytes) {
+ assert(_summary_bytes_used >= bytes,
+- err_msg("invariant: _summary_bytes_used: "SIZE_FORMAT" should be >= bytes: "SIZE_FORMAT,
++ err_msg("invariant: _summary_bytes_used: " SIZE_FORMAT " should be >= bytes: " SIZE_FORMAT,
+ _summary_bytes_used, bytes));
+ _summary_bytes_used -= bytes;
+ }
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp 2016-05-26 12:11:18.986540731 +0200
+@@ -140,7 +140,7 @@
+ }
+
+ void G1AllocRegion::fill_in_ext_msg(ar_ext_msg* msg, const char* message) {
+- msg->append("[%s] %s c: %u b: %s r: "PTR_FORMAT" u: "SIZE_FORMAT,
++ msg->append("[%s] %s c: %u b: %s r: " PTR_FORMAT " u: " SIZE_FORMAT,
+ _name, message, _count, BOOL_TO_STR(_bot_updates),
+ p2i(_alloc_region), _used_bytes_before);
+ }
+@@ -217,7 +217,7 @@
+
+ if (G1_ALLOC_REGION_TRACING > 1) {
+ if (result != NULL) {
+- jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT" "PTR_FORMAT,
++ jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT " " PTR_FORMAT,
+ word_size, result);
+ } else if (word_size != 0) {
+ jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT, word_size);
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp 2016-05-26 12:13:13.360022784 +0200
+@@ -385,11 +385,11 @@
+ HeapWord* card_addr = _array->address_for_index(card);
+ HeapWord* block_start = block_start_const(card_addr);
+ if (block_start != obj_start) {
+- gclog_or_tty->print_cr("block start: "PTR_FORMAT" is incorrect - "
+- "card index: "SIZE_FORMAT" "
+- "card addr: "PTR_FORMAT" BOT entry: %u "
+- "obj: "PTR_FORMAT" word size: "SIZE_FORMAT" "
+- "cards: ["SIZE_FORMAT","SIZE_FORMAT"]",
++ gclog_or_tty->print_cr("block start: " PTR_FORMAT " is incorrect - "
++ "card index: " SIZE_FORMAT " "
++ "card addr: " PTR_FORMAT " BOT entry: %u "
++ "obj: " PTR_FORMAT " word size: " SIZE_FORMAT " "
++ "cards: [" SIZE_FORMAT "," SIZE_FORMAT "]",
+ block_start, card, card_addr,
+ _array->offset_array(card),
+ obj_start, word_size, first_card, last_card);
+@@ -404,11 +404,11 @@
+ G1BlockOffsetArray::print_on(outputStream* out) {
+ size_t from_index = _array->index_for(_bottom);
+ size_t to_index = _array->index_for(_end);
+- out->print_cr(">> BOT for area ["PTR_FORMAT","PTR_FORMAT") "
+- "cards ["SIZE_FORMAT","SIZE_FORMAT")",
++ out->print_cr(">> BOT for area [" PTR_FORMAT "," PTR_FORMAT ") "
++ "cards [" SIZE_FORMAT "," SIZE_FORMAT ")",
+ _bottom, _end, from_index, to_index);
+ for (size_t i = from_index; i < to_index; ++i) {
+- out->print_cr(" entry "SIZE_FORMAT_W(8)" | "PTR_FORMAT" : %3u",
++ out->print_cr(" entry " SIZE_FORMAT_W(8) " | " PTR_FORMAT " : %3u",
+ i, _array->address_for_index(i),
+ (uint) _array->offset_array(i));
+ }
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp 2016-05-26 11:41:15.870184374 +0200
+@@ -49,10 +49,10 @@
+
+ #define check_index(index, msg) \
+ assert((index) < (_reserved.word_size() >> LogN_words), \
+- err_msg("%s - index: "SIZE_FORMAT", _vs.committed_size: "SIZE_FORMAT, \
++ err_msg("%s - index: " SIZE_FORMAT ", _vs.committed_size: " SIZE_FORMAT, \
+ msg, (index), (_reserved.word_size() >> LogN_words))); \
+ assert(G1CollectedHeap::heap()->is_in_exact(address_for_index_raw(index)), \
+- err_msg("Index "SIZE_FORMAT" corresponding to "PTR_FORMAT \
++ err_msg("Index " SIZE_FORMAT " corresponding to " PTR_FORMAT \
+ " (%u) is not in committed area.", \
+ (index), \
+ p2i(address_for_index_raw(index)), \
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp 2016-05-26 12:13:55.231100865 +0200
+@@ -44,7 +44,7 @@
+ void G1CardCounts::clear_range(size_t from_card_num, size_t to_card_num) {
+ if (has_count_table()) {
+ assert(from_card_num < to_card_num,
+- err_msg("Wrong order? from: " SIZE_FORMAT ", to: "SIZE_FORMAT,
++ err_msg("Wrong order? from: " SIZE_FORMAT ", to: " SIZE_FORMAT,
+ from_card_num, to_card_num));
+ Copy::fill_to_bytes(&_card_counts[from_card_num], (to_card_num - from_card_num));
+ }
+@@ -87,7 +87,7 @@
+ if (has_count_table()) {
+ size_t card_num = ptr_2_card_num(card_ptr);
+ assert(card_num < _reserved_max_card_num,
+- err_msg("Card "SIZE_FORMAT" outside of card counts table (max size "SIZE_FORMAT")",
++ err_msg("Card " SIZE_FORMAT " outside of card counts table (max size " SIZE_FORMAT ")",
+ card_num, _reserved_max_card_num));
+ count = (uint) _card_counts[card_num];
+ if (count < G1ConcRSHotCardLimit) {
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp 2016-05-26 11:47:09.062412333 +0200
+@@ -91,7 +91,7 @@
+
+ jbyte* card_num_2_ptr(size_t card_num) {
+ assert(card_num >= 0 && card_num < _reserved_max_card_num,
+- err_msg("card num out of range: "SIZE_FORMAT, card_num));
++ err_msg("card num out of range: " SIZE_FORMAT, card_num));
+ return (jbyte*) (_ct_bot + card_num);
+ }
+
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2016-05-26 12:47:00.759357577 +0200
+@@ -230,7 +230,7 @@
+ HeapRegion* last = NULL;
+ while (curr != NULL) {
+ if (!curr->is_young()) {
+- gclog_or_tty->print_cr("### YOUNG REGION "PTR_FORMAT"-"PTR_FORMAT" "
++ gclog_or_tty->print_cr("### YOUNG REGION " PTR_FORMAT "-" PTR_FORMAT " "
+ "incorrectly tagged (y: %d, surv: %d)",
+ curr->bottom(), curr->end(),
+ curr->is_young(), curr->is_survivor());
+@@ -359,7 +359,7 @@
+ if (curr == NULL)
+ gclog_or_tty->print_cr(" empty");
+ while (curr != NULL) {
+- gclog_or_tty->print_cr(" "HR_FORMAT", P: "PTR_FORMAT ", N: "PTR_FORMAT", age: %4d",
++ gclog_or_tty->print_cr(" " HR_FORMAT ", P: " PTR_FORMAT ", N: " PTR_FORMAT ", age: %4d",
+ HR_FORMAT_PARAMS(curr),
+ curr->prev_top_at_mark_start(),
+ curr->next_top_at_mark_start(),
+@@ -490,7 +490,7 @@
+ gclog_or_tty->print_cr("Log entries = %d, dirty cards = %d.",
+ clear.num_processed(), orig_count);
+ guarantee(redirty.num_processed() == clear.num_processed(),
+- err_msg("Redirtied "SIZE_FORMAT" cards, bug cleared "SIZE_FORMAT,
++ err_msg("Redirtied " SIZE_FORMAT " cards, bug cleared " SIZE_FORMAT,
+ redirty.num_processed(), clear.num_processed()));
+
+ CountNonCleanMemRegionClosure count3(this);
+@@ -528,7 +528,7 @@
+ HeapRegion* res = _hrm.allocate_free_region(is_old);
+ if (G1ConcRegionFreeingVerbose) {
+ gclog_or_tty->print_cr("G1ConcRegionFreeing [region alloc] : "
+- "allocated "HR_FORMAT" from secondary_free_list",
++ "allocated " HR_FORMAT " from secondary_free_list",
+ HR_FORMAT_PARAMS(res));
+ }
+ return res;
+@@ -1597,8 +1597,8 @@
+ // This assert only makes sense here, before we adjust them
+ // with respect to the min and max heap size.
+ assert(minimum_desired_capacity <= maximum_desired_capacity,
+- err_msg("minimum_desired_capacity = "SIZE_FORMAT", "
+- "maximum_desired_capacity = "SIZE_FORMAT,
++ err_msg("minimum_desired_capacity = " SIZE_FORMAT ", "
++ "maximum_desired_capacity = " SIZE_FORMAT,
+ minimum_desired_capacity, maximum_desired_capacity));
+
+ // Should not be greater than the heap max size. No need to adjust
+@@ -2990,10 +2990,10 @@
+ if (!oopDesc::is_null(heap_oop)) {
+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
+ if (_g1h->is_obj_dead_cond(obj, _vo)) {
+- gclog_or_tty->print_cr("Root location "PTR_FORMAT" "
+- "points to dead obj "PTR_FORMAT, p, (void*) obj);
++ gclog_or_tty->print_cr("Root location " PTR_FORMAT " "
++ "points to dead obj " PTR_FORMAT, p, (void*) obj);
+ if (_vo == VerifyOption_G1UseMarkWord) {
+- gclog_or_tty->print_cr(" Mark word: "PTR_FORMAT, (void*)(obj->mark()));
++ gclog_or_tty->print_cr(" Mark word: " PTR_FORMAT, (void*)(obj->mark()));
+ }
+ obj->print_on(gclog_or_tty);
+ _failures = true;
+@@ -3040,9 +3040,9 @@
+ // Verify that the strong code root list for this region
+ // contains the nmethod
+ if (!hrrs->strong_code_roots_list_contains(_nm)) {
+- gclog_or_tty->print_cr("Code root location "PTR_FORMAT" "
+- "from nmethod "PTR_FORMAT" not in strong "
+- "code roots for region ["PTR_FORMAT","PTR_FORMAT")",
++ gclog_or_tty->print_cr("Code root location " PTR_FORMAT " "
++ "from nmethod " PTR_FORMAT " not in strong "
++ "code roots for region [" PTR_FORMAT "," PTR_FORMAT ")",
+ p, _nm, hr->bottom(), hr->end());
+ _failures = true;
+ }
+@@ -3172,7 +3172,7 @@
+ if (o != NULL) {
+ HeapWord *start = (HeapWord *) o;
+ size_t word_sz = o->size();
+- gclog_or_tty->print("\nPrinting obj "PTR_FORMAT" of size " SIZE_FORMAT
++ gclog_or_tty->print("\nPrinting obj " PTR_FORMAT " of size " SIZE_FORMAT
+ " isMarkedPrev %d isMarkedNext %d isAllocSince %d\n",
+ (void*) o, word_sz,
+ _g1->isMarkedPrev(o),
+@@ -3183,7 +3183,7 @@
+ int *val;
+ for (cur = start; cur < end; cur++) {
+ val = (int *) cur;
+- gclog_or_tty->print("\t "PTR_FORMAT":"PTR_FORMAT"\n", val, *val);
++ gclog_or_tty->print("\t " PTR_FORMAT ":" PTR_FORMAT "\n", val, *val);
+ }
+ }
+ }
+@@ -3218,9 +3218,9 @@
+ r->object_iterate(¬_dead_yet_cl);
+ if (_vo != VerifyOption_G1UseNextMarking) {
+ if (r->max_live_bytes() < not_dead_yet_cl.live_bytes()) {
+- gclog_or_tty->print_cr("["PTR_FORMAT","PTR_FORMAT"] "
+- "max_live_bytes "SIZE_FORMAT" "
+- "< calculated "SIZE_FORMAT,
++ gclog_or_tty->print_cr("[" PTR_FORMAT "," PTR_FORMAT "] "
++ "max_live_bytes " SIZE_FORMAT " "
++ "< calculated " SIZE_FORMAT,
+ r->bottom(), r->end(),
+ r->max_live_bytes(),
+ not_dead_yet_cl.live_bytes());
+@@ -4372,7 +4372,7 @@
+ G1CollectedHeap::handle_evacuation_failure_par(G1ParScanThreadState* _par_scan_state,
+ oop old) {
+ assert(obj_in_cs(old),
+- err_msg("obj: "PTR_FORMAT" should still be in the CSet",
++ err_msg("obj: " PTR_FORMAT " should still be in the CSet",
+ (HeapWord*) old));
+ markOop m = old->mark();
+ oop forward_ptr = old->forward_to_atomic(old);
+@@ -4406,7 +4406,7 @@
+ // space for this object (old != forward_ptr) or they beat us in
+ // self-forwarding it (old == forward_ptr).
+ assert(old == forward_ptr || !obj_in_cs(forward_ptr),
+- err_msg("obj: "PTR_FORMAT" forwarded to: "PTR_FORMAT" "
++ err_msg("obj: " PTR_FORMAT " forwarded to: " PTR_FORMAT " "
+ "should not be in the CSet",
+ (HeapWord*) old, (HeapWord*) forward_ptr));
+ return forward_ptr;
+@@ -4793,16 +4793,16 @@
+
+ ~G1StringSymbolTableUnlinkTask() {
+ guarantee(!_process_strings || !_do_in_parallel || StringTable::parallel_claimed_index() >= _initial_string_table_size,
+- err_msg("claim value "INT32_FORMAT" after unlink less than initial string table size "INT32_FORMAT,
++ err_msg("claim value " INT32_FORMAT " after unlink less than initial string table size " INT32_FORMAT,
+ StringTable::parallel_claimed_index(), _initial_string_table_size));
+ guarantee(!_process_symbols || !_do_in_parallel || SymbolTable::parallel_claimed_index() >= _initial_symbol_table_size,
+- err_msg("claim value "INT32_FORMAT" after unlink less than initial symbol table size "INT32_FORMAT,
++ err_msg("claim value " INT32_FORMAT " after unlink less than initial symbol table size " INT32_FORMAT,
+ SymbolTable::parallel_claimed_index(), _initial_symbol_table_size));
+
+ if (G1TraceStringSymbolTableScrubbing) {
+ gclog_or_tty->print_cr("Cleaned string and symbol table, "
+- "strings: "SIZE_FORMAT" processed, "SIZE_FORMAT" removed, "
+- "symbols: "SIZE_FORMAT" processed, "SIZE_FORMAT" removed",
++ "strings: " SIZE_FORMAT " processed, " SIZE_FORMAT " removed, "
++ "symbols: " SIZE_FORMAT " processed, " SIZE_FORMAT " removed",
+ strings_processed(), strings_removed(),
+ symbols_processed(), symbols_removed());
+ }
+@@ -6001,13 +6001,13 @@
+ bool G1CollectedHeap::verify_no_bits_over_tams(const char* bitmap_name, CMBitMapRO* bitmap,
+ HeapWord* tams, HeapWord* end) {
+ guarantee(tams <= end,
+- err_msg("tams: "PTR_FORMAT" end: "PTR_FORMAT, tams, end));
++ err_msg("tams: " PTR_FORMAT " end: " PTR_FORMAT, tams, end));
+ HeapWord* result = bitmap->getNextMarkedWordAddress(tams, end);
+ if (result < end) {
+ gclog_or_tty->cr();
+- gclog_or_tty->print_cr("## wrong marked address on %s bitmap: "PTR_FORMAT,
++ gclog_or_tty->print_cr("## wrong marked address on %s bitmap: " PTR_FORMAT,
+ bitmap_name, result);
+- gclog_or_tty->print_cr("## %s tams: "PTR_FORMAT" end: "PTR_FORMAT,
++ gclog_or_tty->print_cr("## %s tams: " PTR_FORMAT " end: " PTR_FORMAT,
+ bitmap_name, tams, end);
+ return false;
+ }
+@@ -6033,7 +6033,7 @@
+ res_n = verify_no_bits_over_tams("next", next_bitmap, ntams, end);
+ }
+ if (!res_p || !res_n) {
+- gclog_or_tty->print_cr("#### Bitmap verification failed for "HR_FORMAT,
++ gclog_or_tty->print_cr("#### Bitmap verification failed for " HR_FORMAT,
+ HR_FORMAT_PARAMS(hr));
+ gclog_or_tty->print_cr("#### Caller: %s", caller);
+ return false;
+@@ -6345,7 +6345,7 @@
+ !r->rem_set()->is_empty()) {
+
+ if (G1TraceEagerReclaimHumongousObjects) {
+- gclog_or_tty->print_cr("Live humongous region %u size "SIZE_FORMAT" start "PTR_FORMAT" length "UINT32_FORMAT" with remset "SIZE_FORMAT" code roots "SIZE_FORMAT" is marked %d reclaim candidate %d type array %d",
++ gclog_or_tty->print_cr("Live humongous region %u size " SIZE_FORMAT " start " PTR_FORMAT " length " UINT32_FORMAT " with remset " SIZE_FORMAT " code roots " SIZE_FORMAT " is marked %d reclaim candidate %d type array %d",
+ region_idx,
+ obj->size()*HeapWordSize,
+ r->bottom(),
+@@ -6367,7 +6367,7 @@
+ r->bottom()));
+
+ if (G1TraceEagerReclaimHumongousObjects) {
+- gclog_or_tty->print_cr("Dead humongous region %u size "SIZE_FORMAT" start "PTR_FORMAT" length "UINT32_FORMAT" with remset "SIZE_FORMAT" code roots "SIZE_FORMAT" is marked %d reclaim candidate %d type array %d",
++ gclog_or_tty->print_cr("Dead humongous region %u size " SIZE_FORMAT " start " PTR_FORMAT " length " UINT32_FORMAT " with remset " SIZE_FORMAT " code roots " SIZE_FORMAT " is marked %d reclaim candidate %d type array %d",
+ region_idx,
+ obj->size()*HeapWordSize,
+ r->bottom(),
+@@ -6523,7 +6523,7 @@
+ NoYoungRegionsClosure() : _success(true) { }
+ bool doHeapRegion(HeapRegion* r) {
+ if (r->is_young()) {
+- gclog_or_tty->print_cr("Region ["PTR_FORMAT", "PTR_FORMAT") tagged as young",
++ gclog_or_tty->print_cr("Region [" PTR_FORMAT ", " PTR_FORMAT ") tagged as young",
+ r->bottom(), r->end());
+ _success = false;
+ }
+@@ -6652,7 +6652,7 @@
+ }
+ assert(_allocator->used_unlocked() == recalculate_used(),
+ err_msg("inconsistent _allocator->used_unlocked(), "
+- "value: "SIZE_FORMAT" recalculated: "SIZE_FORMAT,
++ "value: " SIZE_FORMAT " recalculated: " SIZE_FORMAT,
+ _allocator->used_unlocked(), recalculate_used()));
+ }
+
+@@ -6873,8 +6873,8 @@
+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
+ HeapRegion* hr = _g1h->heap_region_containing(obj);
+ assert(!hr->continuesHumongous(),
+- err_msg("trying to add code root "PTR_FORMAT" in continuation of humongous region "HR_FORMAT
+- " starting at "HR_FORMAT,
++ err_msg("trying to add code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT
++ " starting at " HR_FORMAT,
+ _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
+
+ // HeapRegion::add_strong_code_root_locked() avoids adding duplicate entries.
+@@ -6900,8 +6900,8 @@
+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
+ HeapRegion* hr = _g1h->heap_region_containing(obj);
+ assert(!hr->continuesHumongous(),
+- err_msg("trying to remove code root "PTR_FORMAT" in continuation of humongous region "HR_FORMAT
+- " starting at "HR_FORMAT,
++ err_msg("trying to remove code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT
++ " starting at " HR_FORMAT,
+ _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
+
+ hr->remove_strong_code_root(_nm);
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp 2016-05-26 11:41:38.465684126 +0200
+@@ -81,7 +81,7 @@
+
+ inline uint G1CollectedHeap::addr_to_region(HeapWord* addr) const {
+ assert(is_in_reserved(addr),
+- err_msg("Cannot calculate region index for address "PTR_FORMAT" that is outside of the heap ["PTR_FORMAT", "PTR_FORMAT")",
++ err_msg("Cannot calculate region index for address " PTR_FORMAT " that is outside of the heap [" PTR_FORMAT ", " PTR_FORMAT ")",
+ p2i(addr), p2i(_reserved.start()), p2i(_reserved.end())));
+ return (uint)(pointer_delta(addr, _reserved.start(), sizeof(uint8_t)) >> HeapRegion::LogOfHRGrainBytes);
+ }
+@@ -94,7 +94,7 @@
+ inline HeapRegion* G1CollectedHeap::heap_region_containing_raw(const T addr) const {
+ assert(addr != NULL, "invariant");
+ assert(is_in_g1_reserved((const void*) addr),
+- err_msg("Address "PTR_FORMAT" is outside of the heap ranging from ["PTR_FORMAT" to "PTR_FORMAT")",
++ err_msg("Address " PTR_FORMAT " is outside of the heap ranging from [" PTR_FORMAT " to " PTR_FORMAT ")",
+ p2i((void*)addr), p2i(g1_reserved().start()), p2i(g1_reserved().end())));
+ return _hrm.addr_to_region((HeapWord*) addr);
+ }
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp 2016-05-26 12:28:18.488090472 +0200
+@@ -199,7 +199,7 @@
+ const size_t region_size = HeapRegion::GrainWords;
+ if (YoungPLABSize > region_size || OldPLABSize > region_size) {
+ char buffer[128];
+- jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most "SIZE_FORMAT,
++ jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most " SIZE_FORMAT,
+ OldPLABSize > region_size ? "Old" : "Young", region_size);
+ vm_exit_during_initialization(buffer);
+ }
+@@ -846,7 +846,7 @@
+ update_survivors_policy();
+
+ assert(_g1->used() == _g1->recalculate_used(),
+- err_msg("sanity, used: "SIZE_FORMAT" recalculate_used: "SIZE_FORMAT,
++ err_msg("sanity, used: " SIZE_FORMAT " recalculate_used: " SIZE_FORMAT,
+ _g1->used(), _g1->recalculate_used()));
+
+ double s_w_t_ms = (start_time_sec - _stop_world_start) * 1000.0;
+@@ -1231,10 +1231,10 @@
+ (_young_list_target_length * HeapRegion::GrainBytes) - survivor_used_bytes_after_gc;
+
+ gclog_or_tty->print(
+- " [Eden: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT") "
+- "Survivors: "EXT_SIZE_FORMAT"->"EXT_SIZE_FORMAT" "
+- "Heap: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"
+- EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")]",
++ " [Eden: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->" EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ") "
++ "Survivors: " EXT_SIZE_FORMAT "->" EXT_SIZE_FORMAT " "
++ "Heap: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->"
++ EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")]",
+ EXT_SIZE_PARAMS(_eden_used_bytes_before_gc),
+ EXT_SIZE_PARAMS(_eden_capacity_bytes_before_gc),
+ EXT_SIZE_PARAMS(eden_used_bytes_after_gc),
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp 2016-05-26 10:27:51.635941074 +0200
+@@ -121,15 +121,15 @@
+ // Single parameter format strings
+ #define ergo_format_str(_name_) ", " _name_ ": %s"
+ #define ergo_format_region(_name_) ", " _name_ ": %u regions"
+-#define ergo_format_byte(_name_) ", " _name_ ": "SIZE_FORMAT" bytes"
++#define ergo_format_byte(_name_) ", " _name_ ": " SIZE_FORMAT " bytes"
+ #define ergo_format_double(_name_) ", " _name_ ": %1.2f"
+ #define ergo_format_perc(_name_) ", " _name_ ": %1.2f %%"
+ #define ergo_format_ms(_name_) ", " _name_ ": %1.2f ms"
+-#define ergo_format_size(_name_) ", " _name_ ": "SIZE_FORMAT
++#define ergo_format_size(_name_) ", " _name_ ": " SIZE_FORMAT
+
+ // Double parameter format strings
+ #define ergo_format_byte_perc(_name_) \
+- ", " _name_ ": "SIZE_FORMAT" bytes (%1.2f %%)"
++ ", " _name_ ": " SIZE_FORMAT " bytes (%1.2f %%)"
+
+ // Generates the format string
+ #define ergo_format(_extra_format_) \
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp 2016-05-26 12:14:48.289932520 +0200
+@@ -330,7 +330,7 @@
+ }
+
+ void G1GCPhaseTimes::print_stats(int level, const char* str, size_t value) {
+- LineBuffer(level).append_and_print_cr("[%s: "SIZE_FORMAT"]", str, value);
++ LineBuffer(level).append_and_print_cr("[%s: " SIZE_FORMAT "]", str, value);
+ }
+
+ void G1GCPhaseTimes::print_stats(int level, const char* str, double value, uint workers) {
+@@ -450,7 +450,7 @@
+
+ if (phase->_thread_work_items != NULL) {
+ LineBuffer buf2(phase->_thread_work_items->_indent_level);
+- buf2.append_and_print_cr("[%s: "SIZE_FORMAT"]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id));
++ buf2.append_and_print_cr("[%s: " SIZE_FORMAT "]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id));
+ }
+ }
+
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp 2016-05-26 12:47:45.006381979 +0200
+@@ -84,18 +84,18 @@
+
+ if (type_str != NULL) {
+ if (top != NULL) {
+- gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT" "PTR_FORMAT,
++ gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) " PTR_FORMAT " " PTR_FORMAT,
+ action_str, type_str, bottom, top);
+ } else {
+- gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT,
++ gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) " PTR_FORMAT,
+ action_str, type_str, bottom);
+ }
+ } else {
+ if (top != NULL) {
+- gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT" "PTR_FORMAT,
++ gclog_or_tty->print_cr(G1HR_PREFIX" %s " PTR_FORMAT " " PTR_FORMAT,
+ action_str, bottom, top);
+ } else {
+- gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT,
++ gclog_or_tty->print_cr(G1HR_PREFIX" %s " PTR_FORMAT,
+ action_str, bottom);
+ }
+ }
+@@ -104,11 +104,11 @@
+ void G1HRPrinter::print(ActionType action, HeapWord* bottom, HeapWord* end) {
+ const char* action_str = action_name(action);
+
+- gclog_or_tty->print_cr(G1HR_PREFIX" %s ["PTR_FORMAT","PTR_FORMAT"]",
++ gclog_or_tty->print_cr(G1HR_PREFIX" %s [" PTR_FORMAT "," PTR_FORMAT "]",
+ action_str, bottom, end);
+ }
+
+ void G1HRPrinter::print(PhaseType phase, size_t phase_num) {
+ const char* phase_str = phase_name(phase);
+- gclog_or_tty->print_cr(G1HR_PREFIX" #%s "SIZE_FORMAT, phase_str, phase_num);
++ gclog_or_tty->print_cr(G1HR_PREFIX" #%s " SIZE_FORMAT, phase_str, phase_num);
+ }
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp 2016-05-26 10:28:29.947078914 +0200
+@@ -118,7 +118,7 @@
+ oop obj = oopDesc::load_decode_heap_oop(p);
+ if (_cm->verbose_high()) {
+ gclog_or_tty->print_cr("[%u] we're looking at location "
+- "*"PTR_FORMAT" = "PTR_FORMAT,
++ "*" PTR_FORMAT " = " PTR_FORMAT,
+ _task->worker_id(), p2i(p), p2i((void*) obj));
+ }
+ _task->deal_with_reference(obj);
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp 2016-05-26 12:29:29.638523189 +0200
+@@ -443,7 +443,7 @@
+ bool G1RemSet::refine_card(jbyte* card_ptr, uint worker_i,
+ bool check_for_refs_into_cset) {
+ assert(_g1->is_in_exact(_ct_bs->addr_for(card_ptr)),
+- err_msg("Card at "PTR_FORMAT" index "SIZE_FORMAT" representing heap at "PTR_FORMAT" (%u) must be in committed heap",
++ err_msg("Card at " PTR_FORMAT " index " SIZE_FORMAT " representing heap at " PTR_FORMAT " (%u) must be in committed heap",
+ p2i(card_ptr),
+ _ct_bs->index_for(_ct_bs->addr_for(card_ptr)),
+ _ct_bs->addr_for(card_ptr),
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp 2016-05-26 12:31:58.331247475 +0200
+@@ -187,22 +187,22 @@
+ size_t code_root_elems() const { return _code_root_elems; }
+
+ void print_rs_mem_info_on(outputStream * out, size_t total) {
+- out->print_cr(" "SIZE_FORMAT_W(8)"K (%5.1f%%) by "SIZE_FORMAT" %s regions",
++ out->print_cr(" " SIZE_FORMAT_W(8) "K (%5.1f%%) by " SIZE_FORMAT " %s regions",
+ round_to_K(rs_mem_size()), rs_mem_size_percent_of(total), amount(), _name);
+ }
+
+ void print_cards_occupied_info_on(outputStream * out, size_t total) {
+- out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) entries by "SIZE_FORMAT" %s regions",
++ out->print_cr(" " SIZE_FORMAT_W(8) " (%5.1f%%) entries by " SIZE_FORMAT " %s regions",
+ cards_occupied(), cards_occupied_percent_of(total), amount(), _name);
+ }
+
+ void print_code_root_mem_info_on(outputStream * out, size_t total) {
+- out->print_cr(" "SIZE_FORMAT_W(8)"K (%5.1f%%) by "SIZE_FORMAT" %s regions",
++ out->print_cr(" " SIZE_FORMAT_W(8) "K (%5.1f%%) by " SIZE_FORMAT " %s regions",
+ round_to_K(code_root_mem_size()), code_root_mem_size_percent_of(total), amount(), _name);
+ }
+
+ void print_code_root_elems_info_on(outputStream * out, size_t total) {
+- out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) elements by "SIZE_FORMAT" %s regions",
++ out->print_cr(" " SIZE_FORMAT_W(8) " (%5.1f%%) elements by " SIZE_FORMAT " %s regions",
+ code_root_elems(), code_root_elems_percent_of(total), amount(), _name);
+ }
+ };
+@@ -280,19 +280,19 @@
+ RegionTypeCounter* counters[] = { &_young, &_humonguous, &_free, &_old, NULL };
+
+ out->print_cr("\n Current rem set statistics");
+- out->print_cr(" Total per region rem sets sizes = "SIZE_FORMAT"K."
+- " Max = "SIZE_FORMAT"K.",
++ out->print_cr(" Total per region rem sets sizes = " SIZE_FORMAT "K."
++ " Max = " SIZE_FORMAT "K.",
+ round_to_K(total_rs_mem_sz()), round_to_K(max_rs_mem_sz()));
+ for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
+ (*current)->print_rs_mem_info_on(out, total_rs_mem_sz());
+ }
+
+- out->print_cr(" Static structures = "SIZE_FORMAT"K,"
+- " free_lists = "SIZE_FORMAT"K.",
++ out->print_cr(" Static structures = " SIZE_FORMAT "K,"
++ " free_lists = " SIZE_FORMAT "K.",
+ round_to_K(HeapRegionRemSet::static_mem_size()),
+ round_to_K(HeapRegionRemSet::fl_mem_size()));
+
+- out->print_cr(" "SIZE_FORMAT" occupied cards represented.",
++ out->print_cr(" " SIZE_FORMAT " occupied cards represented.",
+ total_cards_occupied());
+ for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
+ (*current)->print_cards_occupied_info_on(out, total_cards_occupied());
+@@ -300,30 +300,30 @@
+
+ // Largest sized rem set region statistics
+ HeapRegionRemSet* rem_set = max_rs_mem_sz_region()->rem_set();
+- out->print_cr(" Region with largest rem set = "HR_FORMAT", "
+- "size = "SIZE_FORMAT "K, occupied = "SIZE_FORMAT"K.",
++ out->print_cr(" Region with largest rem set = " HR_FORMAT ", "
++ "size = " SIZE_FORMAT "K, occupied = " SIZE_FORMAT "K.",
+ HR_FORMAT_PARAMS(max_rs_mem_sz_region()),
+ round_to_K(rem_set->mem_size()),
+ round_to_K(rem_set->occupied()));
+
+ // Strong code root statistics
+ HeapRegionRemSet* max_code_root_rem_set = max_code_root_mem_sz_region()->rem_set();
+- out->print_cr(" Total heap region code root sets sizes = "SIZE_FORMAT"K."
+- " Max = "SIZE_FORMAT"K.",
++ out->print_cr(" Total heap region code root sets sizes = " SIZE_FORMAT "K."
++ " Max = " SIZE_FORMAT "K.",
+ round_to_K(total_code_root_mem_sz()),
+ round_to_K(max_code_root_rem_set->strong_code_roots_mem_size()));
+ for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
+ (*current)->print_code_root_mem_info_on(out, total_code_root_mem_sz());
+ }
+
+- out->print_cr(" "SIZE_FORMAT" code roots represented.",
++ out->print_cr(" " SIZE_FORMAT " code roots represented.",
+ total_code_root_elems());
+ for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
+ (*current)->print_code_root_elems_info_on(out, total_code_root_elems());
+ }
+
+- out->print_cr(" Region with largest amount of code roots = "HR_FORMAT", "
+- "size = "SIZE_FORMAT "K, num_elems = "SIZE_FORMAT".",
++ out->print_cr(" Region with largest amount of code roots = " HR_FORMAT ", "
++ "size = " SIZE_FORMAT "K, num_elems = " SIZE_FORMAT ".",
+ HR_FORMAT_PARAMS(max_code_root_mem_sz_region()),
+ round_to_K(max_code_root_rem_set->strong_code_roots_mem_size()),
+ round_to_K(max_code_root_rem_set->strong_code_roots_list_length()));
+@@ -332,16 +332,16 @@
+
+ void G1RemSetSummary::print_on(outputStream* out) {
+ out->print_cr("\n Recent concurrent refinement statistics");
+- out->print_cr(" Processed "SIZE_FORMAT" cards",
++ out->print_cr(" Processed " SIZE_FORMAT " cards",
+ num_concurrent_refined_cards());
+- out->print_cr(" Of "SIZE_FORMAT" completed buffers:", num_processed_buf_total());
+- out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) by concurrent RS threads.",
++ out->print_cr(" Of " SIZE_FORMAT " completed buffers:", num_processed_buf_total());
++ out->print_cr(" " SIZE_FORMAT_W(8) " (%5.1f%%) by concurrent RS threads.",
+ num_processed_buf_total(),
+ percent_of(num_processed_buf_rs_threads(), num_processed_buf_total()));
+- out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) by mutator threads.",
++ out->print_cr(" " SIZE_FORMAT_W(8) " (%5.1f%%) by mutator threads.",
+ num_processed_buf_mutator(),
+ percent_of(num_processed_buf_mutator(), num_processed_buf_total()));
+- out->print_cr(" Did "SIZE_FORMAT" coarsenings.", num_coarsenings());
++ out->print_cr(" Did " SIZE_FORMAT " coarsenings.", num_coarsenings());
+ out->print_cr(" Concurrent RS threads times (s)");
+ out->print(" ");
+ for (uint i = 0; i < _num_vtimes; i++) {
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2016-05-26 12:32:32.962484479 +0200
+@@ -151,7 +151,7 @@
+ void G1StringDedupQueue::print_statistics(outputStream* st) {
+ st->print_cr(
+ " [Queue]\n"
+- " [Dropped: "UINTX_FORMAT"]", _queue->_dropped);
++ " [Dropped: " UINTX_FORMAT "]", _queue->_dropped);
+ }
+
+ void G1StringDedupQueue::verify() {
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp 2016-05-26 12:35:03.483167917 +0200
+@@ -80,8 +80,8 @@
+ st->stamp(PrintGCTimeStamps);
+ st->print_cr(
+ "[GC concurrent-string-deduplication, "
+- G1_STRDEDUP_BYTES_FORMAT_NS"->"G1_STRDEDUP_BYTES_FORMAT_NS"("G1_STRDEDUP_BYTES_FORMAT_NS"), avg "
+- G1_STRDEDUP_PERCENT_FORMAT_NS", "G1_STRDEDUP_TIME_FORMAT"]",
++ G1_STRDEDUP_BYTES_FORMAT_NS "->" G1_STRDEDUP_BYTES_FORMAT_NS "(" G1_STRDEDUP_BYTES_FORMAT_NS "), avg "
++ G1_STRDEDUP_PERCENT_FORMAT_NS ", " G1_STRDEDUP_TIME_FORMAT "]",
+ G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes),
+ G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes - last_stat._deduped_bytes),
+ G1_STRDEDUP_BYTES_PARAM(last_stat._deduped_bytes),
+@@ -135,22 +135,22 @@
+
+ if (total) {
+ st->print_cr(
+- " [Total Exec: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT", Idle: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT", Blocked: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT"]",
++ " [Total Exec: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT ", Idle: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT ", Blocked: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT "]",
+ stat._exec, stat._exec_elapsed, stat._idle, stat._idle_elapsed, stat._block, stat._block_elapsed);
+ } else {
+ st->print_cr(
+- " [Last Exec: "G1_STRDEDUP_TIME_FORMAT", Idle: "G1_STRDEDUP_TIME_FORMAT", Blocked: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT"]",
++ " [Last Exec: " G1_STRDEDUP_TIME_FORMAT ", Idle: " G1_STRDEDUP_TIME_FORMAT ", Blocked: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT "]",
+ stat._exec_elapsed, stat._idle_elapsed, stat._block, stat._block_elapsed);
+ }
+ st->print_cr(
+- " [Inspected: "G1_STRDEDUP_OBJECTS_FORMAT"]\n"
+- " [Skipped: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n"
+- " [Hashed: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n"
+- " [Known: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n"
+- " [New: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"]\n"
+- " [Deduplicated: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n"
+- " [Young: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n"
+- " [Old: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]",
++ " [Inspected: " G1_STRDEDUP_OBJECTS_FORMAT "]\n"
++ " [Skipped: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n"
++ " [Hashed: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n"
++ " [Known: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n"
++ " [New: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "]\n"
++ " [Deduplicated: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n"
++ " [Young: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n"
++ " [Old: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]",
+ stat._inspected,
+ stat._skipped, skipped_percent,
+ stat._hashed, hashed_percent,
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2016-05-26 12:36:33.497184339 +0200
+@@ -554,12 +554,12 @@
+ void G1StringDedupTable::print_statistics(outputStream* st) {
+ st->print_cr(
+ " [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"
+- " [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"]",
++ " [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"
++ " [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 "]",
+ G1_STRDEDUP_BYTES_PARAM(_table->_size * sizeof(G1StringDedupEntry*) + (_table->_entries + _entry_cache->size()) * sizeof(G1StringDedupEntry)),
+ _table->_size, _min_size, _max_size,
+ _table->_entries, (double)_table->_entries / (double)_table->_size * 100.0, _entry_cache->size(), _entries_added, _entries_removed,
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2016-05-26 12:53:29.330784386 +0200
+@@ -333,7 +333,7 @@
+ bool during_conc_mark,
+ size_t marked_bytes) {
+ assert(0 <= marked_bytes && marked_bytes <= used(),
+- err_msg("marked: "SIZE_FORMAT" used: "SIZE_FORMAT,
++ err_msg("marked: " SIZE_FORMAT " used: " SIZE_FORMAT,
+ marked_bytes, used()));
+ _prev_top_at_mark_start = top();
+ _prev_marked_bytes = marked_bytes;
+@@ -514,9 +514,9 @@
+ // Object is in the region. Check that its less than top
+ if (_hr->top() <= (HeapWord*)obj) {
+ // Object is above top
+- gclog_or_tty->print_cr("Object "PTR_FORMAT" in region "
+- "["PTR_FORMAT", "PTR_FORMAT") is above "
+- "top "PTR_FORMAT,
++ gclog_or_tty->print_cr("Object " PTR_FORMAT " in region "
++ "[" PTR_FORMAT ", " PTR_FORMAT ") is above "
++ "top " PTR_FORMAT,
+ (void *)obj, _hr->bottom(), _hr->end(), _hr->top());
+ _failures = true;
+ return;
+@@ -550,22 +550,22 @@
+ if (nm != NULL) {
+ // Verify that the nemthod is live
+ if (!nm->is_alive()) {
+- gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has dead nmethod "
+- PTR_FORMAT" in its strong code roots",
++ gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] has dead nmethod "
++ PTR_FORMAT " in its strong code roots",
+ _hr->bottom(), _hr->end(), nm);
+ _failures = true;
+ } else {
+ VerifyStrongCodeRootOopClosure oop_cl(_hr, nm);
+ nm->oops_do(&oop_cl);
+ if (!oop_cl.has_oops_in_region()) {
+- gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has nmethod "
+- PTR_FORMAT" in its strong code roots "
++ gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] has nmethod "
++ PTR_FORMAT " in its strong code roots "
+ "with no pointers into region",
+ _hr->bottom(), _hr->end(), nm);
+ _failures = true;
+ } else if (oop_cl.failures()) {
+- gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has other "
+- "failures for nmethod "PTR_FORMAT,
++ gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] has other "
++ "failures for nmethod " PTR_FORMAT,
+ _hr->bottom(), _hr->end(), nm);
+ _failures = true;
+ }
+@@ -599,8 +599,8 @@
+ // on its strong code root list
+ if (is_empty()) {
+ if (strong_code_roots_length > 0) {
+- gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is empty "
+- "but has "SIZE_FORMAT" code root entries",
++ gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] is empty "
++ "but has " SIZE_FORMAT " code root entries",
+ bottom(), end(), strong_code_roots_length);
+ *failures = true;
+ }
+@@ -609,8 +609,8 @@
+
+ if (continuesHumongous()) {
+ if (strong_code_roots_length > 0) {
+- gclog_or_tty->print_cr("region "HR_FORMAT" is a continuation of a humongous "
+- "region but has "SIZE_FORMAT" code root entries",
++ gclog_or_tty->print_cr("region " HR_FORMAT " is a continuation of a humongous "
++ "region but has " SIZE_FORMAT " code root entries",
+ HR_FORMAT_PARAMS(this), strong_code_roots_length);
+ *failures = true;
+ }
+@@ -634,7 +634,7 @@
+ else
+ st->print(" ");
+ st->print(" TS %5d", _gc_time_stamp);
+- st->print(" PTAMS "PTR_FORMAT" NTAMS "PTR_FORMAT,
++ st->print(" PTAMS " PTR_FORMAT " NTAMS " PTR_FORMAT,
+ prev_top_at_mark_start(), next_top_at_mark_start());
+ G1OffsetTableContigSpace::print_on(st);
+ }
+@@ -699,25 +699,25 @@
+ }
+ if (!_g1h->is_in_closed_subset(obj)) {
+ HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
+- gclog_or_tty->print_cr("Field "PTR_FORMAT
+- " of live obj "PTR_FORMAT" in region "
+- "["PTR_FORMAT", "PTR_FORMAT")",
++ gclog_or_tty->print_cr("Field " PTR_FORMAT
++ " of live obj " PTR_FORMAT " in region "
++ "[" PTR_FORMAT ", " PTR_FORMAT ")",
+ p, (void*) _containing_obj,
+ from->bottom(), from->end());
+ print_object(gclog_or_tty, _containing_obj);
+- gclog_or_tty->print_cr("points to obj "PTR_FORMAT" not in the heap",
++ gclog_or_tty->print_cr("points to obj " PTR_FORMAT " not in the heap",
+ (void*) obj);
+ } else {
+ HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
+ HeapRegion* to = _g1h->heap_region_containing((HeapWord*)obj);
+- gclog_or_tty->print_cr("Field "PTR_FORMAT
+- " of live obj "PTR_FORMAT" in region "
+- "["PTR_FORMAT", "PTR_FORMAT")",
++ gclog_or_tty->print_cr("Field " PTR_FORMAT
++ " of live obj " PTR_FORMAT " in region "
++ "[" PTR_FORMAT ", " PTR_FORMAT ")",
+ p, (void*) _containing_obj,
+ from->bottom(), from->end());
+ print_object(gclog_or_tty, _containing_obj);
+- gclog_or_tty->print_cr("points to dead obj "PTR_FORMAT" in region "
+- "["PTR_FORMAT", "PTR_FORMAT")",
++ gclog_or_tty->print_cr("points to dead obj " PTR_FORMAT " in region "
++ "[" PTR_FORMAT ", " PTR_FORMAT ")",
+ (void*) obj, to->bottom(), to->end());
+ print_object(gclog_or_tty, obj);
+ }
+@@ -753,14 +753,14 @@
+ gclog_or_tty->print_cr("----------");
+ }
+ gclog_or_tty->print_cr("Missing rem set entry:");
+- gclog_or_tty->print_cr("Field "PTR_FORMAT" "
+- "of obj "PTR_FORMAT", "
+- "in region "HR_FORMAT,
++ gclog_or_tty->print_cr("Field " PTR_FORMAT " "
++ "of obj " PTR_FORMAT ", "
++ "in region " HR_FORMAT,
+ p, (void*) _containing_obj,
+ HR_FORMAT_PARAMS(from));
+ _containing_obj->print_on(gclog_or_tty);
+- gclog_or_tty->print_cr("points to obj "PTR_FORMAT" "
+- "in region "HR_FORMAT,
++ gclog_or_tty->print_cr("points to obj " PTR_FORMAT " "
++ "in region " HR_FORMAT,
+ (void*) obj,
+ HR_FORMAT_PARAMS(to));
+ obj->print_on(gclog_or_tty);
+@@ -797,8 +797,8 @@
+
+ if (is_humongous != g1->isHumongous(obj_size) &&
+ !g1->is_obj_dead(obj, this)) { // Dead objects may have bigger block_size since they span several objects.
+- gclog_or_tty->print_cr("obj "PTR_FORMAT" is of %shumongous size ("
+- SIZE_FORMAT" words) in a %shumongous region",
++ gclog_or_tty->print_cr("obj " PTR_FORMAT " is of %shumongous size ("
++ SIZE_FORMAT " words) in a %shumongous region",
+ p, g1->isHumongous(obj_size) ? "" : "non-",
+ obj_size, is_humongous ? "" : "non-");
+ *failures = true;
+@@ -821,12 +821,12 @@
+ (vo == VerifyOption_G1UsePrevMarking &&
+ ClassLoaderDataGraph::unload_list_contains(klass));
+ if (!is_metaspace_object) {
+- gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" "
++ gclog_or_tty->print_cr("klass " PTR_FORMAT " of object " PTR_FORMAT " "
+ "not metadata", klass, (void *)obj);
+ *failures = true;
+ return;
+ } else if (!klass->is_klass()) {
+- gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" "
++ gclog_or_tty->print_cr("klass " PTR_FORMAT " of object " PTR_FORMAT " "
+ "not a klass", klass, (void *)obj);
+ *failures = true;
+ return;
+@@ -842,7 +842,7 @@
+ }
+ }
+ } else {
+- gclog_or_tty->print_cr(PTR_FORMAT" no an oop", (void *)obj);
++ gclog_or_tty->print_cr(PTR_FORMAT " no an oop", (void *)obj);
+ *failures = true;
+ return;
+ }
+@@ -852,8 +852,8 @@
+ }
+
+ if (p != top()) {
+- gclog_or_tty->print_cr("end of last object "PTR_FORMAT" "
+- "does not match top "PTR_FORMAT, p, top());
++ gclog_or_tty->print_cr("end of last object " PTR_FORMAT " "
++ "does not match top " PTR_FORMAT, p, top());
+ *failures = true;
+ return;
+ }
+@@ -868,8 +868,8 @@
+ HeapWord* addr_1 = p;
+ HeapWord* b_start_1 = _offsets.block_start_const(addr_1);
+ if (b_start_1 != p) {
+- gclog_or_tty->print_cr("BOT look up for top: "PTR_FORMAT" "
+- " yielded "PTR_FORMAT", expecting "PTR_FORMAT,
++ gclog_or_tty->print_cr("BOT look up for top: " PTR_FORMAT " "
++ " yielded " PTR_FORMAT ", expecting " PTR_FORMAT,
+ addr_1, b_start_1, p);
+ *failures = true;
+ return;
+@@ -880,8 +880,8 @@
+ if (addr_2 < the_end) {
+ HeapWord* b_start_2 = _offsets.block_start_const(addr_2);
+ if (b_start_2 != p) {
+- gclog_or_tty->print_cr("BOT look up for top + 1: "PTR_FORMAT" "
+- " yielded "PTR_FORMAT", expecting "PTR_FORMAT,
++ gclog_or_tty->print_cr("BOT look up for top + 1: " PTR_FORMAT " "
++ " yielded " PTR_FORMAT ", expecting " PTR_FORMAT,
+ addr_2, b_start_2, p);
+ *failures = true;
+ return;
+@@ -894,8 +894,8 @@
+ if (addr_3 < the_end) {
+ HeapWord* b_start_3 = _offsets.block_start_const(addr_3);
+ if (b_start_3 != p) {
+- gclog_or_tty->print_cr("BOT look up for top + diff: "PTR_FORMAT" "
+- " yielded "PTR_FORMAT", expecting "PTR_FORMAT,
++ gclog_or_tty->print_cr("BOT look up for top + diff: " PTR_FORMAT " "
++ " yielded " PTR_FORMAT ", expecting " PTR_FORMAT,
+ addr_3, b_start_3, p);
+ *failures = true;
+ return;
+@@ -906,8 +906,8 @@
+ HeapWord* addr_4 = the_end - 1;
+ HeapWord* b_start_4 = _offsets.block_start_const(addr_4);
+ if (b_start_4 != p) {
+- gclog_or_tty->print_cr("BOT look up for end - 1: "PTR_FORMAT" "
+- " yielded "PTR_FORMAT", expecting "PTR_FORMAT,
++ gclog_or_tty->print_cr("BOT look up for end - 1: " PTR_FORMAT " "
++ " yielded " PTR_FORMAT ", expecting " PTR_FORMAT,
+ addr_4, b_start_4, p);
+ *failures = true;
+ return;
+@@ -915,8 +915,8 @@
+ }
+
+ if (is_humongous && object_num > 1) {
+- gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is humongous "
+- "but has "SIZE_FORMAT", objects",
++ gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] is humongous "
++ "but has " SIZE_FORMAT ", objects",
+ bottom(), end(), object_num);
+ *failures = true;
+ return;
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp 2016-05-26 11:06:12.004686196 +0200
+@@ -52,7 +52,7 @@
+ class HeapRegionSetBase;
+ class nmethod;
+
+-#define HR_FORMAT "%u:(%s)["PTR_FORMAT","PTR_FORMAT","PTR_FORMAT"]"
++#define HR_FORMAT "%u:(%s)[" PTR_FORMAT "," PTR_FORMAT "," PTR_FORMAT "]"
+ #define HR_FORMAT_PARAMS(_hr_) \
+ (_hr_)->hrm_index(), \
+ (_hr_)->get_short_type_str(), \
+@@ -534,8 +534,8 @@
+ void set_containing_set(HeapRegionSetBase* containing_set) {
+ assert((containing_set == NULL && _containing_set != NULL) ||
+ (containing_set != NULL && _containing_set == NULL),
+- err_msg("containing_set: "PTR_FORMAT" "
+- "_containing_set: "PTR_FORMAT,
++ err_msg("containing_set: " PTR_FORMAT " "
++ "_containing_set: " PTR_FORMAT,
+ p2i(containing_set), p2i(_containing_set)));
+
+ _containing_set = containing_set;
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp 2016-05-26 11:07:06.895462623 +0200
+@@ -112,7 +112,7 @@
+
+ assert(ClassUnloadingWithConcurrentMark,
+ err_msg("All blocks should be objects if G1 Class Unloading isn't used. "
+- "HR: ["PTR_FORMAT", "PTR_FORMAT", "PTR_FORMAT") "
++ "HR: [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ") "
+ "addr: " PTR_FORMAT,
+ p2i(bottom()), p2i(top()), p2i(end()), p2i(addr)));
+
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp 2016-05-26 12:54:27.965488199 +0200
+@@ -432,7 +432,7 @@
+ HeapRegion* hr = _regions.get_by_index(i);
+ guarantee(hr != NULL, err_msg("invariant: i: %u", i));
+ guarantee(!prev_committed || hr->bottom() == prev_end,
+- err_msg("invariant i: %u "HR_FORMAT" prev_end: "PTR_FORMAT,
++ err_msg("invariant i: %u " HR_FORMAT " prev_end: " PTR_FORMAT,
+ i, HR_FORMAT_PARAMS(hr), p2i(prev_end)));
+ guarantee(hr->hrm_index() == i,
+ err_msg("invariant: i: %u hrm_index(): %u", i, hr->hrm_index()));
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp 2016-05-26 11:28:38.902931314 +0200
+@@ -31,9 +31,9 @@
+
+ inline HeapRegion* HeapRegionManager::addr_to_region(HeapWord* addr) const {
+ assert(addr < heap_end(),
+- err_msg("addr: "PTR_FORMAT" end: "PTR_FORMAT, p2i(addr), p2i(heap_end())));
++ err_msg("addr: " PTR_FORMAT " end: " PTR_FORMAT, p2i(addr), p2i(heap_end())));
+ assert(addr >= heap_bottom(),
+- err_msg("addr: "PTR_FORMAT" bottom: "PTR_FORMAT, p2i(addr), p2i(heap_bottom())));
++ err_msg("addr: " PTR_FORMAT " bottom: " PTR_FORMAT, p2i(addr), p2i(heap_bottom())));
+
+ HeapRegion* hr = _regions.get_by_address(addr);
+ return hr;
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2016-05-26 12:56:34.138698971 +0200
+@@ -377,7 +377,7 @@
+
+ void FromCardCache::invalidate(uint start_idx, size_t new_num_regions) {
+ guarantee((size_t)start_idx + new_num_regions <= max_uintx,
+- err_msg("Trying to invalidate beyond maximum region, from %u size "SIZE_FORMAT,
++ err_msg("Trying to invalidate beyond maximum region, from %u size " SIZE_FORMAT,
+ start_idx, new_num_regions));
+ for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) {
+ uint end_idx = (start_idx + (uint)new_num_regions);
+@@ -392,7 +392,7 @@
+ void FromCardCache::print(outputStream* out) {
+ for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) {
+ for (uint j = 0; j < _max_regions; j++) {
+- out->print_cr("_from_card_cache["UINT32_FORMAT"]["UINT32_FORMAT"] = "INT32_FORMAT".",
++ out->print_cr("_from_card_cache[" UINT32_FORMAT "][" UINT32_FORMAT "] = " INT32_FORMAT ".",
+ i, j, at(i, j));
+ }
+ }
+@@ -432,7 +432,7 @@
+ int from_card = (int)(uintptr_t(from) >> CardTableModRefBS::card_shift);
+
+ if (G1TraceHeapRegionRememberedSet) {
+- gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = "INT32_FORMAT")",
++ gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = " INT32_FORMAT ")",
+ hr()->bottom(), from_card,
+ FromCardCache::at((uint)tid, cur_hrm_ind));
+ }
+@@ -637,13 +637,13 @@
+
+ assert(_coarse_map.size() == region_bm->size(), "Precondition");
+ if (G1RSScrubVerbose) {
+- gclog_or_tty->print(" Coarse map: before = "SIZE_FORMAT"...",
++ gclog_or_tty->print(" Coarse map: before = " SIZE_FORMAT "...",
+ _n_coarse_entries);
+ }
+ _coarse_map.set_intersection(*region_bm);
+ _n_coarse_entries = _coarse_map.count_one_bits();
+ if (G1RSScrubVerbose) {
+- gclog_or_tty->print_cr(" after = "SIZE_FORMAT".", _n_coarse_entries);
++ gclog_or_tty->print_cr(" after = " SIZE_FORMAT ".", _n_coarse_entries);
+ }
+
+ // Now do the fine-grained maps.
+@@ -1039,7 +1039,7 @@
+
+ card_index = _cur_region_card_offset + _cur_card_in_prt;
+ guarantee(_cur_card_in_prt < HeapRegion::CardsPerRegion,
+- err_msg("Card index "SIZE_FORMAT" must be within the region", _cur_card_in_prt));
++ err_msg("Card index " SIZE_FORMAT " must be within the region", _cur_card_in_prt));
+ return true;
+ }
+
+@@ -1208,8 +1208,8 @@
+
+ size_t min_prt_size = sizeof(void*) + dummy->bm()->size_in_words() * HeapWordSize;
+ assert(dummy->mem_size() > min_prt_size,
+- err_msg("PerRegionTable memory usage is suspiciously small, only has "SIZE_FORMAT" bytes. "
+- "Should be at least "SIZE_FORMAT" bytes.", dummy->mem_size(), min_prt_size));
++ err_msg("PerRegionTable memory usage is suspiciously small, only has " SIZE_FORMAT " bytes. "
++ "Should be at least " SIZE_FORMAT " bytes.", dummy->mem_size(), min_prt_size));
+ free(dummy);
+ guarantee(dummy->mem_size() == fl_mem_size(), "fl_mem_size() does not return the correct element size");
+ // try to reset the state
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp 2016-05-26 12:58:02.492745763 +0200
+@@ -32,7 +32,7 @@
+ uint FreeRegionList::_unrealistically_long_length = 0;
+
+ void HeapRegionSetBase::fill_in_ext_msg(hrs_ext_msg* msg, const char* message) {
+- msg->append("[%s] %s ln: %u cy: "SIZE_FORMAT,
++ msg->append("[%s] %s ln: %u cy: " SIZE_FORMAT,
+ name(), message, length(), total_capacity_bytes());
+ fill_in_ext_msg_extra(msg);
+ }
+@@ -84,13 +84,13 @@
+
+ void HeapRegionSetBase::print_on(outputStream* out, bool print_contents) {
+ out->cr();
+- out->print_cr("Set: %s ("PTR_FORMAT")", name(), this);
++ out->print_cr("Set: %s (" PTR_FORMAT ")", name(), this);
+ out->print_cr(" Region Assumptions");
+ out->print_cr(" humongous : %s", BOOL_TO_STR(regions_humongous()));
+ out->print_cr(" free : %s", BOOL_TO_STR(regions_free()));
+ out->print_cr(" Attributes");
+ out->print_cr(" length : %14u", length());
+- out->print_cr(" total capacity : "SIZE_FORMAT_W(14)" bytes",
++ out->print_cr(" total capacity : " SIZE_FORMAT_W(14) " bytes",
+ total_capacity_bytes());
+ }
+
+@@ -106,7 +106,7 @@
+ }
+
+ void FreeRegionList::fill_in_ext_msg_extra(hrs_ext_msg* msg) {
+- msg->append(" hd: "PTR_FORMAT" tl: "PTR_FORMAT, _head, _tail);
++ msg->append(" hd: " PTR_FORMAT " tl: " PTR_FORMAT, _head, _tail);
+ }
+
+ void FreeRegionList::remove_all() {
+@@ -277,8 +277,8 @@
+ void FreeRegionList::print_on(outputStream* out, bool print_contents) {
+ HeapRegionSetBase::print_on(out, print_contents);
+ out->print_cr(" Linking");
+- out->print_cr(" head : "PTR_FORMAT, _head);
+- out->print_cr(" tail : "PTR_FORMAT, _tail);
++ out->print_cr(" head : " PTR_FORMAT, _head);
++ out->print_cr(" tail : " PTR_FORMAT, _tail);
+
+ if (print_contents) {
+ out->print_cr(" Contents");
+@@ -306,7 +306,7 @@
+
+ count++;
+ guarantee(count < _unrealistically_long_length,
+- hrs_err_msg("[%s] the calculated length: %u seems very long, is there maybe a cycle? curr: "PTR_FORMAT" prev0: "PTR_FORMAT" " "prev1: "PTR_FORMAT" length: %u", name(), count, curr, prev0, prev1, length()));
++ hrs_err_msg("[%s] the calculated length: %u seems very long, is there maybe a cycle? curr: " PTR_FORMAT " prev0: " PTR_FORMAT " " "prev1: " PTR_FORMAT " length: %u", name(), count, curr, prev0, prev1, length()));
+
+ if (curr->next() != NULL) {
+ guarantee(curr->next()->prev() == curr, "Next or prev pointers messed up");
+--- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 2016-05-26 13:04:12.804559217 +0200
+@@ -668,7 +668,7 @@
+ jlong ret_val = now - _time_of_last_gc;
+ // XXX See note in genCollectedHeap::millis_since_last_gc().
+ if (ret_val < 0) {
+- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);)
++ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);)
+ return 0;
+ }
+ return ret_val;
+--- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2016-05-26 13:05:21.415042398 +0200
+@@ -3307,7 +3307,7 @@
+ jlong ret_val = now - _time_of_last_gc;
+ // XXX See note in genCollectedHeap::millis_since_last_gc().
+ if (ret_val < 0) {
+- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);)
++ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);)
+ return 0;
+ }
+ return ret_val;
+--- openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2016-05-26 12:59:21.407001218 +0200
+@@ -86,7 +86,7 @@
+ while (words_left_to_fill > 0) {
+ size_t words_to_fill = MIN2(words_left_to_fill, CollectedHeap::filler_array_max_size());
+ assert(words_to_fill >= CollectedHeap::min_fill_size(),
+- err_msg("Remaining size ("SIZE_FORMAT ") is too small to fill (based on " SIZE_FORMAT " and " SIZE_FORMAT ")",
++ err_msg("Remaining size (" SIZE_FORMAT ") is too small to fill (based on " SIZE_FORMAT " and " SIZE_FORMAT ")",
+ words_to_fill, words_left_to_fill, CollectedHeap::filler_array_max_size()));
+ CollectedHeap::fill_with_object((HeapWord*)cur_top, words_to_fill);
+ if (!os::numa_has_static_binding()) {
+--- openjdk/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp 2016-05-26 13:02:08.355310474 +0200
+@@ -98,10 +98,10 @@
+ if (_allocated == 0) {
+ assert(_unused == 0,
+ err_msg("Inconsistency in PLAB stats: "
+- "_allocated: "SIZE_FORMAT", "
+- "_wasted: "SIZE_FORMAT", "
+- "_unused: "SIZE_FORMAT", "
+- "_used : "SIZE_FORMAT,
++ "_allocated: " SIZE_FORMAT ", "
++ "_wasted: " SIZE_FORMAT ", "
++ "_unused: " SIZE_FORMAT ", "
++ "_used : " SIZE_FORMAT,
+ _allocated, _wasted, _unused, _used));
+
+ _allocated = 1;
+--- openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2016-05-26 10:59:28.465678473 +0200
+@@ -158,8 +158,8 @@
+ // Mapping from address to card marking array entry
+ jbyte* byte_for(const void* p) const {
+ assert(_whole_heap.contains(p),
+- err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of "
+- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
++ err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of "
++ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
+ p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
+ jbyte* result = &byte_map_base[uintptr_t(p) >> card_shift];
+ assert(result >= _byte_map && result < _byte_map + _byte_map_size,
+@@ -436,8 +436,8 @@
+ size_t delta = pointer_delta(p, byte_map_base, sizeof(jbyte));
+ HeapWord* result = (HeapWord*) (delta << card_shift);
+ assert(_whole_heap.contains(result),
+- err_msg("Returning result = "PTR_FORMAT" out of bounds of "
+- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
++ err_msg("Returning result = " PTR_FORMAT " out of bounds of "
++ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
+ p2i(result), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
+ return result;
+ }
+@@ -445,8 +445,8 @@
+ // Mapping from address to card marking array index.
+ size_t index_for(void* p) {
+ assert(_whole_heap.contains(p),
+- err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of "
+- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
++ err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of "
++ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
+ p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
+ return byte_for(p) - _byte_map;
+ }
+--- openjdk/hotspot/src/share/vm/memory/genCollectedHeap.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/memory/genCollectedHeap.cpp 2016-05-26 12:37:30.739922837 +0200
+@@ -1403,7 +1403,7 @@
+ // back a time later than 'now'.
+ jlong retVal = now - tolgc_cl.time();
+ if (retVal < 0) {
+- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, (int64_t) retVal);)
++ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, (int64_t) retVal);)
+ return 0;
+ }
+ return retVal;
+--- openjdk/hotspot/src/share/vm/memory/generation.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/memory/generation.cpp 2016-05-26 12:48:26.325470906 +0200
+@@ -193,7 +193,7 @@
+ bool res = (available >= max_promotion_in_bytes);
+ if (PrintGC && Verbose) {
+ gclog_or_tty->print_cr(
+- "Generation: promo attempt is%s safe: available("SIZE_FORMAT") %s max_promo("SIZE_FORMAT")",
++ "Generation: promo attempt is%s safe: available(" SIZE_FORMAT ") %s max_promo(" SIZE_FORMAT ")",
+ res? "":" not", available, res? ">=":"<",
+ max_promotion_in_bytes);
+ }
+--- openjdk/hotspot/src/share/vm/memory/generation.hpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/memory/generation.hpp 2016-05-26 10:57:11.760723475 +0200
+@@ -422,7 +422,7 @@
+ // have to guard against non-monotonicity.
+ NOT_PRODUCT(
+ if (now < _time_of_last_gc) {
+- warning("time warp: "INT64_FORMAT" to "INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now);
++ warning("time warp: " INT64_FORMAT " to " INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now);
+ }
+ )
+ return _time_of_last_gc;
+--- openjdk/hotspot/src/share/vm/memory/referenceProcessor.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/memory/referenceProcessor.cpp 2016-05-26 13:05:59.246206036 +0200
+@@ -161,7 +161,7 @@
+
+ NOT_PRODUCT(
+ if (now < _soft_ref_timestamp_clock) {
+- warning("time warp: "INT64_FORMAT" to "INT64_FORMAT,
++ warning("time warp: " INT64_FORMAT " to " INT64_FORMAT,
+ _soft_ref_timestamp_clock, now);
+ }
+ )
+--- openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2016-05-26 13:08:41.746613475 +0200
+@@ -306,8 +306,8 @@
+ bool res = (available >= av_promo) || (available >= max_promotion_in_bytes);
+ if (PrintGC && Verbose) {
+ gclog_or_tty->print_cr(
+- "Tenured: promo attempt is%s safe: available("SIZE_FORMAT") %s av_promo("SIZE_FORMAT"),"
+- "max_promo("SIZE_FORMAT")",
++ "Tenured: promo attempt is%s safe: available(" SIZE_FORMAT ") %s av_promo(" SIZE_FORMAT "),"
++ "max_promo(" SIZE_FORMAT ")",
+ res? "":" not", available, res? ">=":"<",
+ av_promo, max_promotion_in_bytes);
+ }
+--- openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp 2016-05-26 10:58:22.423149606 +0200
+@@ -94,10 +94,10 @@
+
+ if (PrintTLAB && Verbose) {
+ Thread* thrd = myThread();
+- gclog_or_tty->print("TLAB: %s thread: "INTPTR_FORMAT" [id: %2d]"
+- " obj: "SIZE_FORMAT
+- " free: "SIZE_FORMAT
+- " waste: "SIZE_FORMAT"\n",
++ gclog_or_tty->print("TLAB: %s thread: " INTPTR_FORMAT " [id: %2d]"
++ " obj: " SIZE_FORMAT
++ " free: " SIZE_FORMAT
++ " waste: " SIZE_FORMAT "\n",
+ "slow", p2i(thrd), thrd->osthread()->thread_id(),
+ obj_size, free(), refill_waste_limit());
+ }
+--- openjdk/hotspot/src/share/vm/memory/universe.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/memory/universe.cpp 2016-05-26 10:52:15.903311125 +0200
+@@ -863,7 +863,7 @@
+ Universe::set_narrow_oop_use_implicit_null_checks(false);
+ #endif
+ if (verbose) {
+- tty->print(", %s: "PTR_FORMAT,
++ tty->print(", %s: " PTR_FORMAT,
+ narrow_oop_mode_to_string(HeapBasedNarrowOop),
+ Universe::narrow_oop_base());
+ }
+@@ -919,7 +919,7 @@
+ // Reserve the Java heap, which is now the same for all GCs.
+ ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) {
+ assert(alignment <= Arguments::conservative_max_heap_alignment(),
+- err_msg("actual alignment "SIZE_FORMAT" must be within maximum heap alignment "SIZE_FORMAT,
++ err_msg("actual alignment " SIZE_FORMAT " must be within maximum heap alignment " SIZE_FORMAT,
+ alignment, Arguments::conservative_max_heap_alignment()));
+ size_t total_reserved = align_size_up(heap_size, alignment);
+ assert(!UseCompressedOops || (total_reserved <= (OopEncodingHeapMax - os::vm_page_size())),
+--- openjdk/hotspot/src/share/vm/oops/constantPool.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/oops/constantPool.cpp 2016-05-26 11:56:40.741857589 +0200
+@@ -1494,7 +1494,7 @@
+ }
+ case JVM_CONSTANT_Long: {
+ u8 val = Bytes::get_Java_u8(bytes);
+- printf("long "INT64_FORMAT, (int64_t) *(jlong *) &val);
++ printf("long " INT64_FORMAT, (int64_t) *(jlong *) &val);
+ ent_size = 8;
+ idx++; // Long takes two cpool slots
+ break;
+--- openjdk/hotspot/src/share/vm/oops/cpCache.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/oops/cpCache.cpp 2016-05-26 12:09:06.825449649 +0200
+@@ -305,7 +305,7 @@
+ adapter->size_of_parameters());
+
+ if (TraceInvokeDynamic) {
+- tty->print_cr("set_method_handle bc=%d appendix="PTR_FORMAT"%s method_type="PTR_FORMAT"%s method="PTR_FORMAT" ",
++ tty->print_cr("set_method_handle bc=%d appendix=" PTR_FORMAT "%s method_type=" PTR_FORMAT "%s method=" PTR_FORMAT " ",
+ invoke_code,
+ (void *)appendix(), (has_appendix ? "" : " (unused)"),
+ (void *)method_type(), (has_method_type ? "" : " (unused)"),
+@@ -536,12 +536,12 @@
+ // print separator
+ if (index == 0) st->print_cr(" -------------");
+ // print entry
+- st->print("%3d ("PTR_FORMAT") ", index, (intptr_t)this);
++ st->print("%3d (" PTR_FORMAT ") ", index, (intptr_t)this);
+ st->print_cr("[%02x|%02x|%5d]", bytecode_2(), bytecode_1(),
+ constant_pool_index());
+- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f1);
+- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f2);
+- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_flags);
++ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f1);
++ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f2);
++ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_flags);
+ st->print_cr(" -------------");
+ }
+
+--- openjdk/hotspot/src/share/vm/oops/cpCache.hpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/oops/cpCache.hpp 2016-05-26 10:02:53.553645325 +0200
+@@ -192,7 +192,7 @@
+ field_index_mask = right_n_bits(field_index_bits),
+ parameter_size_bits = 8, // subset of field_index_mask, range is 0..255
+ parameter_size_mask = right_n_bits(parameter_size_bits),
+- option_bits_mask = ~(((-1) << tos_state_shift) | (field_index_mask | parameter_size_mask))
++ option_bits_mask = (int)(~(((unsigned)(-1) << tos_state_shift) | (field_index_mask | parameter_size_mask)))
+ };
+
+ // specific bit definitions for the indices field:
+--- openjdk/hotspot/src/share/vm/oops/markOop.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/oops/markOop.cpp 2016-05-26 12:58:48.551727547 +0200
+@@ -49,7 +49,7 @@
+ st->print("monitor=NULL");
+ else {
+ BasicLock * bl = (BasicLock *) mon->owner();
+- st->print("monitor={count="INTPTR_FORMAT",waiters="INTPTR_FORMAT",recursions="INTPTR_FORMAT",owner="INTPTR_FORMAT"}",
++ st->print("monitor={count=" INTPTR_FORMAT ",waiters=" INTPTR_FORMAT ",recursions=" INTPTR_FORMAT ",owner=" INTPTR_FORMAT "}",
+ mon->count(), mon->waiters(), mon->recursions(), p2i(bl));
+ }
+ } else {
+--- openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp 2016-05-26 13:01:09.576609909 +0200
+@@ -657,7 +657,7 @@
+ if (i > max_objArray_print_length) {
+ st->print("..."); break;
+ }
+- st->print(" "INTPTR_FORMAT, (intptr_t)(void*)objArrayOop(obj)->obj_at(i));
++ st->print(" " INTPTR_FORMAT, (intptr_t)(void*)objArrayOop(obj)->obj_at(i));
+ }
+ st->print(" }");
+ }
+--- openjdk/hotspot/src/share/vm/oops/oop.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/oops/oop.cpp 2016-05-26 13:01:34.580057152 +0200
+@@ -46,7 +46,7 @@
+
+ void oopDesc::print_address_on(outputStream* st) const {
+ if (PrintOopAddress) {
+- st->print("{"INTPTR_FORMAT"}", this);
++ st->print("{" INTPTR_FORMAT "}", this);
+ }
+ }
+
+--- openjdk/hotspot/src/share/vm/opto/node.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/opto/node.cpp 2016-05-26 23:23:12.204803196 +0200
+@@ -325,6 +325,9 @@
+ // Create a Node, with a given number of required edges.
+ Node::Node(uint req)
+ : _idx(IDX_INIT(req))
++#ifdef ASSERT
++ , _parse_idx(_idx)
++#endif
+ {
+ assert( req < Compile::current()->max_node_limit() - NodeLimitFudgeFactor, "Input limit exceeded" );
+ debug_only( verify_construction() );
+--- openjdk/hotspot/src/share/vm/prims/methodHandles.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/prims/methodHandles.cpp 2016-05-26 17:41:49.547683485 +0200
+@@ -1321,27 +1321,27 @@
+
+ // These are the native methods on java.lang.invoke.MethodHandleNatives.
+ static JNINativeMethod MHN_methods[] = {
+- {CC"init", CC"("MEM""OBJ")V", FN_PTR(MHN_init_Mem)},
+- {CC"expand", CC"("MEM")V", FN_PTR(MHN_expand_Mem)},
+- {CC"resolve", CC"("MEM""CLS")"MEM, FN_PTR(MHN_resolve_Mem)},
++ {CC"init", CC"(" MEM"" OBJ")V", FN_PTR(MHN_init_Mem)},
++ {CC"expand", CC"(" MEM")V", FN_PTR(MHN_expand_Mem)},
++ {CC"resolve", CC"(" MEM"" CLS")" MEM, FN_PTR(MHN_resolve_Mem)},
+ {CC"getConstant", CC"(I)I", FN_PTR(MHN_getConstant)},
+ // static native int getNamedCon(int which, Object[] name)
+- {CC"getNamedCon", CC"(I["OBJ")I", FN_PTR(MHN_getNamedCon)},
++ {CC"getNamedCon", CC"(I[" OBJ")I", FN_PTR(MHN_getNamedCon)},
+ // static native int getMembers(Class defc, String matchName, String matchSig,
+ // int matchFlags, Class caller, int skip, MemberName[] results);
+- {CC"getMembers", CC"("CLS""STRG""STRG"I"CLS"I["MEM")I", FN_PTR(MHN_getMembers)},
+- {CC"objectFieldOffset", CC"("MEM")J", FN_PTR(MHN_objectFieldOffset)},
+- {CC"setCallSiteTargetNormal", CC"("CS""MH")V", FN_PTR(MHN_setCallSiteTargetNormal)},
+- {CC"setCallSiteTargetVolatile", CC"("CS""MH")V", FN_PTR(MHN_setCallSiteTargetVolatile)},
+- {CC"staticFieldOffset", CC"("MEM")J", FN_PTR(MHN_staticFieldOffset)},
+- {CC"staticFieldBase", CC"("MEM")"OBJ, FN_PTR(MHN_staticFieldBase)},
+- {CC"getMemberVMInfo", CC"("MEM")"OBJ, FN_PTR(MHN_getMemberVMInfo)}
++ {CC"getMembers", CC"(" CLS"" STRG"" STRG"I" CLS"I[" MEM")I", FN_PTR(MHN_getMembers)},
++ {CC"objectFieldOffset", CC"(" MEM")J", FN_PTR(MHN_objectFieldOffset)},
++ {CC"setCallSiteTargetNormal", CC"(" CS"" MH")V", FN_PTR(MHN_setCallSiteTargetNormal)},
++ {CC"setCallSiteTargetVolatile", CC"(" CS"" MH")V", FN_PTR(MHN_setCallSiteTargetVolatile)},
++ {CC"staticFieldOffset", CC"(" MEM")J", FN_PTR(MHN_staticFieldOffset)},
++ {CC"staticFieldBase", CC"(" MEM")" OBJ, FN_PTR(MHN_staticFieldBase)},
++ {CC"getMemberVMInfo", CC"(" MEM")" OBJ, FN_PTR(MHN_getMemberVMInfo)}
+ };
+
+ static JNINativeMethod MH_methods[] = {
+ // UnsupportedOperationException throwers
+- {CC"invoke", CC"(["OBJ")"OBJ, FN_PTR(MH_invoke_UOE)},
+- {CC"invokeExact", CC"(["OBJ")"OBJ, FN_PTR(MH_invokeExact_UOE)}
++ {CC"invoke", CC"([" OBJ")" OBJ, FN_PTR(MH_invoke_UOE)},
++ {CC"invokeExact", CC"([" OBJ")" OBJ, FN_PTR(MH_invokeExact_UOE)}
+ };
+
+ /**
+--- openjdk/hotspot/src/share/vm/prims/perf.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/prims/perf.cpp 2016-05-26 17:43:23.553584000 +0200
+@@ -290,13 +290,13 @@
+ #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f)
+ #define BB "Ljava/nio/ByteBuffer;"
+ #define JLS "Ljava/lang/String;"
+-#define CL_ARGS CC"("JLS"IIJ)"BB
+-#define CBA_ARGS CC"("JLS"II[BI)"BB
++#define CL_ARGS CC"(" JLS"IIJ)" BB
++#define CBA_ARGS CC"(" JLS"II[BI)" BB
+
+ static JNINativeMethod perfmethods[] = {
+
+- {CC"attach", CC"("JLS"II)"BB, FN_PTR(Perf_Attach)},
+- {CC"detach", CC"("BB")V", FN_PTR(Perf_Detach)},
++ {CC"attach", CC"(" JLS"II)" BB, FN_PTR(Perf_Attach)},
++ {CC"detach", CC"(" BB")V", FN_PTR(Perf_Detach)},
+ {CC"createLong", CL_ARGS, FN_PTR(Perf_CreateLong)},
+ {CC"createByteArray", CBA_ARGS, FN_PTR(Perf_CreateByteArray)},
+ {CC"highResCounter", CC"()J", FN_PTR(Perf_HighResCounter)},
+--- openjdk/hotspot/src/share/vm/prims/unsafe.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/prims/unsafe.cpp 2016-05-26 22:52:04.455104439 +0200
+@@ -1009,7 +1009,7 @@
+ UNSAFE_END
+
+
+-#define DAC_Args CLS"[B["OBJ
++#define DAC_Args CLS"[B[" OBJ
+ // define a class but do not make it known to the class loader or system dictionary
+ // - host_class: supplies context for linkage, access control, protection domain, and class loader
+ // - data: bytes of a class file, a raw memory address (length gives the number of bytes)
+@@ -1374,47 +1374,47 @@
+
+ #define LANG "Ljava/lang/"
+
+-#define OBJ LANG"Object;"
+-#define CLS LANG"Class;"
+-#define CTR LANG"reflect/Constructor;"
+-#define FLD LANG"reflect/Field;"
+-#define MTH LANG"reflect/Method;"
+-#define THR LANG"Throwable;"
++#define OBJ LANG "Object;"
++#define CLS LANG "Class;"
++#define CTR LANG "reflect/Constructor;"
++#define FLD LANG "reflect/Field;"
++#define MTH LANG "reflect/Method;"
++#define THR LANG "Throwable;"
+
+-#define DC0_Args LANG"String;[BII"
+-#define DC_Args DC0_Args LANG"ClassLoader;" "Ljava/security/ProtectionDomain;"
++#define DC0_Args LANG "String;[BII"
++#define DC_Args DC0_Args LANG "ClassLoader;" "Ljava/security/ProtectionDomain;"
+
+ #define CC (char*) /*cast a literal from (const char*)*/
+ #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f)
+
+ // define deprecated accessors for compabitility with 1.4.0
+ #define DECLARE_GETSETOOP_140(Boolean, Z) \
+- {CC"get"#Boolean, CC"("OBJ"I)"#Z, FN_PTR(Unsafe_Get##Boolean##140)}, \
+- {CC"put"#Boolean, CC"("OBJ"I"#Z")V", FN_PTR(Unsafe_Set##Boolean##140)}
++ {CC"get"#Boolean, CC"(" OBJ"I)"#Z, FN_PTR(Unsafe_Get##Boolean##140)}, \
++ {CC"put"#Boolean, CC"(" OBJ"I"#Z")V", FN_PTR(Unsafe_Set##Boolean##140)}
+
+ // Note: In 1.4.1, getObject and kin take both int and long offsets.
+ #define DECLARE_GETSETOOP_141(Boolean, Z) \
+- {CC"get"#Boolean, CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \
+- {CC"put"#Boolean, CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean)}
++ {CC"get"#Boolean, CC"(" OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \
++ {CC"put"#Boolean, CC"(" OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean)}
+
+ // Note: In 1.5.0, there are volatile versions too
+ #define DECLARE_GETSETOOP(Boolean, Z) \
+- {CC"get"#Boolean, CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \
+- {CC"put"#Boolean, CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean)}, \
+- {CC"get"#Boolean"Volatile", CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean##Volatile)}, \
+- {CC"put"#Boolean"Volatile", CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean##Volatile)}
++ {CC"get"#Boolean, CC"(" OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \
++ {CC"put"#Boolean, CC"(" OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean)}, \
++ {CC"get"#Boolean"Volatile", CC"(" OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean##Volatile)}, \
++ {CC"put"#Boolean"Volatile", CC"(" OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean##Volatile)}
+
+
+ #define DECLARE_GETSETNATIVE(Byte, B) \
+- {CC"get"#Byte, CC"("ADR")"#B, FN_PTR(Unsafe_GetNative##Byte)}, \
+- {CC"put"#Byte, CC"("ADR#B")V", FN_PTR(Unsafe_SetNative##Byte)}
++ {CC"get"#Byte, CC"(" ADR")"#B, FN_PTR(Unsafe_GetNative##Byte)}, \
++ {CC"put"#Byte, CC"(" ADR#B")V", FN_PTR(Unsafe_SetNative##Byte)}
+
+
+
+ // These are the methods for 1.4.0
+ static JNINativeMethod methods_140[] = {
+- {CC"getObject", CC"("OBJ"I)"OBJ"", FN_PTR(Unsafe_GetObject140)},
+- {CC"putObject", CC"("OBJ"I"OBJ")V", FN_PTR(Unsafe_SetObject140)},
++ {CC"getObject", CC"(" OBJ"I)" OBJ"", FN_PTR(Unsafe_GetObject140)},
++ {CC"putObject", CC"(" OBJ"I" OBJ")V", FN_PTR(Unsafe_SetObject140)},
+
+ DECLARE_GETSETOOP_140(Boolean, Z),
+ DECLARE_GETSETOOP_140(Byte, B),
+@@ -1433,33 +1433,33 @@
+ DECLARE_GETSETNATIVE(Float, F),
+ DECLARE_GETSETNATIVE(Double, D),
+
+- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)},
+- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
++ {CC"getAddress", CC"(" ADR")" ADR, FN_PTR(Unsafe_GetNativeAddress)},
++ {CC"putAddress", CC"(" ADR"" ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
+
+- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
+- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
+- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
+-
+- {CC"fieldOffset", CC"("FLD")I", FN_PTR(Unsafe_FieldOffset)},
+- {CC"staticFieldBase", CC"("CLS")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)},
+- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
+- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
+- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
++ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
++ {CC"reallocateMemory", CC"(" ADR"J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
++ {CC"freeMemory", CC"(" ADR")V", FN_PTR(Unsafe_FreeMemory)},
++
++ {CC"fieldOffset", CC"(" FLD")I", FN_PTR(Unsafe_FieldOffset)},
++ {CC"staticFieldBase", CC"(" CLS")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)},
++ {CC"ensureClassInitialized",CC"(" CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
++ {CC"arrayBaseOffset", CC"(" CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
++ {CC"arrayIndexScale", CC"(" CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
+ {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)},
+ {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)},
+
+- {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)},
+- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)},
+- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)},
+- {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
+- {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)},
+- {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)}
++ {CC"defineClass", CC"(" DC0_Args")" CLS, FN_PTR(Unsafe_DefineClass0)},
++ {CC"defineClass", CC"(" DC_Args")" CLS, FN_PTR(Unsafe_DefineClass)},
++ {CC"allocateInstance", CC"(" CLS")" OBJ, FN_PTR(Unsafe_AllocateInstance)},
++ {CC"monitorEnter", CC"(" OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
++ {CC"monitorExit", CC"(" OBJ")V", FN_PTR(Unsafe_MonitorExit)},
++ {CC"throwException", CC"(" THR")V", FN_PTR(Unsafe_ThrowException)}
+ };
+
+ // These are the methods prior to the JSR 166 changes in 1.5.0
+ static JNINativeMethod methods_141[] = {
+- {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)},
+- {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)},
++ {CC"getObject", CC"(" OBJ"J)" OBJ"", FN_PTR(Unsafe_GetObject)},
++ {CC"putObject", CC"(" OBJ"J" OBJ")V", FN_PTR(Unsafe_SetObject)},
+
+ DECLARE_GETSETOOP_141(Boolean, Z),
+ DECLARE_GETSETOOP_141(Byte, B),
+@@ -1478,37 +1478,37 @@
+ DECLARE_GETSETNATIVE(Float, F),
+ DECLARE_GETSETNATIVE(Double, D),
+
+- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)},
+- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
++ {CC"getAddress", CC"(" ADR")" ADR, FN_PTR(Unsafe_GetNativeAddress)},
++ {CC"putAddress", CC"(" ADR"" ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
+
+- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
+- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
+- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
+-
+- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
+- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
+- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
+- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
+- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
+- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
++ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
++ {CC"reallocateMemory", CC"(" ADR"J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
++ {CC"freeMemory", CC"(" ADR")V", FN_PTR(Unsafe_FreeMemory)},
++
++ {CC"objectFieldOffset", CC"(" FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
++ {CC"staticFieldOffset", CC"(" FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
++ {CC"staticFieldBase", CC"(" FLD")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
++ {CC"ensureClassInitialized",CC"(" CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
++ {CC"arrayBaseOffset", CC"(" CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
++ {CC"arrayIndexScale", CC"(" CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
+ {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)},
+ {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)},
+
+- {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)},
+- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)},
+- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)},
+- {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
+- {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)},
+- {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)}
++ {CC"defineClass", CC"(" DC0_Args")" CLS, FN_PTR(Unsafe_DefineClass0)},
++ {CC"defineClass", CC"(" DC_Args")" CLS, FN_PTR(Unsafe_DefineClass)},
++ {CC"allocateInstance", CC"(" CLS")" OBJ, FN_PTR(Unsafe_AllocateInstance)},
++ {CC"monitorEnter", CC"(" OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
++ {CC"monitorExit", CC"(" OBJ")V", FN_PTR(Unsafe_MonitorExit)},
++ {CC"throwException", CC"(" THR")V", FN_PTR(Unsafe_ThrowException)}
+
+ };
+
+ // These are the methods prior to the JSR 166 changes in 1.6.0
+ static JNINativeMethod methods_15[] = {
+- {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)},
+- {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)},
+- {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)},
+- {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)},
++ {CC"getObject", CC"(" OBJ"J)" OBJ"", FN_PTR(Unsafe_GetObject)},
++ {CC"putObject", CC"(" OBJ"J" OBJ")V", FN_PTR(Unsafe_SetObject)},
++ {CC"getObjectVolatile",CC"(" OBJ"J)" OBJ"", FN_PTR(Unsafe_GetObjectVolatile)},
++ {CC"putObjectVolatile",CC"(" OBJ"J" OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)},
+
+
+ DECLARE_GETSETOOP(Boolean, Z),
+@@ -1528,42 +1528,42 @@
+ DECLARE_GETSETNATIVE(Float, F),
+ DECLARE_GETSETNATIVE(Double, D),
+
+- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)},
+- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
++ {CC"getAddress", CC"(" ADR")" ADR, FN_PTR(Unsafe_GetNativeAddress)},
++ {CC"putAddress", CC"(" ADR"" ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
+
+- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
+- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
+- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
+-
+- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
+- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
+- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
+- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
+- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
+- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
++ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
++ {CC"reallocateMemory", CC"(" ADR"J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
++ {CC"freeMemory", CC"(" ADR")V", FN_PTR(Unsafe_FreeMemory)},
++
++ {CC"objectFieldOffset", CC"(" FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
++ {CC"staticFieldOffset", CC"(" FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
++ {CC"staticFieldBase", CC"(" FLD")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
++ {CC"ensureClassInitialized",CC"(" CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
++ {CC"arrayBaseOffset", CC"(" CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
++ {CC"arrayIndexScale", CC"(" CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
+ {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)},
+ {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)},
+
+- {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)},
+- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)},
+- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)},
+- {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
+- {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)},
+- {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)},
+- {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)},
+- {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)},
+- {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)},
++ {CC"defineClass", CC"(" DC0_Args")" CLS, FN_PTR(Unsafe_DefineClass0)},
++ {CC"defineClass", CC"(" DC_Args")" CLS, FN_PTR(Unsafe_DefineClass)},
++ {CC"allocateInstance", CC"(" CLS")" OBJ, FN_PTR(Unsafe_AllocateInstance)},
++ {CC"monitorEnter", CC"(" OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
++ {CC"monitorExit", CC"(" OBJ")V", FN_PTR(Unsafe_MonitorExit)},
++ {CC"throwException", CC"(" THR")V", FN_PTR(Unsafe_ThrowException)},
++ {CC"compareAndSwapObject", CC"(" OBJ"J" OBJ"" OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)},
++ {CC"compareAndSwapInt", CC"(" OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)},
++ {CC"compareAndSwapLong", CC"(" OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)},
+ {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)},
+- {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)}
++ {CC"unpark", CC"(" OBJ")V", FN_PTR(Unsafe_Unpark)}
+
+ };
+
+ // These are the methods for 1.6.0 and 1.7.0
+ static JNINativeMethod methods_16[] = {
+- {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)},
+- {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)},
+- {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)},
+- {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)},
++ {CC"getObject", CC"(" OBJ"J)" OBJ"", FN_PTR(Unsafe_GetObject)},
++ {CC"putObject", CC"(" OBJ"J" OBJ")V", FN_PTR(Unsafe_SetObject)},
++ {CC"getObjectVolatile",CC"(" OBJ"J)" OBJ"", FN_PTR(Unsafe_GetObjectVolatile)},
++ {CC"putObjectVolatile",CC"(" OBJ"J" OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)},
+
+ DECLARE_GETSETOOP(Boolean, Z),
+ DECLARE_GETSETOOP(Byte, B),
+@@ -1582,45 +1582,45 @@
+ DECLARE_GETSETNATIVE(Float, F),
+ DECLARE_GETSETNATIVE(Double, D),
+
+- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)},
+- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
++ {CC"getAddress", CC"(" ADR")" ADR, FN_PTR(Unsafe_GetNativeAddress)},
++ {CC"putAddress", CC"(" ADR"" ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
+
+- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
+- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
+- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
+-
+- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
+- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
+- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
+- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
+- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
+- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
++ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
++ {CC"reallocateMemory", CC"(" ADR"J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
++ {CC"freeMemory", CC"(" ADR")V", FN_PTR(Unsafe_FreeMemory)},
++
++ {CC"objectFieldOffset", CC"(" FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
++ {CC"staticFieldOffset", CC"(" FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
++ {CC"staticFieldBase", CC"(" FLD")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
++ {CC"ensureClassInitialized",CC"(" CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
++ {CC"arrayBaseOffset", CC"(" CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
++ {CC"arrayIndexScale", CC"(" CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
+ {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)},
+ {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)},
+
+- {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)},
+- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)},
+- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)},
+- {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
+- {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)},
+- {CC"tryMonitorEnter", CC"("OBJ")Z", FN_PTR(Unsafe_TryMonitorEnter)},
+- {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)},
+- {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)},
+- {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)},
+- {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)},
+- {CC"putOrderedObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetOrderedObject)},
+- {CC"putOrderedInt", CC"("OBJ"JI)V", FN_PTR(Unsafe_SetOrderedInt)},
+- {CC"putOrderedLong", CC"("OBJ"JJ)V", FN_PTR(Unsafe_SetOrderedLong)},
++ {CC"defineClass", CC"(" DC0_Args")" CLS, FN_PTR(Unsafe_DefineClass0)},
++ {CC"defineClass", CC"(" DC_Args")" CLS, FN_PTR(Unsafe_DefineClass)},
++ {CC"allocateInstance", CC"(" CLS")" OBJ, FN_PTR(Unsafe_AllocateInstance)},
++ {CC"monitorEnter", CC"(" OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
++ {CC"monitorExit", CC"(" OBJ")V", FN_PTR(Unsafe_MonitorExit)},
++ {CC"tryMonitorEnter", CC"(" OBJ")Z", FN_PTR(Unsafe_TryMonitorEnter)},
++ {CC"throwException", CC"(" THR")V", FN_PTR(Unsafe_ThrowException)},
++ {CC"compareAndSwapObject", CC"(" OBJ"J" OBJ"" OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)},
++ {CC"compareAndSwapInt", CC"(" OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)},
++ {CC"compareAndSwapLong", CC"(" OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)},
++ {CC"putOrderedObject", CC"(" OBJ"J" OBJ")V", FN_PTR(Unsafe_SetOrderedObject)},
++ {CC"putOrderedInt", CC"(" OBJ"JI)V", FN_PTR(Unsafe_SetOrderedInt)},
++ {CC"putOrderedLong", CC"(" OBJ"JJ)V", FN_PTR(Unsafe_SetOrderedLong)},
+ {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)},
+- {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)}
++ {CC"unpark", CC"(" OBJ")V", FN_PTR(Unsafe_Unpark)}
+ };
+
+ // These are the methods for 1.8.0
+ static JNINativeMethod methods_18[] = {
+- {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)},
+- {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)},
+- {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)},
+- {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)},
++ {CC"getObject", CC"(" OBJ"J)" OBJ"", FN_PTR(Unsafe_GetObject)},
++ {CC"putObject", CC"(" OBJ"J" OBJ")V", FN_PTR(Unsafe_SetObject)},
++ {CC"getObjectVolatile",CC"(" OBJ"J)" OBJ"", FN_PTR(Unsafe_GetObjectVolatile)},
++ {CC"putObjectVolatile",CC"(" OBJ"J" OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)},
+
+ DECLARE_GETSETOOP(Boolean, Z),
+ DECLARE_GETSETOOP(Byte, B),
+@@ -1639,36 +1639,36 @@
+ DECLARE_GETSETNATIVE(Float, F),
+ DECLARE_GETSETNATIVE(Double, D),
+
+- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)},
+- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
++ {CC"getAddress", CC"(" ADR")" ADR, FN_PTR(Unsafe_GetNativeAddress)},
++ {CC"putAddress", CC"(" ADR"" ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
+
+- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
+- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
+- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
+-
+- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
+- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
+- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
+- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
+- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
+- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
++ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
++ {CC"reallocateMemory", CC"(" ADR"J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
++ {CC"freeMemory", CC"(" ADR")V", FN_PTR(Unsafe_FreeMemory)},
++
++ {CC"objectFieldOffset", CC"(" FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
++ {CC"staticFieldOffset", CC"(" FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
++ {CC"staticFieldBase", CC"(" FLD")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
++ {CC"ensureClassInitialized",CC"(" CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
++ {CC"arrayBaseOffset", CC"(" CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
++ {CC"arrayIndexScale", CC"(" CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
+ {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)},
+ {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)},
+
+- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)},
+- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)},
+- {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
+- {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)},
+- {CC"tryMonitorEnter", CC"("OBJ")Z", FN_PTR(Unsafe_TryMonitorEnter)},
+- {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)},
+- {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)},
+- {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)},
+- {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)},
+- {CC"putOrderedObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetOrderedObject)},
+- {CC"putOrderedInt", CC"("OBJ"JI)V", FN_PTR(Unsafe_SetOrderedInt)},
+- {CC"putOrderedLong", CC"("OBJ"JJ)V", FN_PTR(Unsafe_SetOrderedLong)},
++ {CC"defineClass", CC"(" DC_Args")" CLS, FN_PTR(Unsafe_DefineClass)},
++ {CC"allocateInstance", CC"(" CLS")" OBJ, FN_PTR(Unsafe_AllocateInstance)},
++ {CC"monitorEnter", CC"(" OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
++ {CC"monitorExit", CC"(" OBJ")V", FN_PTR(Unsafe_MonitorExit)},
++ {CC"tryMonitorEnter", CC"(" OBJ")Z", FN_PTR(Unsafe_TryMonitorEnter)},
++ {CC"throwException", CC"(" THR")V", FN_PTR(Unsafe_ThrowException)},
++ {CC"compareAndSwapObject", CC"(" OBJ"J" OBJ"" OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)},
++ {CC"compareAndSwapInt", CC"(" OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)},
++ {CC"compareAndSwapLong", CC"(" OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)},
++ {CC"putOrderedObject", CC"(" OBJ"J" OBJ")V", FN_PTR(Unsafe_SetOrderedObject)},
++ {CC"putOrderedInt", CC"(" OBJ"JI)V", FN_PTR(Unsafe_SetOrderedInt)},
++ {CC"putOrderedLong", CC"(" OBJ"JJ)V", FN_PTR(Unsafe_SetOrderedLong)},
+ {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)},
+- {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)}
++ {CC"unpark", CC"(" OBJ")V", FN_PTR(Unsafe_Unpark)}
+ };
+
+ JNINativeMethod loadavg_method[] = {
+@@ -1676,28 +1676,28 @@
+ };
+
+ JNINativeMethod prefetch_methods[] = {
+- {CC"prefetchRead", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchRead)},
+- {CC"prefetchWrite", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchWrite)},
+- {CC"prefetchReadStatic", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchRead)},
+- {CC"prefetchWriteStatic",CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchWrite)}
++ {CC"prefetchRead", CC"(" OBJ"J)V", FN_PTR(Unsafe_PrefetchRead)},
++ {CC"prefetchWrite", CC"(" OBJ"J)V", FN_PTR(Unsafe_PrefetchWrite)},
++ {CC"prefetchReadStatic", CC"(" OBJ"J)V", FN_PTR(Unsafe_PrefetchRead)},
++ {CC"prefetchWriteStatic",CC"(" OBJ"J)V", FN_PTR(Unsafe_PrefetchWrite)}
+ };
+
+ JNINativeMethod memcopy_methods_17[] = {
+- {CC"copyMemory", CC"("OBJ"J"OBJ"JJ)V", FN_PTR(Unsafe_CopyMemory2)},
+- {CC"setMemory", CC"("OBJ"JJB)V", FN_PTR(Unsafe_SetMemory2)}
++ {CC"copyMemory", CC"(" OBJ"J" OBJ"JJ)V", FN_PTR(Unsafe_CopyMemory2)},
++ {CC"setMemory", CC"(" OBJ"JJB)V", FN_PTR(Unsafe_SetMemory2)}
+ };
+
+ JNINativeMethod memcopy_methods_15[] = {
+- {CC"setMemory", CC"("ADR"JB)V", FN_PTR(Unsafe_SetMemory)},
+- {CC"copyMemory", CC"("ADR ADR"J)V", FN_PTR(Unsafe_CopyMemory)}
++ {CC"setMemory", CC"(" ADR"JB)V", FN_PTR(Unsafe_SetMemory)},
++ {CC"copyMemory", CC"(" ADR ADR"J)V", FN_PTR(Unsafe_CopyMemory)}
+ };
+
+ JNINativeMethod anonk_methods[] = {
+- {CC"defineAnonymousClass", CC"("DAC_Args")"CLS, FN_PTR(Unsafe_DefineAnonymousClass)},
++ {CC "defineAnonymousClass", CC "(" DAC_Args ")" CLS, FN_PTR(Unsafe_DefineAnonymousClass)}
+ };
+
+ JNINativeMethod lform_methods[] = {
+- {CC"shouldBeInitialized",CC"("CLS")Z", FN_PTR(Unsafe_ShouldBeInitialized)},
++ {CC"shouldBeInitialized",CC"(" CLS")Z", FN_PTR(Unsafe_ShouldBeInitialized)},
+ };
+
+ JNINativeMethod fence_methods[] = {
+--- openjdk/hotspot/src/share/vm/runtime/safepoint.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/runtime/safepoint.cpp 2016-05-26 13:07:57.251597177 +0200
+@@ -987,7 +987,7 @@
+
+ case _running:
+ default:
+- tty->print_cr("restart thread "INTPTR_FORMAT" with state %d",
++ tty->print_cr("restart thread " INTPTR_FORMAT " with state %d",
+ _thread, _type);
+ _thread->print();
+ ShouldNotReachHere();
+@@ -1286,7 +1286,7 @@
+ sstats = &_safepoint_stats[index];
+ tty->print("%.3f: ", sstats->_time_stamp);
+ tty->print("%-26s ["
+- INT32_FORMAT_W(8)INT32_FORMAT_W(11)INT32_FORMAT_W(15)
++ INT32_FORMAT_W(8) INT32_FORMAT_W(11) INT32_FORMAT_W(15)
+ " ] ",
+ sstats->_vmop_type == -1 ? "no vm operation" :
+ VM_Operation::name(sstats->_vmop_type),
+@@ -1295,8 +1295,8 @@
+ sstats->_nof_threads_wait_to_block);
+ // "/ MICROUNITS " is to convert the unit from nanos to millis.
+ tty->print(" ["
+- INT64_FORMAT_W(6)INT64_FORMAT_W(6)
+- INT64_FORMAT_W(6)INT64_FORMAT_W(6)
++ INT64_FORMAT_W(6) INT64_FORMAT_W(6)
++ INT64_FORMAT_W(6) INT64_FORMAT_W(6)
+ INT64_FORMAT_W(6)" ] ",
+ sstats->_time_to_spin / MICROUNITS,
+ sstats->_time_to_wait_to_block / MICROUNITS,
+@@ -1305,9 +1305,9 @@
+ sstats->_time_to_exec_vmop / MICROUNITS);
+
+ if (need_to_track_page_armed_status) {
+- tty->print(INT32_FORMAT" ", sstats->_page_armed);
++ tty->print(INT32_FORMAT " ", sstats->_page_armed);
+ }
+- tty->print_cr(INT32_FORMAT" ", sstats->_nof_threads_hit_page_trap);
++ tty->print_cr(INT32_FORMAT " ", sstats->_nof_threads_hit_page_trap);
+ }
+ }
+
+@@ -1344,17 +1344,17 @@
+
+ for (int index = 0; index < VM_Operation::VMOp_Terminating; index++) {
+ if (_safepoint_reasons[index] != 0) {
+- tty->print_cr("%-26s"UINT64_FORMAT_W(10), VM_Operation::name(index),
++ tty->print_cr("%-26s" UINT64_FORMAT_W(10), VM_Operation::name(index),
+ _safepoint_reasons[index]);
+ }
+ }
+
+- tty->print_cr(UINT64_FORMAT_W(5)" VM operations coalesced during safepoint",
++ tty->print_cr(UINT64_FORMAT_W(5) " VM operations coalesced during safepoint",
+ _coalesced_vmop_count);
+- tty->print_cr("Maximum sync time "INT64_FORMAT_W(5)" ms",
++ tty->print_cr("Maximum sync time " INT64_FORMAT_W(5) " ms",
+ _max_sync_time / MICROUNITS);
+ tty->print_cr("Maximum vm operation time (except for Exit VM operation) "
+- INT64_FORMAT_W(5)" ms",
++ INT64_FORMAT_W(5) " ms",
+ _max_vmop_time / MICROUNITS);
+ }
+
+--- openjdk/hotspot/src/share/vm/services/threadService.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/services/threadService.cpp 2016-05-26 13:09:19.365781782 +0200
+@@ -889,7 +889,7 @@
+ st->print(" waiting to lock monitor " INTPTR_FORMAT, waitingToLockMonitor);
+ oop obj = (oop)waitingToLockMonitor->object();
+ if (obj != NULL) {
+- st->print(" (object "INTPTR_FORMAT ", a %s)", (address)obj,
++ st->print(" (object " INTPTR_FORMAT ", a %s)", (address)obj,
+ (InstanceKlass::cast(obj->klass()))->external_name());
+
+ if (!currentThread->current_pending_monitor_is_from_java()) {
+--- openjdk/hotspot/src/share/vm/trace/traceStream.hpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/trace/traceStream.hpp 2016-05-26 11:00:29.636315730 +0200
+@@ -40,31 +40,31 @@
+ TraceStream(outputStream& stream): _st(stream) {}
+
+ void print_val(const char* label, u1 val) {
+- _st.print("%s = "UINT32_FORMAT, label, val);
++ _st.print("%s = " UINT32_FORMAT, label, val);
+ }
+
+ void print_val(const char* label, u2 val) {
+- _st.print("%s = "UINT32_FORMAT, label, val);
++ _st.print("%s = " UINT32_FORMAT, label, val);
+ }
+
+ void print_val(const char* label, s2 val) {
+- _st.print("%s = "INT32_FORMAT, label, val);
++ _st.print("%s = " INT32_FORMAT, label, val);
+ }
+
+ void print_val(const char* label, u4 val) {
+- _st.print("%s = "UINT32_FORMAT, label, val);
++ _st.print("%s = " UINT32_FORMAT, label, val);
+ }
+
+ void print_val(const char* label, s4 val) {
+- _st.print("%s = "INT32_FORMAT, label, val);
++ _st.print("%s = " INT32_FORMAT, label, val);
+ }
+
+ void print_val(const char* label, u8 val) {
+- _st.print("%s = "UINT64_FORMAT, label, val);
++ _st.print("%s = " UINT64_FORMAT, label, val);
+ }
+
+ void print_val(const char* label, s8 val) {
+- _st.print("%s = "INT64_FORMAT, label, (int64_t) val);
++ _st.print("%s = " INT64_FORMAT, label, (int64_t) val);
+ }
+
+ void print_val(const char* label, bool val) {
+--- openjdk/hotspot/src/share/vm/utilities/ostream.cpp 2016-02-16 08:11:33.000000000 +0100
++++ openjdk/hotspot/src/share/vm/utilities/ostream.cpp 2016-05-26 13:03:26.341586400 +0200
+@@ -277,7 +277,7 @@
+ size_t limit = (len + 16) / 16 * 16;
+ for (size_t i = 0; i < limit; ++i) {
+ if (i % 16 == 0) {
+- indent().print(SIZE_FORMAT_HEX_W(07)":", i);
++ indent().print(SIZE_FORMAT_HEX_W(07) ":", i);
+ }
+ if (i % 2 == 0) {
+ print(" ");
+@@ -945,7 +945,7 @@
+ // %%% Should be: jlong time_ms = os::start_time_milliseconds(), if
+ // we ever get round to introduce that method on the os class
+ xs->head("hotspot_log version='%d %d'"
+- " process='%d' time_ms='"INT64_FORMAT"'",
++ " process='%d' time_ms='" INT64_FORMAT "'",
+ LOG_MAJOR_VERSION, LOG_MINOR_VERSION,
+ os::current_process_id(), (int64_t)time_ms);
+ // Write VM version header immediately.
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h 2016-05-26 23:02:50.676441820 +0200
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h 2016-05-26 23:04:12.838577867 +0200
+@@ -223,7 +223,7 @@
+ AO_HAVE_FIELD_FLAGS_HI = 1<<10,
+ AO_HAVE_METHOD_FLAGS_HI = 1<<11,
+ AO_HAVE_CODE_FLAGS_HI = 1<<12,
+- AO_UNUSED_MBZ = (-1)<<13, // options bits reserved for future use.
++ AO_UNUSED_MBZ = (int)((unsigned)(-1)<<13), // options bits reserved for future use.
+
+ #define ARCHIVE_BIT_DO(F) \
+ F(AO_HAVE_SPECIAL_FORMATS) \
diff --git a/java-1_8_0-openjdk-suse-desktop-files.patch b/java-1_8_0-openjdk-suse-desktop-files.patch
new file mode 100644
index 0000000..8ca2d75
--- /dev/null
+++ b/java-1_8_0-openjdk-suse-desktop-files.patch
@@ -0,0 +1,30 @@
+--- icedtea-3.0.1/jconsole.desktop.in 2016-04-24 08:37:01.989304092 +0200
++++ icedtea-3.0.1/jconsole.desktop.in 2016-04-27 09:46:17.592085490 +0200
+@@ -1,10 +1,11 @@
+ [Desktop Entry]
+ Name=OpenJDK @JAVA_VER@ Monitoring & Management Console
++GenericName=OpenJDK @JAVA_VER@ Policy Tool
+ Comment=Monitor and manage OpenJDK applications
+ Exec=_BINDIR_/jconsole
+ Icon=java
+ Terminal=false
+ Type=Application
+ StartupWMClass=sun-tools-jconsole-JConsole
+-Categories=Development;Monitor;Java;
++Categories=Development;Profiling;
+ Version=1.0
+--- icedtea-3.0.1/policytool.desktop.in 2016-04-24 08:37:02.001303877 +0200
++++ icedtea-3.0.1/policytool.desktop.in 2016-04-27 09:45:32.061111551 +0200
+@@ -1,10 +1,11 @@
+ [Desktop Entry]
+ Name=OpenJDK @JAVA_VER@ Policy Tool
++GenericName=OpenJDK @JAVA_VER@ Policy Tool
+ Comment=Manage OpenJDK policy files
+ Exec=_BINDIR_/policytool
+ Icon=java
+ Terminal=false
+ Type=Application
+ StartupWMClass=sun-security-tools-PolicyTool
+-Categories=Development;Java;
++Categories=System;DesktopSettings;Security;
+ Version=1.0
diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index 8815050..93b7c45 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -1,3 +1,416 @@
+-------------------------------------------------------------------
+Fri Jun 3 09:01:23 UTC 2016 - fstrba@suse.com
+
+- Added patch:
+ * disable-doclint-by-default-patch
+ - Disable Doclint while building javadoc by default. OpenJDK 8
+ adds and enables doclint by default. This catches issues in
+ javadoc comments. It is too strict, breaks javadoc compilation
+ and, in general, breaks the build for old code known to build
+ with previous versions of OpenJDK.
+- Cycle make on i586 in order to prevent some random build errors
+ that are not easily reproduceable and thus fixable.
+
+-------------------------------------------------------------------
+Tue May 31 06:47:43 UTC 2016 - fstrba@suse.com
+
+- Added patch:
+ * java-1_8_0-openjdk-gcc6.patch
+ + Fix build with gcc 6.1
+- Add -fno-delete-null-pointer-checks -fno-lifetime-dse to try to
+ avoid some crashes
+
+-------------------------------------------------------------------
+Thu Apr 28 08:19:17 UTC 2016 - fstrba@suse.com
+
+- Upgrade to version jdk8u91 (icedtea 3.0.1, bsc#976340)
+- Icedtea changes from 2.6.5
+ * Security fixes
+ - S8129952, CVE-2016-0686: Ensure thread consistency
+ - S8132051, CVE-2016-0687: Better byte behavior
+ - S8138593, CVE-2016-0695: Make DSA more fair
+ - S8139008: Better state table management
+ - S8143167, CVE-2016-3425: Better buffering of XML strings
+ - S8143945, CVE-2016-3426: Better GCM validation
+ - S8144430, CVE-2016-3427: Improve JMX connections
+ - S8146494: Better ligature substitution
+ - S8146498: Better device table adjustments
+ * Import of OpenJDK 8 u91 build 14
+ - S8002116: This JdbReadTwiceTest.sh gets an exit 1
+ - S8007890: [TESTBUG] JcmdWithNMTDisabled.java fails when
+ invoked with NMT explicitly turned on
+ - S8036132: Tab characters in test/com/sun/jdi files
+ - S8038963: com/sun/jdi tests fail because cygwin's ps sometimes
+ misses processes
+ - S8044419: TEST_BUG: com/sun/jdi/JdbReadTwiceTest.sh fails when
+ run under root
+ - S8059661: Test SoftReference and OOM behavior
+ - S8067422: Lambda method names are unnecessarily unstable
+ - S8073735: [TEST_BUG] compiler/loopopts/CountedLoopProblem.java
+ got OOME
+ - S8074146: [TEST_BUG] jdb has succeded to read an unreadable
+ file
+ - S8130212: Thread::current() might access freed memory on
+ Solaris
+ - S8132890: Text Overlapping on Dot Matrix Printers
+ - S8134297: NPE in GSSNameElement nameType check
+ - S8134650: Xsl transformation gives different results in 8u66
+ - S8134828: Scrollbar thumb disappears with Nimbus L&F
+ - S8138589: Correct limits on unlimited cryptography
+ - S8138811: Construction of static protection domains
+ - S8140268: Generate link to specification license for JavaDoc
+ API documentation
+ - S8141229: [Parfait] Null pointer dereference in cmsstrcasecmp
+ of cmserr.c
+ - S8143002: [Parfait] JNI exception pending in fontpath.c:1300
+ - S8143959: Certificates requiring blacklisting
+ - S8146477: [TEST_BUG] ClientJSSEServerJSSE.java failing again
+ - S8146518: Zero interpreter broken with better byte behaviour
+ - S8146967: [TEST_BUG] javax/security/auth/SubjectDomainCombiner/Optimize.java
+ should use 4-args ProtectionDomain constructor
+ - S8147567: InterpreterRuntime::post_field_access not updated
+ for boolean in JDK-8132051
+ - S8148446: (tz) Support tzdata2016a
+ - S8148475: Missing SA Bytecode updates.
+ - S8148487: PPC64: Better byte behavior
+ - S8148522: Backout JDK-8138811 from 2016 Apr CPU repo
+ - S8149170: Better byte behavior for native arguments
+ - S8149367: PolicyQualifierInfo/index_Ctor JCk test fails with
+ IOE: Invalid encoding for PolicyQualifierInfo
+ - S8150012: Better byte behavior for reflection
+ - S8150790: 8u75 L10n resource file translation update
+ * Backports
+ - S8148752, PR2943: Compiled StringBuilder code throws
+ StringIndexOutOfBoundsException
+ - S8154210: Zero: Better byte behaviour
+ - S8154413: AArch64: Better byte behaviour
+ - S4890063, PR2304, RH1214835: HPROF: default text truncated
+ when using doe=n option
+ - S6425769, PR2859: Allow specifying an address to bind JMX
+ remote connector
+ - S8000650, PR2462: unpack200.exe should check gzip crc
+ - S8031668, PR2842: TOOLCHAIN_FIND_COMPILER unexpectedly
+ resolves symbolic links
+ - S8035341: Allow using a system installed libpng
+ - S8038392: Generating prelink cache breaks JAVA 'jinfo' utility
+ normal behavior
+ - S8042159: Allow using a system-installed lcms2
+ - S8042806: Splashscreen uses libjpeg-internal macros
+ - S8043805: Allow using a system-installed libjpeg
+ - S8044235: src.zip should include all sources
+ - S8074839, PR2462: Resolve disabled warnings for libunpack and
+ the unpack200 binary
+ - S8074859, PR1937: Turn on warnings as error
+ - S8087218, PR2740: Constant fold loads from final instance
+ fields in VM anonymous classes
+ - S8139932, PR2739: Typo in makefile changes for 8043805 [Allow
+ using a system-installed libjpeg]
+ - S8140483, PR2740: Atomic*FieldUpdaters final fields should be
+ trusted
+ - S8140620, PR2769: Find and load default.sf2 as the default
+ soundbank on Linux
+ - S8145096, PR2854: Undefined behaviour in HotSpot
+ - S8145982, PR2859: JMXInterfaceBindingTest is failing
+ intermittently
+ - S8146015, PR2859: JMXInterfaceBindingTest is failing
+ intermittently for IPv6 addresses
+ - S8148351, PR2842: Only display resolved symlink for compiler,
+ do not change path
+ - S8150954, PR2866, RH1176206: AWT Robot not compatible with
+ GNOME Shell
+ * Bug fixes
+ - PR2933: Support ccache 3.2 and later
+ - PR2934: SunEC provider throwing KeyException with current NSS
+ - S8041658: Use of -fdevirtualize on macroAssembler_x86.o
+ (via -O2) with gcc 4.9.0 creates broken VM
+ - PR94: empty install target in Makefile.am
+ - PR729: GTKLookAndFeel should be the system look&feel on all
+ GNU/Linux desktops
+ - PR1275: Provide option to turn off downloading of tarballs
+ - PR1281, RH513605: Updating/Installing OpenJDK should recreate
+ the shared class-data archive
+ - PR1289: Allow JARs to be optionally compressed by setting
+ COMPRESS_JARS
+ - PR1291: Ensure unlimited crypto policy is in place.
+ - PR1325: Only add classes to rt-source-files.txt if actually
+ needed
+ - PR1341: Remove Rhino support
+ - PR1346: Filter out -j option to make
+ - PR1347: Update list of checked JDKs
+ - PR1348: java -version output is broken
+ - PR1357: Make XRender mandatory
+ - PR1359: Check for /usr/lib64 JVMs and generic JPackage
+ alternative
+ - PR1364: Replace hgforest support
+ - PR1367: Support using the system installation of LCMS
+ - PR1368: Ensure debug data is available for all libraries and
+ binaries without redundant files
+ - PR1369: Remove outdated bootstrap configure tests or make them
+ fail on error
+ - PR1377: Forwardport javac detection / usability test from
+ IcedTea 2.x
+ - PR1379: Add build support for Zero AArch64
+ - PR1413: Undefined reference to libz during link of unpack200
+ - PR1741: Break PulseAudio provider out into IcedTea-Sound
+ - PR1766: Expand architecture support
+ - PR1774: Support GIF lib v5
+ - PR1774: Correct #ifdef to #if
+ - PR1796: make fails with "computed checksum did NOT match"
+ - PR1806: Support Debian/Ubuntu 7 & 8 OpenJDK Installs as Boot
+ JDK
+ - PR1812: Unable to locate HotSpot checksum when downloading
+ - PR1813: HotSpot URL should be used with --enable-hg
+ - PR1815: Split download/extraction rules for OpenJDK so they
+ can run in parallel
+ - PR1829: Support AM_MAINTAINER_MODE
+ - PR1834, RH1022017: Report elliptic curves supported by NSS,
+ not the SunEC library
+ - PR1845: jstack.stp in OpenJDK8 is broken
+ - PR1869: Avoid x86 workaround when running Zero rather than a
+ JIT
+ - PR1889: Allow tarball checksumming to be disabled
+ - PR1935: HotSpot extraction needs to depend on the tarball
+ being downloaded
+ - PR1937: Add configure option for -Werror
+ - PR1938: Zero broken by enforced use of -Werror
+ - PR1942: Bug reports lack IcedTea version & distribution
+ packaging information
+ - PR1950: Add build support for Zero SH
+ - PR1965, G498288: Allow builds on PaX kernels
+ - PR1968: Move to new OpenJDK bug URL format
+ - PR1975: SystemTap probes for the garbage collector.
+ - PR1977: Support using the system installation of Zlib
+ - PR1979: Support using the system installation of libjpeg
+ - PR1980: Support using the system installation of giflib
+ - PR1981: Support using the system installation of libpng
+ - PR1983: Support using the system installation of NSS with the
+ SunEC provider
+ - PR1994: make dist broken
+ - PR2001: Synchronise HEAD tarball paths with release branch
+ paths
+ - PR2066: Unset OS before running OpenJDK build
+ - PR2095, RH1163501: 2048-bit DH upper bound too small for
+ Fedora infrastructure
+ - PR2126: Synchronise elliptic curves in
+ sun.security.ec.NamedCurve with those listed by NSS
+ - PR2127: SunEC provider crashes when built using system NSS
+ - PR2199: Support giflib 5.1.0
+ - PR2212: DGifCloseFile call should check the return value, not
+ the error code, for failure
+ - PR2227: giflib 5.1 conditional excludes 6.0, 7.0, etc.
+ - PR2237, RH1194378: ppc64le should report its os.arch as
+ ppc64le so tools can detect it
+ - PR2248: HotSpot tarball fails verification after download
+ - PR2256: Add SystemTap tests
+ - PR2257: clean-extract-nashorn rule is never run
+ - PR2321: Checksum of policy JAR files changes on every build
+ - PR2329: jamvm parallel unpack failures
+ - PR2339: Fail early if there is no native HotSpot JIT & all
+ other options are disabled
+ - PR2348: Avoid following symlinks for CACAO and JamVM patches
+ - PR2351: Split CACAO rule into configure and make stages
+ - PR2352: Split JamVM rule into configure, make and make install
+ stages
+ - PR2358: Add aliases for all stamp targets
+ - PR2362: Update HACKING & fsg.sh.in
+ - PR2363: Remove EC source code prior to build
+ - PR2369: SunEC provider is partially installed
+ - PR2377: PaX mark the installed JDK so it runs on hardened
+ systems
+ - PR2383: Location of docs directory in install-data-local is
+ incorrect
+ - PR2392: Make elliptic curve removal optional
+ - PR2400, RH1206656: Zero JVM crashes on startup when built with
+ GCC 5
+ - PR2407: Fix automatic enabling of the Zero build on non-JIT
+ architectures which don't use CACAO or JamVM
+ - PR2408: Enable Zero when Shark is enabled
+ - PR2409: Update Zero macro to match one in IcedTea 2.x
+ - PR2410: Support PPC64 JIT on ppc64le
+ - PR2411: Fix references to hotspot.map following PR2001
+ - PR2413: OpenJDK doesn't auto-select Zero on architectures
+ where no server JVM is available
+ - PR2414: CFLAGS, CXXFLAGS and LDFLAGS should be passed to
+ OpenJDK build
+ - PR2415: JVM -Xmx requirement is too high on s390
+ - PR2428: OpenJDK build can't handle commas in LDFLAGS
+ - PR2429: OpenJDK build does not copy a symlinked cacerts file
+ - PR2432: ppc64 JIT doesn't support class data sharing
+ - PR2433: ppc64le does not support -Xshare:dump
+ - PR2434: SystemTap support is no longer optional
+ - PR2439: NSS PKCS11 regression - due to java.security automatic
+ loading
+ - PR2443: install stage fails where
+ BUILD_ARCH_DIR != INSTALL_ARCH_DIR
+ - PR2447: Allow greater control of Javadoc installation
+ directory
+ - PR2448: Install TRADEMARK, COPYING and ChangeLog as RPM spec
+ file does
+ - PR2454: install-data-local needs to check that classes.jsa
+ actually exists
+ - PR2456: Installation path for hotspot_gc.stp is wrong, due to
+ changed j2sdk-image location
+ - PR2459: Policy JAR files should be timestamped with the date
+ of the policy file they hold
+ - PR2511: Reset success following calls in LayoutManager.cpp
+ - PR2541: Allow the user to specify the cacerts file to use
+ - PR2544: Desktop files do not allow installation from multiple
+ versions of IcedTea
+ - PR2547: Extend tarball checksumming option to allow the
+ checksum to be specified
+ - PR2631: jvm.cfg missing for ppc64le
+ - PR2633: s390 builds still fail as BUILD_NUM_BITS is never set
+ - PR2675: Update ppc64le autotools infrastructure following
+ PR2237
+ - PR2691, G564746: ./configure is unable to compile using distcc
+ for icedtea-3.0.0_pre06
+ - PR2737: Allow multiple PKCS11 library initialisation to be a
+ non-critical error.
+ - PR2738: java.lang.UnsatisfiedLinkError: no javalcms in
+ java.library.path
+ - PR2743: Remove bad AArch64 merge fragment
+ - PR2759: LCMS library should be named javalcms, not lcms, to
+ avoid potential conflicts with the system library
+ - PR2766: Remove all references to GCJ
+ - PR2767: Remove remaining rogue binaries from OpenJDK tree
+ - PR2768: Move SystemTap GCC 4.5 patch to OpenJDK tree or
+ discard if no longer needed
+ - PR2777: Fix MAX/MIN template usage on s390
+ - PR2804: test/tapset/jstaptest.pl should be executable
+ - PR2815: Race condition in SunEC provider with system NSS
+ - PR2825: Placement of -lfreebl matters when using bfd linker
+ - PR2826: Provide option to disable SystemTap tests
+ - PR2841: Parallelism issues resulting from PR2459
+ - PR2863: IcedTea doesn't pass through build and host triplets
+ to OpenJDK's configure
+ - PR2865: Handle uninstallation.
+ - PR2869: Revert CRC fix (S8000650) backported as part of PR2462
+ - PR2873: Fix make distcheck.
+ - PR2880: Add missing test directory in make check.
+ - PR2885: Location of 'stap' executable is hard-coded
+ - PR2888: OpenJDK should check for system cacerts database (e.g.
+ /etc/pki/java/cacerts)
+ - PR2899: Don't use WithSeed versions of NSS functions as they
+ don't fully process the seed
+ - PR2906: Support prefixed variants of GNU tools used on *BSD
+ systems
+ - PR2907: Replace --with-abs-install-dir with usual --prefix
+ - PR2917: Don't pass --with-cacerts-file to build if
+ USE_ALT_CACERTS_FILE is not set
+ - PR2918: Makefile handles cacerts as a symlink, but the
+ configure check doesn't
+ - PR2920: PaX marking fails on filesystems which don't support
+ extended attributes
+ - PR2921: Uninstallation of docs deletes too much
+ - Don't substitute 'j' for '-j' inside -I directives
+ - Extend 8041658 to all files in the HotSpot build.
+ - Remove jcheck
+ * AArch64 port
+ - PR1970: Imported from aarch64 jdk8 repository.
+ - PR2853: Fix build for aarch64/zero
+ - PR2853: Remaining miscellaneous synchronisation changes from
+ aarch64/jdk8u
+ - PR2853: Remove AArch64-specific code in generateOptoStub.cpp.
+ - PR2853: Remove some AArch64-specific code in share/.
+ - PR2853: Remove some unnecessary divergences from jdk8u.
+ - PR2853: Revert AArch64 jvm.cfg divergence
+ - PR2853: Revert changes to libpng source code now 8078245 is in
+ place.
+ - PR2922: Import latest AArch64 changes from aarch64-port/jdk8u
+ (aarch64-jdk8u77-b03)
+ - S8150652, PR2922: Remove unused code in AArch64 back end
+ * JamVM
+ - JSR 292: Invoke Dynamic
+ - JSR 308: Type Annotations
+ - JSR 335: Lambda Expressions
+ - JSR 901: VM support for method parameter reflection
+ - JEP 171: Implement fence methods in sun.misc.Unsafe
+ - sun.misc.Unsafe: additional methods get/putAddress.
+ - FreeClassData: adjust method count for Miranda methods
+ - Fix invokesuper check in invokespecial opcode
+ - Fix non-direct interpreter invokespecial super-class check
+ - When GC'ing a native method don't try to free code
+ - Do not free unprepared Miranda method code data
+ - Set anonymous class protection domain
+ - JVM_IsVMGeneratedMethodIx stub
+ - Dummy implementation of sun.misc.Perf natives
+ - JVM_NewMultiArray: element class may be an array
+ - jtreg test java/lang/reflect/Array/ExceedMaxDim
+ - OpenJDK: Fix Local/Anonymous class checks
+ - classlibMarkThreadTerminated should return Object*
+ - Fix race-condition in constant-pool resolution code
+ - JSR 292: MethodHandle constant-pool refs may be resolved
+ - JSR 292: bootstrap method args error handling
+ - JSR 308: update to match OpenJDK changes
+ - JSR 292: correct intrinsic cache COMPARE function
+ - Race condition in setting up imethod table
+ - GC: Minor performance improvement
+ - PR2034: --enable-jamvm builds broken, missing
+ JVM_GetTemporaryDirectory impl
+ - PR2336: JamVM lacks JVM_FindClassFromCaller
+ - PR2523: Add executable stack markings to callNative.S on JamVM
+ - PR2775: JamVM lacks JVM_GetResourceLookupCacheURLs introduced
+ by jdk8u40
+ * CACAO
+ - PR1277: Synchronise CACAO rules between IcedTea6/7/8 where
+ possible
+ - PR1279: Synchronise CACAO versions between IcedTea6/7/8 where
+ possible
+ - PR2035: --enable-cacao builds broken, missing
+ JVM_GetTemporaryDirectory impl.
+ - PR2330, CA172, G453612: Add ARM hardfloat support to CACAO on
+ Gentoo
+ - PR2331: IcedTea8 fails to build with IcedTea7 CACAO due to low
+ max heap size
+ - PR2335: CACAO lacks JVM_FindClassFromCaller
+ - PR2347: Fix CACAO patches to apply again
+ - PR2349: 'struct jvm_version_info' has no member named
+ 'is_kernel_jvm'
+ - PR2350: Update to latest CACAO
+ - PR2354: stamps/cacao.stamp tries to touch a file in a
+ directory which doesn't exist
+ - PR2355: CACAO build fails to use JRE layout
+ - PR2776: CACAO lacks JVM_GetResourceLookupCacheURLs introduced
+ by jdk8u40
+ - PR2832, CA195: typeinfo.cpp: typeinfo_merge_nonarrays:
+ Assertion `dest && result && x.any && y.any' failed
+ - PR2908: Add missing functions for CACAO OpenJDK JVM
+ implementation
+ - PR2909: Install CACAO in same way as JamVM
+ - PR2910: Add rudimentary support for OpenJDK 8 class files to
+ CACAO
+ - PR2916: Update CACAO drop to use the latest from cacao-staging
+- Removed patches:
+ * PStack-808293.patch
+ * aarch64-misc.patch
+ * disable-doclint-by-default.patch
+ * include-all-srcs.patch
+ * link-with-as-needed.patch
+ * memory-limits.patch
+ * multiple-pkcs11-library-init.patch
+ * ppc64le-8036767.patch
+ * s390-java-opts.patch
+ * s390-size_t.patch
+ * system-lcms.patch
+ * system-libjpeg.patch
+ * system-libpng.patch
+ * zero-dummy.patch
+ - Fixed upstream
+- Added patches:
+ * icedtea-3.0.1-sunec.patch
+ - Adapt the nss detection to SUSE packaging of mozilla-nss
+ * java-1_8_0-openjdk-suse-desktop-files.patch
+ - Adapt the desktop files for SUSE needs
+- Modified patches:
+ * 1015432.patch
+ * adlc-parser.patch
+ * compare-pointer-with-literal.patch
+ * implicit-pointer-decl.patch
+ * java-atk-wrapper-security.patch
+ * ppc-zero-hotspot.patch
+ * zero-javadoc-verbose.patch
+ - Adapt to new directory structure
+
-------------------------------------------------------------------
Wed Mar 30 06:17:02 UTC 2016 - fstrba@suse.com
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index 627df25..36078c6 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -18,9 +18,9 @@
%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
%global jit_arches %ix86 x86_64 ppc64 ppc64le %aarch64
-%global debug 0
-%global bootcycle 1
-%global buildoutputdir build
+%global icedtea_version 3.0.1
+%global icedtea_sound_version 1.0.1
+%global buildoutputdir openjdk.build/
# Convert an absolute path to a relative path. Each symbolic link is
# specified relative to the directory in which it is installed so that
# it will resolve properly within chrooted installations.
@@ -29,25 +29,10 @@
%global syslibdir %{_libdir}
%global archname %{name}
# Standard JPackage naming and versioning defines.
-%global updatever 77
-%global buildver b03
-%global root_project jdk8u
-%global root_repository jdk8u
-%global root_revision 3fbef9f4cddf
-%global corba_revision e8dc6eb11c76
-%global hotspot_revision 223b64a19e94
-%global jaxp_revision 1c71899e8566
-%global jaxws_revision c6f67bea4466
-%global jdk_revision c44179bce874
-%global langtools_revision 094308b2ca1c
-%global nashorn_revision b6ee21a35619
-%global aarch64_project aarch64-port
-%global aarch64_repository jdk8u
-%global aarch64_hotspot_revision 43c11664317a
-%global icedtea_sound_version 1.0.1
# priority must be 6 digits in total
%global priority 1805
%global javaver 1.8.0
+%global updatever 91
# Standard JPackage directories and symbolic links.
%global sdklnk java-%{javaver}-openjdk
%global archname %{sdklnk}
@@ -73,6 +58,11 @@
%else
%global with_pulseaudio 0
%endif
+%if 0%{?suse_version} >= 1220
+%global with_system_lcms 1
+%else
+%global with_system_lcms 0
+%endif
%ifarch x86_64
%global archinstall amd64
%endif
@@ -114,18 +104,6 @@
%ifnarch %{jit_arches}
%global archinstall %{_arch}
%endif
-%if %{debug}
-%global debugbuild slowdebug
-%else
-%global debugbuild release
-%endif
-%if %{bootcycle}
-%global imagesdir bootcycle-build/images
-%global imagestarget bootcycle-images
-%else
-%global imagesdir images
-%global imagestarget images
-%endif
%ifnarch %{jit_arches}
%global _with_zero 1
%endif
@@ -140,6 +118,11 @@
%if 0%{?__isa_bits}
%global bits %{__isa_bits}
%endif
+%if 0%{?suse_version} >= 1330
+%global with_sunec 1
+%else
+%global with_sunec 0
+%endif
%bcond_with zero
# Turn on/off some features depending on openSUSE version
%if 0%{?suse_version} >= 1130
@@ -152,10 +135,6 @@
%global with_systemtap 0
%endif
%if %{with_systemtap}
-%global tapsetroot %{_datadir}/systemtap
-%global tapsetdir %{tapsetroot}/tapset/%{_build_cpu}
-%endif
-%if %{with_systemtap}
# Where to install systemtap tapset (links)
# We would like these to be in a package specific subdir,
# but currently systemtap doesn't support that, so we have to
@@ -174,72 +153,38 @@ Summary: OpenJDK 8 Runtime Environment
License: Apache-1.1 and Apache-2.0 and GPL-1.0+ and GPL-2.0 and GPL-2.0-with-classpath-exception and LGPL-2.0 and MPL-1.0 and MPL-1.1 and SUSE-Public-Domain and W3C
Group: Development/Languages/Java
Url: http://openjdk.java.net/
-# Sources from upstream OpenJDK8 project.
-Source0: http://hg.openjdk.java.net/%{root_project}/%{root_repository}/archive/%{root_revision}.tar.bz2
-Source1: http://hg.openjdk.java.net/%{root_project}/%{root_repository}/corba/archive/%{corba_revision}.tar.bz2
-Source2: http://hg.openjdk.java.net/%{root_project}/%{root_repository}/hotspot/archive/%{hotspot_revision}.tar.bz2
-Source3: http://hg.openjdk.java.net/%{root_project}/%{root_repository}/jaxp/archive/%{jaxp_revision}.tar.bz2
-Source4: http://hg.openjdk.java.net/%{root_project}/%{root_repository}/jaxws/archive/%{jaxws_revision}.tar.bz2
-Source5: http://hg.openjdk.java.net/%{root_project}/%{root_repository}/jdk/archive/%{jdk_revision}.tar.bz2
-Source6: http://hg.openjdk.java.net/%{root_project}/%{root_repository}/langtools/archive/%{langtools_revision}.tar.bz2
-Source7: http://hg.openjdk.java.net/%{root_project}/%{root_repository}/nashorn/archive/%{nashorn_revision}.tar.bz2
-# Hotspot version from aarch64-port repository (using the _tip_ of the http://hg.openjdk.java.net/%{aarch64_project}/%{aarch64_repository}/hotspot)
-Source8: http://hg.openjdk.java.net/%{aarch64_project}/%{aarch64_repository}/hotspot/archive/%{aarch64_hotspot_revision}.tar.bz2
-# Pulseaudio plugin
-Source9: http://icedtea.classpath.org/download/source/icedtea-sound-%{icedtea_sound_version}.tar.xz
-# Systemtap tapsets. Zipped up to keep it small.
-Source10: systemtap-tapset.tar.gz
-# Desktop files. Adapated from IcedTea.
-Source11: jconsole.desktop.in
-Source12: policytool.desktop.in
-# nss configuration file
-Source13: nss.cfg
-# Ensure we aren't using the limited crypto policy
-Source14: TestCryptoLevel.java
-# New versions of config files with aarch64 support. This is not upstream yet.
-Source100: config.guess
-Source101: config.sub
+Source0: http://icedtea.classpath.org/download/source/icedtea-%{icedtea_version}.tar.xz
+Source1: http://icedtea.classpath.org/download/source/icedtea-sound-%{icedtea_sound_version}.tar.xz
+Source2: http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/openjdk.tar.xz
+Source3: http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/corba.tar.xz
+Source4: http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/jaxp.tar.xz
+Source5: http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/jaxws.tar.xz
+Source6: http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/jdk.tar.xz
+Source7: http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/langtools.tar.xz
+Source8: http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/hotspot.tar.xz
+Source9: http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/nashorn.tar.xz
# RPM/distribution specific patches
# RHBZ 1015432
Patch2: 1015432.patch
# Restrict access to java-atk-wrapper classes
Patch3: java-atk-wrapper-security.patch
-# RHBZ 808293
-Patch4: PStack-808293.patch
-# Allow multiple initialization of PKCS11 libraries
-Patch5: multiple-pkcs11-library-init.patch
-# Disable doclint for compatibility
-Patch6: disable-doclint-by-default.patch
-# Include all sources in src.zip
-Patch7: include-all-srcs.patch
# Fix expression compares a char* pointer with a string literal
Patch8: compare-pointer-with-literal.patch
-# Backport stuff from aarch64-port
-Patch9: aarch64-misc.patch
-# From icedtea: Increase default memory limits
-Patch10: memory-limits.patch
# Fix use of unintialized memory in adlc parser
Patch12: adlc-parser.patch
# Fix: implicit-pointer-decl
Patch13: implicit-pointer-decl.patch
# Avoid triggering inactivity timeout while generating javadoc in zero VM
Patch14: zero-javadoc-verbose.patch
-# Fix crash on zero virtual machine built with gcc5
-Patch16: zero-dummy.patch
#
# OpenJDK specific patches
#
-# JVM heap size changes for s390 (thanks to aph)
-Patch100: s390-java-opts.patch
-Patch101: s390-size_t.patch
-# Patch for PPC/PPC64
+# Patch for PPC
Patch103: ppc-zero-hotspot.patch
-Patch104: ppc64le-8036767.patch
-# Patches for system libraries
-Patch201: system-libjpeg.patch
-Patch202: system-libpng.patch
-Patch203: system-lcms.patch
-Patch205: link-with-as-needed.patch
+Patch1000: icedtea-3.0.1-sunec.patch
+Patch1001: java-1_8_0-openjdk-suse-desktop-files.patch
+Patch2000: java-1_8_0-openjdk-gcc6.patch
+Patch2001: disable-doclint-by-default.patch
BuildRequires: alsa-lib-devel
BuildRequires: autoconf
BuildRequires: automake
@@ -252,13 +197,17 @@ BuildRequires: freetype2-devel
BuildRequires: gcc-c++
BuildRequires: giflib-devel
BuildRequires: gtk2-devel
+BuildRequires: java-bootstrap-devel >= 1.7.0
+BuildRequires: libXcomposite-devel
BuildRequires: libjpeg-devel
BuildRequires: liblcms2-devel
BuildRequires: libpng-devel
BuildRequires: libxslt
+BuildRequires: mozilla-nss-devel
BuildRequires: pkgconfig
BuildRequires: unzip
BuildRequires: update-desktop-files
+BuildRequires: wget
BuildRequires: xorg-x11-proto-devel
BuildRequires: zip
# Requires rest of java
@@ -308,11 +257,6 @@ BuildRequires: libXinerama-devel
BuildRequires: libXt-devel
BuildRequires: libXtst-devel
%endif
-%if %{bootcycle}
-BuildRequires: java-bootstrap-devel >= 1.6.0
-%else
-BuildRequires: java-devel >= %{javaver}
-%endif
# runtime certificates generation available in 11.3+ - bnc#596177
%if 0%{?suse_version} >= 1130
BuildRequires: java-ca-certificates
@@ -444,96 +388,16 @@ There are known issues with accessibility on, so please do not install
this package unless you really need to.
%prep
-%setup -q -n %{root_repository}-%{root_revision}
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 1
-%ifarch %aarch64
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 8
-%else
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 2
-%endif
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 3
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 4
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 5
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 6
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 7
+%setup -q -n icedtea-%{icedtea_version}
+%setup -q -D -n icedtea-%{icedtea_version} -T -a 1
-%if %{with_pulseaudio}
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 9
-%endif
-
-# Set up the build tree using the subrepository tarballs
-pwd
-mv corba-%{corba_revision} corba
-
-%ifarch %aarch64
-mv hotspot-%{aarch64_hotspot_revision} hotspot
-%else
-mv hotspot-%{hotspot_revision} hotspot
-%endif
-mv jaxp-%{jaxp_revision} jaxp
-mv jaxws-%{jaxws_revision} jaxws
-mv jdk-%{jdk_revision} jdk
-mv langtools-%{langtools_revision} langtools
-mv nashorn-%{nashorn_revision} nashorn
-
-%if %{with_pulseaudio}
-mv icedtea-sound-%{icedtea_sound_version} icedtea-sound
-%endif
-
-# replace outdated configure guess script
-#
-# the configure macro will do this too, but it also passes a few flags not
-# supported by openjdk configure script
-cp %{SOURCE100} common/autoconf/build-aux/
-cp %{SOURCE101} common/autoconf/build-aux/
-
-# Remove libraries that are linked
-rm -rvf jdk/src/share/native/java/util/zip/zlib-*
-find jdk/src/share/native/sun/awt/image/jpeg ! -name imageioJPEG.c ! -name jpegdecoder.c -type f -delete
-rm -rvf jdk/src/share/native/sun/awt/libpng
-rm -rvf jdk/src/share/native/sun/awt/giflib
-rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/cms*
-rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
-
-%patch201 -p1
-%patch202 -p1
-%patch203 -p1
-%patch205 -p1
-
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch12 -p1
-%patch13 -p1
-
-%if %{with zero}
-%patch14 -p1
-%patch16 -p1
-%endif
-
-%ifarch s390
-%patch100 -p1
-%patch101 -p1
-%endif
-
-%ifarch ppc ppc64 ppc64le
-# PPC fixes
-%patch103 -p1
-%patch104 -p1
-%endif
+%patch1000 -p1
+%patch1001 -p1
# Extract systemtap tapsets
%if %{with_systemtap}
-tar xzf %{SOURCE10}
-
for file in tapset/*.in; do
OUTPUT_FILE=`echo $file | sed -e s:\.in$::g`
@@ -552,14 +416,10 @@ done
%endif
-# Prepare desktop files
-for file in %{SOURCE11} %{SOURCE12} ; do
- OUTPUT_FILE=`basename $file | sed -e s:\.in$::g`
- sed -e s:@JAVA_HOME@:%{_jvmdir}/%{sdkdir}:g $file > $OUTPUT_FILE
- sed -i -e s:@VERSION@:%{javaver}.%{_arch}:g $OUTPUT_FILE
-done
-
%build
+export LANG=C
+unset JAVA_HOME
+
# How many cpu's do we have?
export NUM_PROC=`%{_bindir}/getconf _NPROCESSORS_ONLN 2> /dev/null || :`
export NUM_PROC=${NUM_PROC:-1}
@@ -570,75 +430,96 @@ export ZLIB_CFLAGS=" "
export ZLIB_LIBS="-L/%{_lib} -lz"
%endif
-# Build IcedTea and OpenJDK.
-
-%ifarch s390x sparc64 alpha ppc64 ppc64le %aarch64
-export ARCH_DATA_MODEL=64
+CFLAGS=$(rpm -E '%{optflags}' | sed 's/-Wall\>//')
+%if 0%{?suse_version} >= 1330
+CFLAGS+=" -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse"
+%endif
+export CFLAGS
+export CXXFLAGS=${CFLAGS}
+%if %{with_sunec}
+export NSS_SOFTOKN_CFLAGS="`pkg-config --cflags nss` -I`pwd`"
+export NSS_SOFTOKN_LIBS="-L%{_libdir} -lnssdbm3 -lsoftokn3 -lssl3 -lsmime3 -lnss3 -lnssutil3 -lfreebl -L%{_libdir}/nspr -lplds4 -lplc4 -lnspr4"
+export NSS_CFLAGS="$NSS_SOFTOKN_CFLAGS"
+export NSS_LIBS="$NSS_SOFTOKN_LIBS"
%endif
-%ifarch alpha
-export CFLAGS="$CFLAGS -mieee"
+sh autogen.sh
+%configure \
+%if %{with_sunec}
+ --enable-sunec \
+%endif
+ --enable-bootstrap \
+ --disable-infinality \
+ --disable-downloading \
+ --with-abs-install-dir=%{_jvmdir}/%{sdkdir} \
+%ifnarch %arm %aarch64
+ --with-parallel-jobs="${NUM_PROC}" \
+%endif
+ --with-pkgversion="suse-%{release}-%{_arch}" \
+ --with-jdk-home="%{_sysconfdir}/alternatives/java_sdk" \
+%if %{with_systemtap}
+ --enable-systemtap \
+%endif
+%if %{with zero}
+ --enable-zero \
+%endif
+%if 0%{?suse_version} <= 1110
+ --disable-system-gio \
+ --disable-system-gconf \
+%endif
+%if %{with_system_lcms}
+ --enable-system-lcms \
+%else
+ --disable-system-lcms \
+%endif
+ --with-openjdk-src-zip=%{SOURCE2} \
+ --with-corba-src-zip=%{SOURCE3} \
+ --with-jaxp-src-zip=%{SOURCE4} \
+ --with-jaxws-src-zip=%{SOURCE5} \
+ --with-jdk-src-zip=%{SOURCE6} \
+ --with-langtools-src-zip=%{SOURCE7} \
+ --with-hotspot-src-zip=%{SOURCE8} \
+ --with-nashorn-src-zip=%{SOURCE9}
+
+make patch %{?_smp_mflags}
+
+patch -p0 -i %{PATCH2}
+patch -p0 -i %{PATCH3}
+patch -p0 -i %{PATCH8}
+patch -p0 -i %{PATCH12}
+patch -p0 -i %{PATCH13}
+
+%if %{with zero}
+patch -p0 -i %{PATCH14}
%endif
-(cd common/autoconf
+%ifarch ppc ppc64 ppc64le
+# PPC fixes
+patch -p0 -i %{PATCH103}
+%endif
+
+patch -p0 -i %{PATCH2000}
+patch -p0 -i %{PATCH2001}
+
+(cd openjdk/common/autoconf
bash ./autogen.sh
)
-mkdir -p %{buildoutputdir}
-
-pushd %{buildoutputdir}
-
-bash ../configure \
-%if %{with zero}
- --with-jvm-variants=zero \
+%if 0%{?suse_version} >= 1330
+%ifarch %ix86
+for i in {1..10}; do make %{?_smp_mflags} && break; done
+%else
+make %{?_smp_mflags}
%endif
- --disable-zip-debug-info \
- --with-milestone="fcs" \
- --with-update-version=%{updatever} \
- --with-build-number=%{buildver} \
- --with-debug-level=%{debugbuild} \
- --enable-unlimited-crypto \
- --with-zlib=system \
- --with-libjpeg=system \
- --with-giflib=system \
- --with-libpng=system \
- --with-lcms=system \
- --with-stdc++lib=dynamic \
-%ifnarch %arm
- --with-num-cores="$NUM_PROC" \
+%else
+make %{?_smp_mflags}
%endif
-%if 0%{?suse_version} >= 1120
- --with-extra-cflags="-fno-devirtualize" \
- --with-extra-cxxflags="-fno-devirtualize" \
-%endif
- --with-boot-jdk=%{_sysconfdir}/alternatives/java_sdk
-# The combination of FULL_DEBUG_SYMBOLS=0 and ALT_OBJCOPY=/does_not_exist
-# disables FDS for all build configs and reverts to pre-FDS make logic.
-# STRIP_POLICY=none says don't do any stripping. DEBUG_BINARIES=true says
-# ignore all the other logic about which debug options and just do '-g'.
-
-make \
- DEBUG_BINARIES=true \
- FULL_DEBUG_SYMBOLS=0 \
- ZIP_DEBUGINFO_FILES=0 \
- STRIP_POLICY=none \
- POST_STRIP_CMD=true \
- ALT_OBJCOPY=/does_not_exist \
- LOG=debug \
- %{imagestarget} docs
-
-# remove redundant *diz and *debuginfo files
-find %{imagesdir}/j2sdk-image -iname '*.diz' -exec rm {} \;
-find %{imagesdir}/j2sdk-image -iname '*.debuginfo' -exec rm {} \;
-
-popd >& /dev/null
-
-export JAVA_HOME=$(pwd)/%{buildoutputdir}/%{imagesdir}/j2sdk-image
+export JAVA_HOME=$(pwd)/%{buildoutputdir}images/j2sdk-image
# cacerts are generated in runtime in openSUSE
-if [ -f %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/lib/security/cacerts ]; then
- rm %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/lib/security/cacerts
+if [ -f %{buildoutputdir}images/j2sdk-image/jre/lib/security/cacerts ]; then
+ rm -f %{buildoutputdir}images/j2sdk-image/jre/lib/security/cacerts
fi
%if 0%{?suse_version} < 1130
@@ -648,14 +529,14 @@ for PEM in %{_sysconfdir}/ssl/certs/*.pem; do
ALIAS=$(basename ${PEM} .pem)
awk '/-----BEGIN CERTIFICATE-----/,/-----END CERTIFICATE-----/{ print $0; }' ${PEM} > ${ALIAS}.pem
- yes | $JAVA_HOME/jre/bin/keytool -import -alias ${ALIAS} -keystore %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/lib/security/cacerts -storepass 'changeit' -file ${ALIAS}.pem || :
+ yes | $JAVA_HOME/jre/bin/keytool -import -alias ${ALIAS} -keystore %{buildoutputdir}images/j2sdk-image/jre/lib/security/cacerts -storepass 'changeit' -file ${ALIAS}.pem || :
rm ${ALIAS}.pem
done
%endif
%if %{with_pulseaudio}
# Build the pulseaudio plugin
-pushd icedtea-sound
+pushd icedtea-sound-%{icedtea_sound_version}
%configure \
--with-jdk-home=$JAVA_HOME \
--disable-docs
@@ -672,10 +553,6 @@ echo "" >> $JAVA_HOME/jre/lib/pulseaudio.properties
popd
%endif
-# Check unlimited policy has been used
-$JAVA_HOME/bin/javac -d . %{SOURCE14}
-$JAVA_HOME/bin/java TestCryptoLevel
-
# Check debug symbols are present and can identify code
SERVER_JVM="$JAVA_HOME/jre/lib/%{archinstall}/server/libjvm.so"
if [ -f "$SERVER_JVM" ] ; then
@@ -700,7 +577,9 @@ export NO_BRP_CHECK_BYTECODE_VERSION=true
%if %{with_systemtap}
# Install systemtap support files.
install -dm 755 %{buildroot}%{_jvmdir}/%{sdkdir}/tapset
- cp -a tapset/*.stp %{buildroot}%{_jvmdir}/%{sdkdir}/tapset/
+ for i in tapset/*.stp; do
+ cp -a $i %{buildroot}%{_jvmdir}/%{sdkdir}/tapset/$(basename $i .stp)-1.8.0.stp
+ done
install -d -m 755 %{buildroot}%{tapsetdir}
pushd %{buildroot}%{tapsetdir}
RELATIVE=$(%{abs2rel} %{_jvmdir}/%{sdkdir}/tapset %{tapsetdir})
@@ -708,7 +587,7 @@ export NO_BRP_CHECK_BYTECODE_VERSION=true
popd
%endif
-pushd %{buildoutputdir}/%{imagesdir}/j2sdk-image
+pushd %{buildoutputdir}images/j2sdk-image
# Install main files.
install -d -m 755 %{buildroot}%{_jvmdir}/%{sdkdir}
@@ -777,9 +656,6 @@ pushd %{buildoutputdir}/%{imagesdir}/j2sdk-image
popd
-# Install nss.cfg
-install -m 644 %{SOURCE13} %{buildroot}%{_jvmdir}/%{jredir}/lib/security/
-
# Install Javadoc documentation.
install -d -m 755 %{buildroot}%{_javadocdir}
cp -a %{buildoutputdir}/docs %{buildroot}%{_javadocdir}/%{sdklnk}
@@ -787,7 +663,7 @@ cp -a %{buildoutputdir}/docs %{buildroot}%{_javadocdir}/%{sdklnk}
# Install icons and menu entries.
for s in 16 24 32 48 ; do
install -D -p -m 644 \
- jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
+ openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
%{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/java-%{javaver}.png
done
@@ -1137,9 +1013,9 @@ fi
%dir %{_libdir}/jvm-exports
%dir %{_libdir}/jvm-private
-%doc %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION
-%doc %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/LICENSE
-%doc %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/THIRD_PARTY_README
+%doc %{buildoutputdir}images/j2sdk-image/jre/ASSEMBLY_EXCEPTION
+%doc %{buildoutputdir}images/j2sdk-image/jre/LICENSE
+%doc %{buildoutputdir}images/j2sdk-image/jre/THIRD_PARTY_README
%dir %{_jvmdir}/%{sdkdir}
%{_jvmdir}/%{jrelnk}
diff --git a/java-atk-wrapper-security.patch b/java-atk-wrapper-security.patch
index e298396..3a392e4 100644
--- a/java-atk-wrapper-security.patch
+++ b/java-atk-wrapper-security.patch
@@ -1,5 +1,5 @@
---- jdk8/jdk/src/share/lib/security/java.security-linux 2014-07-15 23:08:27.000000000 +0200
-+++ jdk8/jdk/src/share/lib/security/java.security-linux 2014-07-18 09:04:45.127566697 +0200
+--- openjdk/jdk/src/share/lib/security/java.security-linux 2014-07-15 23:08:27.000000000 +0200
++++ openjdk/jdk/src/share/lib/security/java.security-linux 2014-07-18 09:04:45.127566697 +0200
@@ -211,7 +211,9 @@
jdk.internal.,\
jdk.nashorn.internal.,\
diff --git a/jaxp.tar.xz b/jaxp.tar.xz
new file mode 100644
index 0000000..db1fba3
--- /dev/null
+++ b/jaxp.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0a9d523d451b895066dd747ee595eebba29f5626e9a69d9467cccd9b2df37c4
+size 2296808
diff --git a/jaxws.tar.xz b/jaxws.tar.xz
new file mode 100644
index 0000000..3341e39
--- /dev/null
+++ b/jaxws.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e378c1f46b067c9527d174c3683f4022eca3fe17bcf0e79177fa1713197d3338
+size 2266852
diff --git a/jconsole.desktop.in b/jconsole.desktop.in
deleted file mode 100644
index 27e9e0f..0000000
--- a/jconsole.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=OpenJDK 8 Monitoring & Management Console
-GenericName=OpenJDK Monitoring & Management Console
-Comment=Monitor and manage OpenJDK applications for @VERSION@
-Exec=@JAVA_HOME@/bin/jconsole
-Icon=java
-Terminal=false
-Type=Application
-StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Profiling;
-Version=1.0
diff --git a/jdk.tar.xz b/jdk.tar.xz
new file mode 100644
index 0000000..eb61232
--- /dev/null
+++ b/jdk.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:550556487de7fd769a9398082f26b358a2e5c07c2c1eb09724f0862667589cdd
+size 38264484
diff --git a/langtools.tar.xz b/langtools.tar.xz
new file mode 100644
index 0000000..526a055
--- /dev/null
+++ b/langtools.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2602601152576021736028604e56cf32f8e3f5997fe220e90297132274a251ca
+size 2056412
diff --git a/link-with-as-needed.patch b/link-with-as-needed.patch
deleted file mode 100644
index b12caa7..0000000
--- a/link-with-as-needed.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- jdk8/jdk/make/CompileLaunchers.gmk 2014-09-26 08:53:47.340118668 +0200
-+++ jdk8/jdk/make/CompileLaunchers.gmk 2014-09-26 08:54:18.702392301 +0200
-@@ -427,7 +427,7 @@
- # binary (at least on linux) which causes the size to differ between old and new build.
- ifeq ($(USE_EXTERNAL_LIBZ), true)
- UNPACKEXE_CFLAGS := -DSYSTEM_ZLIB
-- UNPACKEXE_ZIPOBJS := -lz
-+ UNPACKEXE_LIBS := -lz
- else
- UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8
- UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \
-@@ -488,9 +488,9 @@
- LDFLAGS_posix := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
- $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
-- LDFLAGS_linux := -lc, \
-+ LDFLAGS_linux := , \
- LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \
-- LDFLAGS_SUFFIX := $(LIBCXX), \
-+ LDFLAGS_SUFFIX := $(UNPACKEXE_LIBS) $(LIBCXX), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
- OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
- PROGRAM := unpack200, \
---- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:53:47.341118645 +0200
-+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:54:22.383307050 +0200
-@@ -760,10 +760,10 @@
- $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \
- $(BUILD_LIBJAVAJPEG_HEADERS), \
- MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
-- LDFLAGS := $(LDFLAGS_JDKLIB) $(LIBJPEG_LIBS) \
-+ LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \
-- LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
-+ LDFLAGS_SUFFIX := $(LIBJPEG_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=javajpeg.dll" \
diff --git a/memory-limits.patch b/memory-limits.patch
deleted file mode 100644
index 6d1fb08..0000000
--- a/memory-limits.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- jdk8/hotspot/src/share/vm/runtime/globals.hpp 2014-04-23 22:06:29.000000000 +0100
-+++ jdk8/hotspot/src/share/vm/runtime/globals.hpp 2014-05-12 20:42:01.633428300 +0100
-@@ -3113,7 +3113,7 @@
- product(uintx, InitialHeapSize, 0, \
- "Initial heap size (in bytes); zero means use ergonomics") \
- \
-- product(uintx, MaxHeapSize, ScaleForWordSize(96*M), \
-+ product(uintx, MaxHeapSize, ScaleForWordSize(512*M), \
- "Maximum heap size (in bytes)") \
- \
- product(uintx, OldSize, ScaleForWordSize(4*M), \
diff --git a/multiple-pkcs11-library-init.patch b/multiple-pkcs11-library-init.patch
deleted file mode 100644
index 15175de..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/nashorn.tar.xz b/nashorn.tar.xz
new file mode 100644
index 0000000..a45ffa9
--- /dev/null
+++ b/nashorn.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e7040d55a499c002cd6edcedc44890072a2f88cb19a341950e5865c544b51edc
+size 2220176
diff --git a/nss.cfg b/nss.cfg
deleted file mode 100644
index 74d461d..0000000
--- a/nss.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-name = NSS
-nssLibraryDirectory =
-nssDbMode = noDb
-attributes = compatibility
diff --git a/openjdk.tar.xz b/openjdk.tar.xz
new file mode 100644
index 0000000..c546d22
--- /dev/null
+++ b/openjdk.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8b766fffa39d67e62802a8cddd23e02b0ac2fd6aff48658b4b08fd6dbee38184
+size 330720
diff --git a/policytool.desktop.in b/policytool.desktop.in
deleted file mode 100644
index aca7f77..0000000
--- a/policytool.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=OpenJDK 8 Policy Tool
-GenericName=OpenJDK Policy Tool
-Comment=Manage OpenJDK policy files (@VERSION@)
-Exec=@JAVA_HOME@/bin/policytool
-Icon=java
-Terminal=false
-Type=Application
-StartupWMClass=sun-security-tools-PolicyTool
-Categories=Settings;DesktopSettings;Security;
-Version=1.0
diff --git a/ppc-zero-hotspot.patch b/ppc-zero-hotspot.patch
index 19d86bb..992d77c 100644
--- a/ppc-zero-hotspot.patch
+++ b/ppc-zero-hotspot.patch
@@ -1,6 +1,6 @@
-diff -up jdk8/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.ppc64 jdk8/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
---- jdk8/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.ppc64 2013-02-22 19:02:06.000000000 +0100
-+++ jdk8/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2013-04-18 16:21:24.897403406 +0200
+diff -up openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.ppc64 openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
+--- openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.ppc64 2013-02-22 19:02:06.000000000 +0100
++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2013-04-18 16:21:24.897403406 +0200
@@ -32,11 +32,15 @@
//
diff --git a/ppc64le-8036767.patch b/ppc64le-8036767.patch
deleted file mode 100644
index 3bf80c5..0000000
--- a/ppc64le-8036767.patch
+++ /dev/null
@@ -1,125 +0,0 @@
---- jdk8/common/autoconf/hotspot-spec.gmk.in 2016-02-26 13:23:57.379257902 +0100
-+++ jdk8/common/autoconf/hotspot-spec.gmk.in 2016-02-26 13:25:10.961590289 +0100
-@@ -71,6 +71,10 @@
- LIBARCH=$(OPENJDK_TARGET_CPU_LEGACY_LIB)
- # Old name for OPENJDK_TARGET_CPU, uses i586 and amd64, instead of x86 and x86_64.
- ARCH=$(OPENJDK_TARGET_CPU_LEGACY)
-+# ppc64le uses the HotSpot ppc64 build
-+ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
-+ ARCH=ppc64
-+endif
- # Legacy setting for building for a 64 bit machine.
- # If yes then this expands to _LP64:=1
- @LP64@
---- jdk8/common/autoconf/jdk-options.m4 2016-02-26 13:23:57.379257902 +0100
-+++ jdk8/common/autoconf/jdk-options.m4 2016-02-26 13:25:10.961590289 +0100
-@@ -158,7 +158,7 @@
- if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
- INCLUDE_SA=false
- fi
-- if test "x$VAR_CPU" = xppc64 ; then
-+ if test "x$VAR_CPU" = xppc64 -o "x$VAR_CPU" = xppc64le ; then
- INCLUDE_SA=false
- fi
- if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
---- jdk8/common/autoconf/platform.m4 2016-02-26 13:23:57.379257902 +0100
-+++ jdk8/common/autoconf/platform.m4 2016-02-26 13:25:10.961590289 +0100
-@@ -73,7 +73,7 @@
- VAR_CPU_ENDIAN=big
- ;;
- powerpc64le)
-- VAR_CPU=ppc64
-+ VAR_CPU=ppc64le
- VAR_CPU_ARCH=ppc
- VAR_CPU_BITS=64
- VAR_CPU_ENDIAN=little
---- jdk8/common/autoconf/toolchain.m4 2016-02-26 13:23:57.379257902 +0100
-+++ jdk8/common/autoconf/toolchain.m4 2016-02-26 13:25:10.961590289 +0100
-@@ -1056,6 +1056,9 @@
- else
- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN"
- fi
-+ if test "x$OPENJDK_TARGET_CPU" = xppc64le; then
-+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DABI_ELFv2"
-+ fi
- if test "x$OPENJDK_TARGET_OS" = xlinux; then
- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DLINUX"
- fi
---- jdk8/hotspot/make/defs.make 2016-02-26 13:23:55.307304861 +0100
-+++ jdk8/hotspot/make/defs.make 2016-02-26 13:25:10.961590289 +0100
-@@ -325,6 +325,13 @@
- LIBARCH/ppc64 = ppc64
- LIBARCH/zero = $(ZERO_LIBARCH)
-
-+ # Override LIBARCH for ppc64le
-+ ifeq ($(ARCH), ppc64)
-+ ifeq ($(OPENJDK_TARGET_CPU_ENDIAN), little)
-+ LIBARCH = ppc64le
-+ endif
-+ endif
-+
- LP64_ARCH += sparcv9 amd64 ia64 ppc64 zero
- endif
-
---- jdk8/jdk/make/lib/SoundLibraries.gmk 2016-02-26 13:23:55.795293801 +0100
-+++ jdk8/jdk/make/lib/SoundLibraries.gmk 2016-02-26 13:25:10.961590289 +0100
-@@ -143,6 +143,10 @@
- ifeq ($(OPENJDK_TARGET_CPU), aarch64)
- LIBJSOUND_CFLAGS += -DX_ARCH=X_AARCH64
- endif
-+
-+ ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
-+ LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC64LE
-+ endif
- endif
-
- LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"'
---- jdk8/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2016-02-26 13:23:56.283282740 +0100
-+++ jdk8/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2016-02-26 13:25:10.961590289 +0100
-@@ -43,7 +43,9 @@
- #define X_ZERO 6
- #define X_ARM 7
- #define X_PPC 8
--#define X_AARCH64 9
-+#define X_PPC64 9
-+#define X_PPC64LE 10
-+#define X_AARCH64 11
-
- // **********************************
- // Make sure you set X_PLATFORM and X_ARCH defines correctly.
---- jdk8/jdk/src/solaris/bin/ppc64le/jvm.cfg 1970-01-01 01:00:00.000000000 +0100
-+++ jdk8/jdk/src/solaris/bin/ppc64le/jvm.cfg 2016-02-26 13:25:10.961590289 +0100
-@@ -0,0 +1,33 @@
-+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# This code is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License version 2 only, as
-+# published by the Free Software Foundation. Oracle designates this
-+# particular file as subject to the "Classpath" exception as provided
-+# by Oracle in the LICENSE file that accompanied this code.
-+#
-+# This code is distributed in the hope that it will be useful, but WITHOUT
-+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+# version 2 for more details (a copy is included in the LICENSE file that
-+# accompanied this code).
-+#
-+# You should have received a copy of the GNU General Public License version
-+# 2 along with this work; if not, write to the Free Software Foundation,
-+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+#
-+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+# or visit www.oracle.com if you need additional information or have any
-+# questions.
-+#
-+# List of JVMs that can be used as an option to java, javac, etc.
-+# Order is important -- first in this list is the default JVM.
-+# NOTE that this both this file and its format are UNSUPPORTED and
-+# WILL GO AWAY in a future release.
-+#
-+# You may also select a JVM in an arbitrary location with the
-+# "-XXaltjvm=" option, but that too is unsupported
-+# and may not be available in a future release.
-+#
-+-server KNOWN
diff --git a/s390-java-opts.patch b/s390-java-opts.patch
deleted file mode 100644
index e6dab5d..0000000
--- a/s390-java-opts.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- jdk8/common/autoconf/boot-jdk.m4 2015-12-22 20:16:46.000000000 +0100
-+++ jdk8/common/autoconf/boot-jdk.m4 2016-01-23 13:16:40.069301419 +0100
-@@ -329,21 +329,12 @@
- AC_MSG_CHECKING([flags for boot jdk java command for big workloads])
-
- # Starting amount of heap memory.
-- ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])
-+ ADD_JVM_ARG_IF_OK([-Xms256M],boot_jdk_jvmargs_big,[$JAVA])
-
- # Maximum amount of heap memory.
- # Maximum stack size.
-- if test "x$BOOT_JDK_BITS" = x32; then
-- JVM_MAX_HEAP=1100M
-+ JVM_MAX_HEAP=768M
- STACK_SIZE=768
-- else
-- # Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit
-- # pointers are used. Apparently, we need to increase the heap and stack
-- # space for the jvm. More specifically, when running javac to build huge
-- # jdk batch
-- JVM_MAX_HEAP=1600M
-- STACK_SIZE=1536
-- fi
- ADD_JVM_ARG_IF_OK([-Xmx$JVM_MAX_HEAP],boot_jdk_jvmargs_big,[$JAVA])
- ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs_big,[$JAVA])
- ADD_JVM_ARG_IF_OK([-XX:PermSize=32m],boot_jdk_jvmargs_big,[$JAVA])
diff --git a/s390-size_t.patch b/s390-size_t.patch
deleted file mode 100644
index 3bd8002..0000000
--- a/s390-size_t.patch
+++ /dev/null
@@ -1,277 +0,0 @@
---- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2015-10-21 17:15:39.485338783 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2015-10-21 17:17:24.211977506 +0200
-@@ -2659,7 +2659,7 @@
- if (ResizeOldPLAB && CMSOldPLABResizeQuicker) {
- size_t multiple = _num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks);
- n_blks += CMSOldPLABReactivityFactor*multiple*n_blks;
-- n_blks = MIN2(n_blks, CMSOldPLABMax);
-+ n_blks = MIN2(n_blks, (size_t)CMSOldPLABMax);
- }
- assert(n_blks > 0, "Error");
- _cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl);
---- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2015-10-21 17:15:39.486338760 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2015-10-21 17:17:24.213977461 +0200
-@@ -957,7 +957,7 @@
- if (free_percentage < desired_free_percentage) {
- size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage));
- assert(desired_capacity >= capacity(), "invalid expansion size");
-- size_t expand_bytes = MAX2(desired_capacity - capacity(), MinHeapDeltaBytes);
-+ size_t expand_bytes = MAX2(desired_capacity - capacity(), (size_t)MinHeapDeltaBytes);
- if (PrintGCDetails && Verbose) {
- size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage));
- gclog_or_tty->print_cr("\nFrom compute_new_size: ");
-@@ -6577,7 +6577,7 @@
- HeapWord* curAddr = _markBitMap.startWord();
- while (curAddr < _markBitMap.endWord()) {
- size_t remaining = pointer_delta(_markBitMap.endWord(), curAddr);
-- MemRegion chunk(curAddr, MIN2(CMSBitMapYieldQuantum, remaining));
-+ MemRegion chunk(curAddr, MIN2((size_t)CMSBitMapYieldQuantum, remaining));
- _markBitMap.clear_large_range(chunk);
- if (ConcurrentMarkSweepThread::should_yield() &&
- !foregroundGCIsActive() &&
-@@ -6875,7 +6875,7 @@
- return;
- }
- // Double capacity if possible
-- size_t new_capacity = MIN2(_capacity*2, MarkStackSizeMax);
-+ size_t new_capacity = MIN2(_capacity*2, (size_t)MarkStackSizeMax);
- // Do not give up existing stack until we have managed to
- // get the double capacity that we desired.
- ReservedSpace rs(ReservedSpace::allocation_align_size_up(
---- jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2015-10-21 17:15:39.487338738 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2015-10-21 17:17:24.214977439 +0200
-@@ -3903,7 +3903,7 @@
- // of things to do) or totally (at the very end).
- size_t target_size;
- if (partially) {
-- target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize);
-+ target_size = MIN2((size_t)(_task_queue->max_elems()/3), (size_t)GCDrainStackTargetSize);
- } else {
- target_size = 0;
- }
---- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2015-10-21 17:15:39.487338738 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2015-10-21 17:17:24.215977416 +0200
-@@ -1726,7 +1726,7 @@
-
- verify_region_sets_optional();
-
-- size_t expand_bytes = MAX2(word_size * HeapWordSize, MinHeapDeltaBytes);
-+ size_t expand_bytes = MAX2(word_size * HeapWordSize, (size_t)MinHeapDeltaBytes);
- ergo_verbose1(ErgoHeapSizing,
- "attempt heap expansion",
- ergo_format_reason("allocation request failed")
---- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp 2015-10-21 17:15:39.488338715 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp 2015-10-21 17:17:24.217977371 +0200
-@@ -89,7 +89,7 @@
- void pretouch_internal(size_t start_page, size_t end_page);
-
- // Returns the index of the page which contains the given address.
-- uintptr_t addr_to_page_index(char* addr) const;
-+ size_t addr_to_page_index(char* addr) const;
- // Returns the address of the given page index.
- char* page_start(size_t index) const;
-
---- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2015-10-21 17:15:39.489338692 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2015-10-21 17:17:24.216977394 +0200
-@@ -38,7 +38,7 @@
- _cancel(false),
- _empty(true),
- _dropped(0) {
-- _nqueues = MAX2(ParallelGCThreads, (size_t)1);
-+ _nqueues = MAX2((size_t)ParallelGCThreads, (size_t)1);
- _queues = NEW_C_HEAP_ARRAY(G1StringDedupWorkerQueue, _nqueues, mtGC);
- for (size_t i = 0; i < _nqueues; i++) {
- new (_queues + i) G1StringDedupWorkerQueue(G1StringDedupWorkerQueue::default_segment_size(), _max_cache_size, _max_size);
---- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2015-10-21 17:15:39.489338692 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2015-10-21 17:17:24.216977394 +0200
-@@ -110,7 +110,7 @@
- };
-
- G1StringDedupEntryCache::G1StringDedupEntryCache() {
-- _nlists = MAX2(ParallelGCThreads, (size_t)1);
-+ _nlists = MAX2((size_t)ParallelGCThreads, (size_t)1);
- _lists = PaddedArray::create_unfreeable((uint)_nlists);
- }
-
---- jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2015-10-21 17:15:39.489338692 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2015-10-21 17:17:24.216977394 +0200
-@@ -109,7 +109,7 @@
- if (FLAG_IS_DEFAULT(G1HeapRegionSize)) {
- size_t average_heap_size = (initial_heap_size + max_heap_size) / 2;
- region_size = MAX2(average_heap_size / HeapRegionBounds::target_number(),
-- (uintx) HeapRegionBounds::min_size());
-+ (size_t) HeapRegionBounds::min_size());
- }
-
- int region_size_log = log2_long((jlong) region_size);
---- jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2015-10-21 17:15:39.492338625 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2015-10-21 17:17:24.217977371 +0200
-@@ -910,8 +910,8 @@
- void PSParallelCompact::initialize_dead_wood_limiter()
- {
- const size_t max = 100;
-- _dwl_mean = double(MIN2(ParallelOldDeadWoodLimiterMean, max)) / 100.0;
-- _dwl_std_dev = double(MIN2(ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
-+ _dwl_mean = double(MIN2((size_t)ParallelOldDeadWoodLimiterMean, max)) / 100.0;
-+ _dwl_std_dev = double(MIN2((size_t)ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
- _dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev);
- DEBUG_ONLY(_dwl_initialized = true;)
- _dwl_adjustment = normal_distribution(1.0);
---- jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2015-10-21 17:15:39.490338670 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2015-10-21 17:17:24.218977349 +0200
-@@ -194,7 +194,7 @@
- const size_t num_overflow_elems = of_stack->size();
- const size_t space_available = queue->max_elems() - queue->size();
- const size_t num_take_elems = MIN3(space_available / 4,
-- ParGCDesiredObjsFromOverflowList,
-+ (size_t)ParGCDesiredObjsFromOverflowList,
- num_overflow_elems);
- // Transfer the most recent num_take_elems from the overflow
- // stack to our work queue.
---- jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp 2015-10-21 17:15:39.497338512 +0200
-+++ jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp 2015-10-21 17:17:24.218977349 +0200
-@@ -385,7 +385,7 @@
- uintx calculated_size = NewSize + OldSize;
- double shrink_factor = (double) MaxHeapSize / calculated_size;
- uintx smaller_new_size = align_size_down((uintx)(NewSize * shrink_factor), _gen_alignment);
-- FLAG_SET_ERGO(uintx, NewSize, MAX2(young_gen_size_lower_bound(), smaller_new_size));
-+ FLAG_SET_ERGO(uintx, NewSize, MAX2(young_gen_size_lower_bound(), (size_t)smaller_new_size));
- _initial_gen0_size = NewSize;
-
- // OldSize is already aligned because above we aligned MaxHeapSize to
-@@ -433,7 +433,7 @@
- // yield a size that is too small) and bound it by MaxNewSize above.
- // Ergonomics plays here by previously calculating the desired
- // NewSize and MaxNewSize.
-- max_new_size = MIN2(MAX2(max_new_size, NewSize), MaxNewSize);
-+ max_new_size = MIN2(MAX2(max_new_size, (size_t)NewSize), (size_t)MaxNewSize);
- }
- assert(max_new_size > 0, "All paths should set max_new_size");
-
-@@ -455,23 +455,23 @@
- // lower limit.
- _min_gen0_size = NewSize;
- desired_new_size = NewSize;
-- max_new_size = MAX2(max_new_size, NewSize);
-+ max_new_size = MAX2(max_new_size, (size_t)NewSize);
- } else if (FLAG_IS_ERGO(NewSize)) {
- // If NewSize is set ergonomically, we should use it as a lower
- // limit, but use NewRatio to calculate the initial size.
- _min_gen0_size = NewSize;
- desired_new_size =
-- MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize);
-- max_new_size = MAX2(max_new_size, NewSize);
-+ MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), (size_t)NewSize);
-+ max_new_size = MAX2(max_new_size, (size_t)NewSize);
- } else {
- // For the case where NewSize is the default, use NewRatio
- // to size the minimum and initial generation sizes.
- // Use the default NewSize as the floor for these values. If
- // NewRatio is overly large, the resulting sizes can be too
- // small.
-- _min_gen0_size = MAX2(scale_by_NewRatio_aligned(_min_heap_byte_size), NewSize);
-+ _min_gen0_size = MAX2(scale_by_NewRatio_aligned(_min_heap_byte_size), (size_t)NewSize);
- desired_new_size =
-- MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize);
-+ MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), (size_t)NewSize);
- }
-
- assert(_min_gen0_size > 0, "Sanity check");
-@@ -573,7 +573,7 @@
- } else {
- // It's been explicitly set on the command line. Use the
- // OldSize and then determine the consequences.
-- _min_gen1_size = MIN2(OldSize, _min_heap_byte_size - _min_gen0_size);
-+ _min_gen1_size = MIN2((size_t)OldSize, _min_heap_byte_size - _min_gen0_size);
- _initial_gen1_size = OldSize;
-
- // If the user has explicitly set an OldSize that is inconsistent
---- jdk8/hotspot/src/share/vm/memory/metaspace.cpp 2015-10-21 17:15:39.498338490 +0200
-+++ jdk8/hotspot/src/share/vm/memory/metaspace.cpp 2015-10-21 17:17:24.219977326 +0200
-@@ -1455,7 +1455,7 @@
-
- void MetaspaceGC::post_initialize() {
- // Reset the high-water mark once the VM initialization is done.
-- _capacity_until_GC = MAX2(MetaspaceAux::committed_bytes(), MetaspaceSize);
-+ _capacity_until_GC = MAX2(MetaspaceAux::committed_bytes(), (size_t)MetaspaceSize);
- }
-
- bool MetaspaceGC::can_expand(size_t word_size, bool is_class) {
-@@ -1515,7 +1515,7 @@
- (size_t)MIN2(min_tmp, double(max_uintx));
- // Don't shrink less than the initial generation size
- minimum_desired_capacity = MAX2(minimum_desired_capacity,
-- MetaspaceSize);
-+ (size_t)MetaspaceSize);
-
- if (PrintGCDetails && Verbose) {
- gclog_or_tty->print_cr("\nMetaspaceGC::compute_new_size: ");
-@@ -1573,7 +1573,7 @@
- const double max_tmp = used_after_gc / minimum_used_percentage;
- size_t maximum_desired_capacity = (size_t)MIN2(max_tmp, double(max_uintx));
- maximum_desired_capacity = MAX2(maximum_desired_capacity,
-- MetaspaceSize);
-+ (size_t)MetaspaceSize);
- if (PrintGCDetails && Verbose) {
- gclog_or_tty->print_cr(" "
- " maximum_free_percentage: %6.2f"
-@@ -3245,7 +3245,7 @@
- // on the medium chunk list. The next chunk will be small and progress
- // from there. This size calculated by -version.
- _first_class_chunk_word_size = MIN2((size_t)MediumChunk*6,
-- (CompressedClassSpaceSize/BytesPerWord)*2);
-+ (size_t)(CompressedClassSpaceSize/BytesPerWord)*2);
- _first_class_chunk_word_size = align_word_size_up(_first_class_chunk_word_size);
- // Arbitrarily set the initial virtual space to a multiple
- // of the boot class loader size.
---- jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2015-10-21 17:15:39.501338422 +0200
-+++ jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2015-10-21 17:17:24.219977326 +0200
-@@ -48,7 +48,7 @@
- const size_t beg_index = size_t(index);
- assert(beg_index < len || len == 0, "index too large");
-
-- const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
-+ const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
- const size_t end_index = beg_index + stride;
- T* const base = (T*)a->base();
- T* const beg = base + beg_index;
-@@ -82,7 +82,7 @@
- const size_t beg_index = size_t(index);
- assert(beg_index < len || len == 0, "index too large");
-
-- const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
-+ const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
- const size_t end_index = beg_index + stride;
- T* const base = (T*)a->base();
- T* const beg = base + beg_index;
---- jdk8/hotspot/src/share/vm/runtime/arguments.cpp 2015-10-21 17:15:39.512338174 +0200
-+++ jdk8/hotspot/src/share/vm/runtime/arguments.cpp 2015-10-21 17:17:24.220977303 +0200
-@@ -1277,7 +1277,7 @@
- // NewSize was set on the command line and it is larger than
- // preferred_max_new_size.
- if (!FLAG_IS_DEFAULT(NewSize)) { // NewSize explicitly set at command-line
-- FLAG_SET_ERGO(uintx, MaxNewSize, MAX2(NewSize, preferred_max_new_size));
-+ FLAG_SET_ERGO(uintx, MaxNewSize, MAX2((size_t)NewSize, preferred_max_new_size));
- } else {
- FLAG_SET_ERGO(uintx, MaxNewSize, preferred_max_new_size);
- }
-@@ -1302,8 +1302,8 @@
- // Unless explicitly requested otherwise, make young gen
- // at least min_new, and at most preferred_max_new_size.
- if (FLAG_IS_DEFAULT(NewSize)) {
-- FLAG_SET_ERGO(uintx, NewSize, MAX2(NewSize, min_new));
-- FLAG_SET_ERGO(uintx, NewSize, MIN2(preferred_max_new_size, NewSize));
-+ FLAG_SET_ERGO(uintx, NewSize, MAX2((size_t)NewSize, min_new));
-+ FLAG_SET_ERGO(uintx, NewSize, MIN2(preferred_max_new_size, (size_t)NewSize));
- if (PrintGCDetails && Verbose) {
- // Too early to use gclog_or_tty
- tty->print_cr("CMS ergo set NewSize: " SIZE_FORMAT, NewSize);
-@@ -1313,7 +1313,7 @@
- // so it's NewRatio x of NewSize.
- if (FLAG_IS_DEFAULT(OldSize)) {
- if (max_heap > NewSize) {
-- FLAG_SET_ERGO(uintx, OldSize, MIN2(NewRatio*NewSize, max_heap - NewSize));
-+ FLAG_SET_ERGO(uintx, OldSize, MIN2((unsigned long)(NewRatio*NewSize), max_heap - NewSize));
- if (PrintGCDetails && Verbose) {
- // Too early to use gclog_or_tty
- tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize);
diff --git a/system-lcms.patch b/system-lcms.patch
deleted file mode 100644
index ccd080a..0000000
--- a/system-lcms.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- jdk8/common/autoconf/libraries.m4 2014-09-26 08:49:01.572737814 +0200
-+++ jdk8/common/autoconf/libraries.m4 2014-09-26 08:50:22.896853996 +0200
-@@ -679,6 +679,46 @@
-
- ###############################################################################
- #
-+ # Check for the lcms2 library
-+ #
-+
-+ AC_ARG_WITH(lcms, [AS_HELP_STRING([--with-lcms],
-+ [use lcms2 from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
-+
-+ AC_CHECK_LIB(lcms2, cmsOpenProfileFromFile,
-+ [ LCMS_FOUND=yes ],
-+ [ LCMS_FOUND=no ])
-+
-+ AC_MSG_CHECKING([for which lcms to use])
-+
-+ DEFAULT_LCMS=bundled
-+
-+ #
-+ # If user didn't specify, use DEFAULT_LCMS
-+ #
-+ if test "x${with_lcms}" = "x"; then
-+ with_lcms=${DEFAULT_LCMS}
-+ fi
-+
-+ if test "x${with_lcms}" = "xbundled"; then
-+ USE_EXTERNAL_LCMS=false
-+ AC_MSG_RESULT([bundled])
-+ elif test "x${with_lcms}" = "xsystem"; then
-+ if test "x${LCMS_FOUND}" = "xyes"; then
-+ USE_EXTERNAL_LCMS=true
-+ AC_MSG_RESULT([system])
-+ else
-+ AC_MSG_RESULT([system not found])
-+ AC_MSG_ERROR([--with-lcms=system specified, but no lcms found!])
-+ fi
-+ else
-+ AC_MSG_ERROR([Invalid value for --with-lcms: ${with_lcms}, use 'system' or 'bundled'])
-+ fi
-+
-+ AC_SUBST(USE_EXTERNAL_LCMS)
-+
-+ ###############################################################################
-+ #
- # Check for the png library
- #
-
---- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:49:00.981751504 +0200
-+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:50:22.897853978 +0200
-@@ -669,8 +669,8 @@
- ##########################################################################################
-
- # TODO: Update awt lib path when awt is converted
--$(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
-- LIBRARY := lcms, \
-+$(eval $(call SetupNativeCompilation,BUILD_LIBJAVALCMS, \
-+ LIBRARY := javalcms, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
- LANG := C, \
-@@ -688,19 +688,19 @@
- LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
- LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \
- LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \
-- LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \
-+ LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm -llcms2, \
- LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm,\
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
-- -D "JDK_FNAME=lcms.dll" \
-- -D "JDK_INTERNAL_NAME=lcms" \
-+ -D "JDK_FNAME=javalcms.dll" \
-+ -D "JDK_INTERNAL_NAME=javalcms" \
- -D "JDK_FTYPE=0x2L", \
-- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/liblcms, \
-+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavalcms, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
--BUILD_LIBRARIES += $(BUILD_LIBLCMS)
-+BUILD_LIBRARIES += $(BUILD_LIBJAVALCMS)
-
--$(BUILD_LIBLCMS): $(BUILD_LIBAWT)
-+$(BUILD_LIBJAVALCMS): $(BUILD_LIBAWT)
-
- ##########################################################################################
-
---- jdk8/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java 2014-09-26 08:49:00.646759264 +0200
-+++ jdk8/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java 2014-09-26 08:50:22.897853978 +0200
-@@ -207,7 +207,7 @@
- * disposer frameworks
- */
- System.loadLibrary("awt");
-- System.loadLibrary("lcms");
-+ System.loadLibrary("javalcms");
- return null;
- }
- });
diff --git a/system-libjpeg.patch b/system-libjpeg.patch
deleted file mode 100644
index ecbb6a1..0000000
--- a/system-libjpeg.patch
+++ /dev/null
@@ -1,240 +0,0 @@
---- jdk8/common/autoconf/libraries.m4 2015-02-17 13:27:11.468829365 +0100
-+++ jdk8/common/autoconf/libraries.m4 2015-02-17 13:27:49.143980484 +0100
-@@ -608,11 +608,36 @@
- # Check for the jpeg library
- #
-
-+ AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg],
-+ [use libjpeg from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
-+
-+ AC_MSG_CHECKING([for which libjpeg to use])
-+
-+ # default is bundled
-+ DEFAULT_LIBJPEG=bundled
-+
-+ #
-+ # if user didn't specify, use DEFAULT_LIBJPEG
-+ #
-+ if test "x${with_libjpeg}" = "x"; then
-+ with_libjpeg=${DEFAULT_LIBJPEG}
-+ fi
-+
-+ AC_MSG_RESULT(${with_libjpeg})
-+
-+ if test "x${with_libjpeg}" = "xbundled"; then
-+ USE_EXTERNAL_LIBJPEG=false
-+ elif test "x${with_libjpeg}" = "xsystem"; then
-+ AC_CHECK_HEADER(jpeglib.h, [],
-+ [ AC_MSG_ERROR([--with-libjpeg=system specified, but jpeglib.h not found!])])
-+ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [],
-+ [ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])])
-+
- USE_EXTERNAL_LIBJPEG=true
-- AC_CHECK_LIB(jpeg, main, [],
-- [ USE_EXTERNAL_LIBJPEG=false
-- AC_MSG_NOTICE([Will use jpeg decoder bundled with the OpenJDK source])
-- ])
-+ else
-+ AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled'])
-+ fi
-+
- AC_SUBST(USE_EXTERNAL_LIBJPEG)
-
- ###############################################################################
---- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2015-02-17 13:25:22.125292473 +0100
-+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2015-02-17 13:28:30.812041352 +0100
-@@ -704,18 +704,20 @@
-
- ##########################################################################################
-
-+BUILD_LIBJAVAJPEG_DIR := $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
-+
- ifdef OPENJDK
-- BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers
-+ BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers
- else
-- BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed
-- BUILD_LIBJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg
-- BUILD_LIBJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJPEG_CLOSED_SRC)
-+ BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed
-+ BUILD_LIBJAVAJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg
-+ BUILD_LIBJAVAJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJAVAJPEG_CLOSED_SRC)
- endif
-
--BUILD_LIBJPEG_REORDER :=
-+BUILD_LIBJAVAJPEG_REORDER :=
- ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifneq ($(OPENJDK_TARGET_CPU), x86_64)
-- BUILD_LIBJPEG_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
-+ BUILD_LIBJAVAJPEG_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
- endif
- endif
-
-@@ -730,37 +733,50 @@
- # $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \
- # \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) )
- # ifeq ($(CC_43_OR_NEWER), 1)
--# BUILD_LIBJPEG_CFLAGS_linux += -Wno-clobbered
-+# BUILD_LIBJAVAJPEG_CFLAGS_linux += -Wno-clobbered
- # endif
- #endif
-
--$(eval $(call SetupNativeCompilation,BUILD_LIBJPEG, \
-- LIBRARY := jpeg, \
-+ifeq ($(USE_EXTERNAL_LIBJPEG), true)
-+ LIBJPEG_LIBS := -ljpeg
-+ BUILD_LIBJAVAJPEG_INCLUDE_FILES := \
-+ imageioJPEG.c \
-+ jpegdecoder.c
-+ BUILD_LIBJAVAJPEG_HEADERS :=
-+else
-+ LIBJPEG_LIBS :=
-+ BUILD_LIBJAVAJPEG_INCLUDE_FILES :=
-+ BUILD_LIBJAVAJPEG_HEADERS := -I$(BUILD_LIBJAVAJPEG_DIR)
-+endif
-+
-+$(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \
-+ LIBRARY := javajpeg, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-- SRC := $(BUILD_LIBJPEG_CLOSED_SRC) \
-- $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
-+ SRC := $(BUILD_LIBJAVAJPEG_CLOSED_SRC) \
-+ $(BUILD_LIBJAVAJPEG_DIR), \
-+ INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
- LANG := C, \
- OPTIMIZATION := HIGHEST, \
- CFLAGS := $(CFLAGS_JDKLIB) \
-- $(BUILD_LIBJPEG_CLOSED_INCLUDES) \
-- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
-- MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \
-- LDFLAGS := $(LDFLAGS_JDKLIB) \
-+ $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \
-+ $(BUILD_LIBJAVAJPEG_HEADERS), \
-+ MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
-+ LDFLAGS := $(LDFLAGS_JDKLIB) $(LIBJPEG_LIBS) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \
- LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
-- -D "JDK_FNAME=jpeg.dll" \
-- -D "JDK_INTERNAL_NAME=jpeg" \
-+ -D "JDK_FNAME=javajpeg.dll" \
-+ -D "JDK_INTERNAL_NAME=javajpeg" \
- -D "JDK_FTYPE=0x2L", \
-- REORDER := $(BUILD_LIBJPEG_REORDER), \
-+ REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
--$(BUILD_LIBJPEG): $(BUILD_LIBJAVA)
-+$(BUILD_LIBJAVAJPEG): $(BUILD_LIBJAVA)
-
--BUILD_LIBRARIES += $(BUILD_LIBJPEG)
-+BUILD_LIBRARIES += $(BUILD_LIBJAVAJPEG)
-
- ##########################################################################################
-
-@@ -1206,6 +1222,13 @@
- GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
- endif
-
-+ ifeq ($(USE_EXTERNAL_LIBJPEG), true)
-+ LIBJPEG_LDFLAGS := -ljpeg
-+ else
-+ LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
-+ LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
-+ endif
-+
- ifneq ($(OPENJDK_TARGET_OS), macosx)
- LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
- else
-@@ -1268,11 +1291,13 @@
- EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
- LANG := C, \
- OPTIMIZATION := LOW, \
-- CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) $(GIFLIB_CFLAGS), \
-+ CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
-+ $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
-- LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS), \
-+ LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \
-+ $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
---- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2015-02-17 13:25:22.295288644 +0100
-+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2015-02-17 13:27:49.145980439 +0100
-@@ -89,7 +89,7 @@
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public Void run() {
-- System.loadLibrary("jpeg");
-+ System.loadLibrary("javajpeg");
- return null;
- }
- });
---- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2015-02-17 13:25:22.295288644 +0100
-+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2015-02-17 13:27:49.145980439 +0100
-@@ -179,7 +179,7 @@
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public Void run() {
-- System.loadLibrary("jpeg");
-+ System.loadLibrary("javajpeg");
- return null;
- }
- });
---- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2015-02-17 13:25:22.170291459 +0100
-+++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2015-02-17 13:27:49.146980416 +0100
-@@ -56,7 +56,7 @@
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public Void run() {
-- System.loadLibrary("jpeg");
-+ System.loadLibrary("javajpeg");
- return null;
- }
- });
---- jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2015-02-17 13:25:22.531283329 +0100
-+++ jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2015-02-17 13:27:49.146980416 +0100
-@@ -51,7 +51,7 @@
-
- /* headers from the JPEG library */
- #include
--#include "jerror.h"
-+#include
-
- #undef MAX
- #define MAX(a,b) ((a) > (b) ? (a) : (b))
---- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2015-02-17 13:25:22.539283148 +0100
-+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2015-02-17 13:27:49.147980394 +0100
-@@ -25,9 +25,9 @@
-
- #include "splashscreen_impl.h"
-
--#include "jinclude.h"
--#include "jpeglib.h"
--#include "jerror.h"
-+#include
-+#include
-+#include
-
- #include
-
-@@ -113,11 +113,11 @@
- if (cinfo->src == NULL) { /* first time for this JPEG object? */
- cinfo->src = (struct jpeg_source_mgr *)
- (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo,
-- JPOOL_PERMANENT, SIZEOF(stream_source_mgr));
-+ JPOOL_PERMANENT, sizeof(stream_source_mgr));
- src = (stream_src_ptr) cinfo->src;
- src->buffer = (JOCTET *)
- (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo,
-- JPOOL_PERMANENT, INPUT_BUF_SIZE * SIZEOF(JOCTET));
-+ JPOOL_PERMANENT, INPUT_BUF_SIZE * sizeof(JOCTET));
- }
-
- src = (stream_src_ptr) cinfo->src;
diff --git a/system-libpng.patch b/system-libpng.patch
deleted file mode 100644
index b350866..0000000
--- a/system-libpng.patch
+++ /dev/null
@@ -1,111 +0,0 @@
---- jdk8/common/autoconf/libraries.m4 2014-09-26 08:45:01.057310067 +0200
-+++ jdk8/common/autoconf/libraries.m4 2014-09-26 08:46:38.602049970 +0200
-@@ -679,6 +679,47 @@
-
- ###############################################################################
- #
-+ # Check for the png library
-+ #
-+
-+ AC_ARG_WITH(libpng, [AS_HELP_STRING([--with-libpng],
-+ [use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
-+
-+ AC_CHECK_LIB(png, png_sig_cmp,
-+ [ LIBPNG_FOUND=yes ],
-+ [ LIBPNG_FOUND=no ])
-+
-+ AC_MSG_CHECKING([for which libpng to use])
-+
-+ # default is bundled
-+ DEFAULT_LIBPNG=bundled
-+
-+ #
-+ # if user didn't specify, use DEFAULT_LIBPNG
-+ #
-+ if test "x${with_libpng}" = "x"; then
-+ with_libpng=${DEFAULT_libpng}
-+ fi
-+
-+
-+ if test "x${with_libpng}" = "xbundled"; then
-+ USE_EXTERNAL_LIBPNG=false
-+ AC_MSG_RESULT([bundled])
-+ elif test "x${with_libpng}" = "xsystem"; then
-+ if test "x${LIBPNG_FOUND}" = "xyes"; then
-+ USE_EXTERNAL_LIBPNG=true
-+ AC_MSG_RESULT([system])
-+ else
-+ AC_MSG_RESULT([system not found])
-+ AC_MSG_ERROR([--with-libpng=system specified, but no libpng found!])
-+ fi
-+ else
-+ AC_MSG_ERROR([Invalid value of --with-libpng: ${with_libpng}, use 'system' or 'bundled'])
-+ fi
-+ AC_SUBST(USE_EXTERNAL_LIBPNG)
-+
-+ ###############################################################################
-+ #
- # Check for the zlib library
- #
-
---- jdk8/common/autoconf/spec.gmk.in 2014-09-26 08:45:01.057310067 +0200
-+++ jdk8/common/autoconf/spec.gmk.in 2014-09-26 08:46:38.603049945 +0200
-@@ -555,6 +555,7 @@
- ENABLE_JFR=@ENABLE_JFR@
- ENABLE_INTREE_EC=@ENABLE_INTREE_EC@
- USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
-+USE_EXTERNAL_LIBPNG:=@USE_EXTERNAL_LIBPNG@
- USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
- USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
- LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@
---- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:45:00.475323552 +0200
-+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:46:38.603049945 +0200
-@@ -1211,7 +1211,6 @@
- ifndef BUILD_HEADLESS_ONLY
- LIBSPLASHSCREEN_DIRS := \
- $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
-- $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
- $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
-
- ifeq ($(USE_EXTERNAL_LIBGIF), true)
-@@ -1228,6 +1227,13 @@
- LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
- endif
-
-+ ifeq ($(USE_EXTERNAL_LIBPNG), true)
-+ LIBPNG_LDFLAGS := -lpng
-+ else
-+ LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/image/libpng
-+ LIBPNG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/libpng
-+ endif
-+
- ifneq ($(OPENJDK_TARGET_OS), macosx)
- LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
- else
-@@ -1291,12 +1297,12 @@
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
-- $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS), \
-+ $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(LIBPNG_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \
-- $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS), \
-+ $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(LIBPNG_LDFLAGS), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
---- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2014-09-26 08:45:00.414324966 +0200
-+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2014-09-26 08:46:38.603049945 +0200
-@@ -25,8 +25,7 @@
-
- #include "splashscreen_impl.h"
-
--#include "../libpng/png.h"
--
-+#include
- #include
-
- #define SIG_BYTES 8
diff --git a/systemtap-tapset.tar.gz b/systemtap-tapset.tar.gz
deleted file mode 100644
index 62cfb0d..0000000
--- a/systemtap-tapset.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2f3a47f150b94421f8a64a9d73deea5f60a11fae2c48636fe4533197f91573a4
-size 26712
diff --git a/zero-dummy.patch b/zero-dummy.patch
deleted file mode 100644
index 31c3e85..0000000
--- a/zero-dummy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- jdk8/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2015-06-10 10:06:49.485230587 +0200
-+++ jdk8/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2015-06-10 10:07:33.645229254 +0200
-@@ -55,8 +55,8 @@
- #include "utilities/vmError.hpp"
-
- address os::current_stack_pointer() {
-- address dummy = (address) &dummy;
-- return dummy;
-+ // return the address of the current function
-+ return (address)__builtin_frame_address(0);
- }
-
- frame os::get_sender_for_C_frame(frame* fr) {
diff --git a/zero-javadoc-verbose.patch b/zero-javadoc-verbose.patch
index d105a2a..ab71b7f 100644
--- a/zero-javadoc-verbose.patch
+++ b/zero-javadoc-verbose.patch
@@ -1,7 +1,5 @@
-Index: jdk8u-3e6d3c8810ee/make/Javadoc.gmk
-===================================================================
---- jdk8u-3e6d3c8810ee.orig/make/Javadoc.gmk
-+++ jdk8u-3e6d3c8810ee/make/Javadoc.gmk
+--- openjdk/make/Javadoc.gmk
++++ openjdk/make/Javadoc.gmk
@@ -260,7 +260,6 @@ $(call CopyrightLine,$(COPYRIGHT_URL),$(
# Common javadoc options used by all
COMMON_JAVADOCFLAGS = \