- 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

9 files changed, 66 insertions, 221 deletions

diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile
index 1ec6149817d..8184433cd32 100644
--- a/lang/openjdk8/Makefile
+++ b/lang/openjdk8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/02/21 11:02:00 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2015/03/02 03:53:26 tnn Exp $
 
 DISTNAME=	openjdk-1.8.31-20150207
 PKGNAME=	openjdk8-1.8.31
@@ -54,9 +54,6 @@ CONFIGURE_ARGS+=	--disable-ccache
 CONFIGURE_ARGS+=	--with-user-release-suffix=pkgsrc_${PKGVERSION}
 CONFIGURE_ARGS+=	--with-update-version=u${PKGVERSION_NOREV:S/1.8.//}
 
-ALL_ENV+=		PKGSRC_BOOT_JDK_JVMARGS="-XX:+UseSerialGC -Xmx768M"
-ALL_ENV+=		PKGSRC_BOOT_JDK_TOOLARGS="-J-XX:+UseSerialGC -J-Xmx768M"
-
 CHECK_PORTABILITY_SKIP+=	hotspot/test/runtime/*/*.sh
 
 # Avoid build errors when JAVA_HOME and CLASSPATH are defined by user.
@@ -82,6 +79,9 @@ SUBST_STAGE.libpath=	pre-build
 SUBST_FILES.libpath+=	hotspot/src/os/bsd/vm/os_bsd.cpp
 SUBST_VARS.libpath=	PREFIX
 
+CFLAGS+=	-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
+CXXFLAGS+=	-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
+
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CC+=	-Wno-return-type
 CWRAPPERS_APPEND.cc+=	-Wno-return-type
@@ -125,20 +125,13 @@ SUBST_SED.fontpaths=		-e 's|@PREFIX@|${PREFIX}|g'
 SUBST_SED.fontpaths+=		-e 's|@BUILDLINK_PREFIX.fontconfig@|${BUILDLINK_PREFIX.fontconfig}|g'
 
 post-extract:
-.if ${OPSYS} == "SunOS"
-	${MKDIR} ${ALT_BOOTDIR}/bin
-	${LN} -s ${JDK_BOOTDIR}/include ${ALT_BOOTDIR}/include
-	${LN} -s ${JDK_BOOTDIR}/lib ${ALT_BOOTDIR}/lib
-	${LN} -s ${JDK_BOOTDIR}/bin/java ${ALT_BOOTDIR}/bin
-	${LN} -s ${JDK_BOOTDIR}/bin/javac ${ALT_BOOTDIR}/bin
-	${LN} -s ${JDK_BOOTDIR}/bin/javah ${ALT_BOOTDIR}/bin
-	${LN} -s ${JDK_BOOTDIR}/bin/javap ${ALT_BOOTDIR}/bin
-	${LN} -s ${JDK_BOOTDIR}/bin/idlj ${ALT_BOOTDIR}/bin
-	${LN} -s ${JDK_BOOTDIR}/bin/jar ${ALT_BOOTDIR}/bin
-	${LN} -s ${JDK_BOOTDIR}/bin/native2ascii ${ALT_BOOTDIR}/bin
-	${LN} -s ${JDK_BOOTDIR}/bin/rmic ${ALT_BOOTDIR}/bin
-.elif ${OPSYS} == "NetBSD" && exists(${.CURDIR}/libs)
-	cp ${.CURDIR}/libs/lib* ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}
+# These libs are bundled w/ the netbsd-7 bootstrap to facilitate building with
+# MKLLVM=yes / MKGCC=no. Nuke them from bootstrap if they are present in base.
+.if exists(/lib/libgcc_s.so.1)
+	${RM} -f ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}/libgcc_s.so*
+.endif
+.if exists(/usr/lib/libstdc++.so.7)
+	${RM} -f ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}/libstdc++.so*
 .endif
 
 do-build: ${WRKDIR}/stage3-done
diff --git a/lang/openjdk8/bootstrap.mk b/lang/openjdk8/bootstrap.mk
index e9150c36768..5f8673c374b 100644
--- a/lang/openjdk8/bootstrap.mk
+++ b/lang/openjdk8/bootstrap.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.4 2015/02/22 08:40:07 tnn Exp $
+# $NetBSD: bootstrap.mk,v 1.5 2015/03/02 03:53:26 tnn Exp $
 #
 # This file contains a map of available binary bootstrap toolchains
 # and which kit to use for each supported platform.
@@ -14,33 +14,30 @@
 #  8) When preparing kits for NetBSD 7 and above with gcc, copy libgcc_s.so.*
 #     and libstdc++.so.* from base to bootstrap/jre/lib/${LIBDIR_ARCH}.
 #     This will ensure that MKLLVM=yes/MKGCC=no user in the future can run
-#     the bootstrap toolchain.
+#     the bootstrap toolchain. For targets that use jdk-zero-vm you need
+#     to include libffi.so.* as well.
 #  9) tar cf - bootstrap | xz -9c > bootstrap-xxx.tar.xz
-# 10) gpg --sign -a bootstrap-xxx.tar.xz
+# 10) gpg2 -a --detach-sign bootstrap-xxx.tar.xz
 # 11) Upload archive and signature to ${MASTER_SITE_LOCAL:=openjdk7/}
 #
 # All binary kits from now on MUST have an accompanying PGP signature from
 # the person who prepared the kit. Unsigned binaries on ftp will be purged.
-#
-# Initial bootstrapping on a previously non-supported architecture
-# is not trivial to do with openjdk7. It is somewhat easier with openjdk8
-# which has improved cross-compile support. Note that openjdk8 cannot be used
-# for bootstrapping openjdk7 out of the box. (It is possible with hacks.)
 
 ONLY_FOR_PLATFORM=	NetBSD-[567].*-i386 NetBSD-[567].*-x86_64
 ONLY_FOR_PLATFORM+=	NetBSD-7.*-sparc64
-ONLY_FOR_PLATFORM+=	DragonFly-[23].*-* SunOS-*-* FreeBSD-10.*-x86_64
+ONLY_FOR_PLATFORM+=	DragonFly-[34].*-* SunOS-*-* FreeBSD-10.*-x86_64
 
-BOOT.nb5-i386=		bootstrap-jdk7u60-bin-netbsd-5-i386-20140719.tar.bz2
-BOOT.nb5-amd64=		bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2
-BOOT.nb6-i386=		bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2
-BOOT.nb6-amd64=		bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2
-BOOT.nb7-i386=		bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2
-BOOT.nb7-amd64=		bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2
-BOOT.nb7-sparc64=	bootstrap-jdk7u76-bin-netbsd-7-sparc64-20150212.tar.xz
+BOOT.nb5-i386=		bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz
+BOOT.nb5-amd64=		bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz
+BOOT.nb6-i386=		bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz
+BOOT.nb6-amd64=		bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz
+BOOT.nb7-i386=		bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz
+BOOT.nb7-amd64=		bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz
+BOOT.nb7-sparc64=	bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz
+BOOT.fbsd10-amd64=	bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz
+#XXX should be regenerated
 BOOT.dfly3.6-amd64=	bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2
 BOOT.dfly3.8-amd64=	bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2
-BOOT.fbsd10-amd64=	bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-i386) || make(distinfo)
 DISTFILES+=		${BOOT.nb5-i386}
@@ -82,7 +79,7 @@ DISTFILES+=		${BOOT.dfly3.6-amd64}
 EXTRACT_ONLY+=		${BOOT.dfly3.6-amd64}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MDragonFly-3.[8-9]*-x86_64) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MDragonFly-3.[8-9]*-x86_64) || !empty(MACHINE_PLATFORM:MDragonFly-4.*-x86_64) || make(distinfo)
 DISTFILES+=		${BOOT.dfly3.8-amd64}
 EXTRACT_ONLY+=		${BOOT.dfly3.8-amd64}
 .endif
@@ -96,8 +93,11 @@ EXTRACT_ONLY+=		${BOOT.fbsd10-amd64}
 BUILDLINK_DEPMETHOD.sun-jdk7?=	build
 .include "../../lang/sun-jdk7/buildlink3.mk"
 #NB: sun-jdk7 includes sun-jre7/buildlink3.mk
-JDK_BOOTDIR=		${BUILDLINK_JAVA_PREFIX.sun-jre7:tA}
-CONFIGURE_ARGS+=	--with-import-hotspot=${JDK_BOOTDIR}
+post-extract: copy-bootstrap-jdk
+.PHONY: copy-bootstrap-jdk
+copy-bootstrap-jdk:
+	${MKDIR} ${ALT_BOOTDIR}
+	cd ${BUILDLINK_JAVA_PREFIX.sun-jre7:tA} && pax -rw . ${ALT_BOOTDIR}
 .endif
 
 ALT_BOOTDIR=		${WRKDIR}/bootstrap
diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo
index 5f9d8172c36..7f7cae89ea8 100644
--- a/lang/openjdk8/distinfo
+++ b/lang/openjdk8/distinfo
@@ -1,35 +1,35 @@
-$NetBSD: distinfo,v 1.11 2015/03/01 21:43:50 tnn Exp $
+$NetBSD: distinfo,v 1.12 2015/03/02 03:53:26 tnn Exp $
 
+SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
+RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
+Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes
+SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 358c533580700065fd5c3c5c99ce3fd087589c00
+RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 96e74f40360f0d4c1272bf5f37cf8869b718a5ee
+Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 26580632 bytes
+SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 2cd7df823723e67531d268286e31168d3eed01a9
+RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = af4e195a1da1be15df30808fe9b10f684146a3ea
+Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 26857692 bytes
+SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = a1b568394a76bfdd164042ea40e67caa94dd489d
+RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = 7f50618a4a14ec218e886e88e76ad682b6b7fb57
+Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = 26716528 bytes
+SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz) = 4ef9bc133ce3fb328f1a6334561806759f6a840d
+RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz) = 04c158993165acf63015ca931cf3d37a47513d74
+Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz) = 26972860 bytes
+SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = e56a0334417146a4db8c23938a0c19ada3e3847d
+RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = e9a88901ed05bec37c63f235cc7c4b09aaaf1ba3
+Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = 26955712 bytes
+SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = ff3a3e65c8317017b7f83d688a19630f928e86c7
+RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 627914b2c853da7a2d86e8a8b24fef1e36f25251
+Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 27615992 bytes
+SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 69375362b2638d803c71392008a73f956d315085
+RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 06b40db72e7154daff49093f3b6e8aa39cae27b3
+Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 23041084 bytes
 SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 98fdb66b429148ae3922a2f9b2db736a1708e337
 RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 4835c6361f66138d73f583c40df0e04a31257157
 Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 37910104 bytes
 SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29bd7aa925941933b2da671340e1d325d9603e5d
 RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140
 Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes
-SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = fba2e61d9b6dfa3d582259aa60125762fd3c8931
-RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = 7a164227b077d9e86a2dd2410e83463d6d3360aa
-Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = 37211292 bytes
-SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-i386-20140719.tar.bz2) = dece32461eaab72d3e2327106b5136461d82bd0e
-RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-i386-20140719.tar.bz2) = d5ab48cd9a2cf0ac554b3fd37a7ace1e5420e3c4
-Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-i386-20140719.tar.bz2) = 39051642 bytes
-SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2) = 4fac0ed96cfe1b366b50c1b88aabb8d41281f893
-RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2) = ada7af827e2e47e93f1813f0531b697125d1f44b
-Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2) = 37567181 bytes
-SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2) = 76906b91e8412fefdae5ecb15e01ddbcd586d2ad
-RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2) = 068fb6ad180e8b8d9c4f2cc158c40b3047d8e015
-Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2) = 39347597 bytes
-SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2) = 8a782d9cb2297b1cb24dfb022b139363d8695616
-RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2) = 607c25a81ae073fb282e5a81169b93d6818e5122
-Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2) = 37593509 bytes
-SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2) = 261eb3bf84b6ac60d30a704523efb27e7a7c715a
-RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2) = 1d26ee7f6443e1f4389e38d20134fb8e2969254e
-Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2) = 40161195 bytes
-SHA1 (openjdk7/bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2) = 7e85c42f75f014e88eb62580979f6a0fc9b6e957
-RMD160 (openjdk7/bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2) = d84d7b82205f23827ef9ce672602d0ba8a9a9c72
-Size (openjdk7/bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2) = 37448005 bytes
-SHA1 (openjdk7/bootstrap-jdk7u76-bin-netbsd-7-sparc64-20150212.tar.xz) = b467ca8d14f1a8098cd90e3bb7ae664c1713cb8a
-RMD160 (openjdk7/bootstrap-jdk7u76-bin-netbsd-7-sparc64-20150212.tar.xz) = 152c801aca81f4db5427fe2f19f4efcb2fb6355e
-Size (openjdk7/bootstrap-jdk7u76-bin-netbsd-7-sparc64-20150212.tar.xz) = 22914116 bytes
 SHA1 (openjdk7/openjdk-1.8.31-20150207.tar.xz) = f29db4779b126c829d8385208a570c96553b88c8
 RMD160 (openjdk7/openjdk-1.8.31-20150207.tar.xz) = 09434e80bac77f6d367dbe0fe5ee051f1f12c7fe
 Size (openjdk7/openjdk-1.8.31-20150207.tar.xz) = 51853460 bytes
@@ -44,11 +44,9 @@ SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63
 SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8
 SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
 SHA1 (patch-common_autoconf_generated-configure.sh) = abfec0410c3d239a42e44d7f2619cceb02622769
-SHA1 (patch-common_autoconf_spec.gmk.in) = 0f885dd99c8199ea8f607ffbbd96b9ca74308c52
+SHA1 (patch-common_autoconf_spec.gmk.in) = e39f543e7e16bd63ee33696192221a99c7e06505
 SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928
 SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 6b3e2f769c754b3ee5de8c07444964414136fa81
-SHA1 (patch-hotspot_make_bsd_makefiles_gcc.make) = bb09683244c0dcd69f1b2a5d930a6b28aa5d2c3b
-SHA1 (patch-hotspot_make_bsd_makefiles_rules.make) = 4b9a92abd0a91d81b5c34b7fbc98aeaadfe06bce
 SHA1 (patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp) = 9f7acf1eff3baba430880be9fd0f6148056dd088
 SHA1 (patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp) = dcd83b65a7d74e153a3e1c44f8c7980827ec20c7
 SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp) = e87224f8b67dc78fa411d30beff82ce5ccbb4cc5
@@ -56,8 +54,7 @@ SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp)
 SHA1 (patch-hotspot_src_os_bsd_vm_osThread__bsd.cpp) = c34887b4bf0873c70a44adaaa9be38614603e1d4
 SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = f38d3ea8002bc8c58d1cf05e70424858dabd2991
 SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c318b70b1293
-SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = fd4a21718b486cd89ec6207fe49b37918ea5f4b8
-SHA1 (patch-hotspot_src_share_vm_utilities_vmError.cpp) = fe64b54a69b0852d346fa5c8db310c43bbc7993d
+SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = cab48bc272fc67f3326e663dc6feb94fe56ec79f
 SHA1 (patch-jdk_make_CompileLaunchers.gmk) = 76bae0aab5528a6c020d2fdd5ba7c1ffa132aca2
 SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5
 SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828
@@ -84,5 +81,4 @@ SHA1 (patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java) = e5d6121
 SHA1 (patch-jdk_test_java_beans_Introspector_Test4144543.java) = bb0a20f688093f2d60f4a4937ae418fcebfcc7ca
 SHA1 (patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java) = 07b071ace2a91acd1968ed670aead67d72f0d490
 SHA1 (patch-jdk_test_sun_security_ec_TestEC.java) = c2db0716408ae1d081b3516b6c866b8f43cf5b6f
-SHA1 (patch-langtools_make_BuildLangtools.gmk) = 5843d40fa84e0f1dbe3d6bbc837794c196903ee9
 SHA1 (patch-langtools_make_build.xml) = e9dccdb67a0f25b266755f66e520c6420afaf7ba
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