- put -D__STDC_LIMIT_MACROS on command line instead of patching it everywhere

- don't use ALT_JDK_IMPORT_PATH on SunOS, just build like on other platforms
- regen all bootstraps to facilitate removal of the +UseSerialGC hacks
- bootstrap binaries on FTP are now PGP signed
- remove a handful of obsolete patches

6 files changed, 8 insertions, 152 deletions

diff --git a/lang/openjdk8/patches/patch-common_autoconf_spec.gmk.in b/lang/openjdk8/patches/patch-common_autoconf_spec.gmk.in
index f7d10ce8cf0..db22f576457 100644
--- a/lang/openjdk8/patches/patch-common_autoconf_spec.gmk.in
+++ b/lang/openjdk8/patches/patch-common_autoconf_spec.gmk.in
@@ -1,16 +1,7 @@
-$NetBSD: patch-common_autoconf_spec.gmk.in,v 1.2 2015/02/20 09:38:00 tnn Exp $
+$NetBSD: patch-common_autoconf_spec.gmk.in,v 1.3 2015/03/02 03:53:26 tnn Exp $
 
 --- common/autoconf/spec.gmk.in.orig	2015-02-02 15:31:06.000000000 +0000
 +++ common/autoconf/spec.gmk.in
-@@ -249,7 +249,7 @@ BUILD_HOTSPOT=@BUILD_HOTSPOT@
- 
- # The boot jdk to use
- BOOT_JDK:=@BOOT_JDK@
--BOOT_JDK_JVMARGS:=@BOOT_JDK_JVMARGS@
-+BOOT_JDK_JVMARGS:=@BOOT_JDK_JVMARGS@ $(PKGSRC_BOOT_JDK_JVMARGS)
- BOOT_RTJAR:=@BOOT_RTJAR@
- BOOT_TOOLSJAR=$(BOOT_JDK)/lib/tools.jar
- 
 @@ -349,7 +349,8 @@ LD:=@FIXPATH@ @LD@
  USING_BROKEN_SUSE_LD:=@USING_BROKEN_SUSE_LD@
  
@@ -21,35 +12,12 @@ $NetBSD: patch-common_autoconf_spec.gmk.in,v 1.2 2015/02/20 09:38:00 tnn Exp $
  LDFLAGS_JDKLIB_SUFFIX:=@LDFLAGS_JDKLIB_SUFFIX@
  
  # On some platforms the linker cannot be used to create executables, thus
-@@ -436,24 +437,24 @@ OBJ_SUFFIX:=@OBJ_SUFFIX@
- POST_STRIP_CMD:=@POST_STRIP_CMD@
- POST_MCS_CMD:=@POST_MCS_CMD@
- 
--JAVA_FLAGS:=@BOOT_JDK_JVMARGS@
-+JAVA_FLAGS:=@BOOT_JDK_JVMARGS@ $(PKGSRC_BOOT_JDK_JVMARGS)
- 
- JAVA=@FIXPATH@ $(BOOT_JDK)/bin/java $(JAVA_FLAGS)
- 
+@@ -443,7 +444,7 @@ JAVA=@FIXPATH@ $(BOOT_JDK)/bin/java $(JA
  JAVAC=@FIXPATH@ $(BOOT_JDK)/bin/javac
  # Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid
  # overriding that value by using ?=.
 -JAVAC_FLAGS?=@JAVAC_FLAGS@
 +JAVAC_FLAGS?=@JAVAC_FLAGS@ -encoding UTF-8 -verbose
  
--JAVAH=@FIXPATH@ $(BOOT_JDK)/bin/javah
-+JAVAH=@FIXPATH@ $(BOOT_JDK)/bin/javah $(PKGSRC_BOOT_JDK_TOOLARGS)
- 
--JAR=@FIXPATH@ $(BOOT_JDK)/bin/jar
-+JAR=@FIXPATH@ $(BOOT_JDK)/bin/jar $(PKGSRC_BOOT_JDK_TOOLARGS)
- 
--RMIC=@FIXPATH@ $(BOOT_JDK)/bin/rmic
-+RMIC=@FIXPATH@ $(BOOT_JDK)/bin/rmic $(PKGSRC_BOOT_JDK_TOOLARGS)
- 
--NATIVE2ASCII=@FIXPATH@ $(BOOT_JDK)/bin/native2ascii
-+NATIVE2ASCII=@FIXPATH@ $(BOOT_JDK)/bin/native2ascii $(PKGSRC_BOOT_JDK_TOOLARGS)
- 
--JARSIGNER=@FIXPATH@ $(BOOT_JDK)/bin/jarsigner
-+JARSIGNER=@FIXPATH@ $(BOOT_JDK)/bin/jarsigner $(PKGSRC_BOOT_JDK_TOOLARGS)
+ JAVAH=@FIXPATH@ $(BOOT_JDK)/bin/javah
  
- # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...
- BOOTSTRAP_JAVAC_JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
diff --git a/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_gcc.make b/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_gcc.make
deleted file mode 100644
index f032047c445..00000000000
--- a/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_gcc.make
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-hotspot_make_bsd_makefiles_gcc.make,v 1.1 2015/02/21 20:21:56 tnn Exp $
-
-Don't build with -O3 on ARM; produces flaky results with GCC 4.8.2.
-
---- hotspot/make/bsd/makefiles/gcc.make.orig	2015-02-02 15:32:37.000000000 +0000
-+++ hotspot/make/bsd/makefiles/gcc.make
-@@ -298,6 +298,8 @@ ifeq ($(OS_VENDOR), Darwin)
-   # use -Os by default, unless -O3 can be proved to be worth the cost, as per policy
-   # <http://wikis.sun.com/display/OpenJDK/Mac+OS+X+Port+Compilers>
-   OPT_CFLAGS_DEFAULT ?= SIZE
-+else ifeq ($(LIBARCH), arm)
-+  OPT_CFLAGS_DEFAULT ?= SIZE
- else
-   OPT_CFLAGS_DEFAULT ?= SPEED
- endif
diff --git a/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_rules.make b/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_rules.make
deleted file mode 100644
index d058eefa1ff..00000000000
--- a/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_rules.make
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-hotspot_make_bsd_makefiles_rules.make,v 1.1 2015/02/08 08:41:25 tnn Exp $
-
---- hotspot/make/bsd/makefiles/rules.make.orig	2015-02-02 15:32:37.000000000 +0000
-+++ hotspot/make/bsd/makefiles/rules.make
-@@ -68,24 +68,24 @@ REMOVE_TARGET   = rm -f $@
- 
- ifdef ALT_BOOTDIR
- 
--RUN.JAVA  = $(ALT_BOOTDIR)/bin/java
--RUN.JAVAP = $(ALT_BOOTDIR)/bin/javap
--RUN.JAVAH = $(ALT_BOOTDIR)/bin/javah
--RUN.JAR   = $(ALT_BOOTDIR)/bin/jar
--COMPILE.JAVAC = $(ALT_BOOTDIR)/bin/javac
--COMPILE.RMIC = $(ALT_BOOTDIR)/bin/rmic
-+RUN.JAVA  = $(ALT_BOOTDIR)/bin/java $(PKGSRC_BOOT_JDK_JVMARGS)
-+RUN.JAVAP = $(ALT_BOOTDIR)/bin/javap $(PKGSRC_BOOT_JDK_TOOLARGS)
-+RUN.JAVAH = $(ALT_BOOTDIR)/bin/javah $(PKGSRC_BOOT_JDK_TOOLARGS)
-+RUN.JAR   = $(ALT_BOOTDIR)/bin/jar $(PKGSRC_BOOT_JDK_TOOLARGS)
-+COMPILE.JAVAC = $(ALT_BOOTDIR)/bin/javac $(PKGSRC_BOOT_JDK_TOOLARGS)
-+COMPILE.RMIC = $(ALT_BOOTDIR)/bin/rmic $(PKGSRC_BOOT_JDK_TOOLARGS)
- BOOT_JAVA_HOME = $(ALT_BOOTDIR)
- 
- else
- 
- ifdef BOOTDIR
- 
--RUN.JAVA  = $(BOOTDIR)/bin/java
--RUN.JAVAP = $(BOOTDIR)/bin/javap
--RUN.JAVAH = $(BOOTDIR)/bin/javah
--RUN.JAR   = $(BOOTDIR)/bin/jar
--COMPILE.JAVAC = $(BOOTDIR)/bin/javac
--COMPILE.RMIC  = $(BOOTDIR)/bin/rmic
-+RUN.JAVA  = $(BOOTDIR)/bin/java $(PKGSRC_BOOT_JDK_JVMARGS)
-+RUN.JAVAP = $(BOOTDIR)/bin/javap $(PKGSRC_BOOT_JDK_TOOLARGS)
-+RUN.JAVAH = $(BOOTDIR)/bin/javah $(PKGSRC_BOOT_JDK_TOOLARGS)
-+RUN.JAR   = $(BOOTDIR)/bin/jar $(PKGSRC_BOOT_JDK_TOOLARGS)
-+COMPILE.JAVAC = $(BOOTDIR)/bin/javac $(PKGSRC_BOOT_JDK_TOOLARGS)
-+COMPILE.RMIC  = $(BOOTDIR)/bin/rmic $(PKGSRC_BOOT_JDK_TOOLARGS)
- BOOT_JAVA_HOME = $(BOOTDIR)
- 
- else
-@@ -129,7 +129,7 @@ RUN.JAR$(MAKE_VERBOSE) += >/dev/null
- BOOT_SOURCE_LANGUAGE_VERSION = 6
- BOOT_TARGET_CLASS_VERSION = 6
- JAVAC_FLAGS = -g -encoding ascii
--BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) $(PKGSRC_BOOT_JDK_TOOLARGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
- 
- # With parallel makes, print a message at the end of compilation.
- ifeq    ($(findstring j,$(MFLAGS)),j)
diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp
index 9d12d56ccfa..78f956f1296 100644
--- a/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp
+++ b/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp
@@ -1,33 +1,13 @@
-$NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.1 2015/03/01 21:43:50 tnn Exp $
+$NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.2 2015/03/02 03:53:26 tnn Exp $
 
 --- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig	2015-02-02 15:32:37.000000000 +0000
 +++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
-@@ -31,6 +31,16 @@
- // globally used constants & types, class (forward)
- // declarations and a few frequently used utility functions.
- 
-+#ifndef __STDC_CONSTANT_MACROS
-+#define __STDC_CONSTANT_MACROS
-+#endif
-+#ifndef __STDC_FORMAT_MACROS
-+#define __STDC_FORMAT_MACROS
-+#endif
-+#ifndef __STDC_LIMIT_MACROS
-+#define __STDC_LIMIT_MACROS
-+#endif
-+
- #include <ctype.h>
- #include <string.h>
- #include <stdarg.h>
-@@ -76,10 +86,7 @@
+@@ -76,7 +76,7 @@
  # include <sys/procfs.h>
  # endif
  
 -#if defined(LINUX) || defined(_ALLBSD_SOURCE)
--#ifndef __STDC_LIMIT_MACROS
--#define __STDC_LIMIT_MACROS
--#endif // __STDC_LIMIT_MACROS
 +#if defined(LINUX) || defined(_ALLBSD_SOURCE) || defined(SOLARIS)
- #include <inttypes.h>
- #include <signal.h>
- #ifndef __OpenBSD__
+ #ifndef __STDC_LIMIT_MACROS
+ #define __STDC_LIMIT_MACROS
+ #endif // __STDC_LIMIT_MACROS
diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_vmError.cpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_vmError.cpp
deleted file mode 100644
index 14a2d892f50..00000000000
--- a/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_vmError.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-hotspot_src_share_vm_utilities_vmError.cpp,v 1.1 2015/03/01 21:43:50 tnn Exp $
-
-Don't include system headers before setting feature test macros.
-
---- hotspot/src/share/vm/utilities/vmError.cpp.orig	2015-02-02 15:32:37.000000000 +0000
-+++ hotspot/src/share/vm/utilities/vmError.cpp
-@@ -22,7 +22,6 @@
-  *
-  */
- 
--#include <fcntl.h>
- #include "precompiled.hpp"
- #include "compiler/compileBroker.hpp"
- #include "gc_interface/collectedHeap.hpp"
diff --git a/lang/openjdk8/patches/patch-langtools_make_BuildLangtools.gmk b/lang/openjdk8/patches/patch-langtools_make_BuildLangtools.gmk
deleted file mode 100644
index 940f9eab22d..00000000000
--- a/lang/openjdk8/patches/patch-langtools_make_BuildLangtools.gmk
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-langtools_make_BuildLangtools.gmk,v 1.1 2015/02/08 08:41:25 tnn Exp $
-
---- langtools/make/BuildLangtools.gmk.orig	2015-02-02 15:31:46.000000000 +0000
-+++ langtools/make/BuildLangtools.gmk
-@@ -36,7 +36,7 @@ $(eval $(call SetupJavaCompiler,BOOT_JAV
-     JAVAC := $(JAVAC), \
-     SERVER_DIR := $(SJAVAC_SERVER_DIR), \
-     SERVER_JVM := $(SJAVAC_SERVER_JAVA), \
--    FLAGS := -XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation -Werror))
-+    FLAGS := $(PKGSRC_BOOT_JDK_TOOLARGS) -XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation -Werror))
- 
- # javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied.
- RESOURCE_SUFFIXES := .gif .xml .css .js javax.tools.JavaCompilerTool