Force serial GC during build. Fix friend forward with default arguments.

Fix incorrect return value.

8 files changed, 121 insertions, 5 deletions

diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index 5e1ad5e2a9e..13683b92bb6 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2014/01/14 17:24:42 abs Exp $
+$NetBSD: distinfo,v 1.40 2014/01/20 19:25:11 joerg Exp $
 
 SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253
 RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f
@@ -88,8 +88,10 @@ SHA1 (patch-bg) = 90328bd927c52e62d97c72fade2ceb70d42fe273
 SHA1 (patch-bh) = 33b56c77da352e710350a9e210660a78b11930a6
 SHA1 (patch-bi) = 9323d54054e5b3112e96ba311014c8228009de1a
 SHA1 (patch-bn) = e90012a3acbdeec1fe97d53ffa11816379ac90e9
+SHA1 (patch-corba_make_common_shared_Defs-java.gmk) = 548718a351fe6159d3de4120cba90701c064ddda
 SHA1 (patch-corba_make_common_shared_Defs-utils.gmk) = e3b6d4683f1128bc1b2e5d8453608228da54e3d2
 SHA1 (patch-corba_make_common_shared_Platform.gmk) = 057af9ea52ca257750267289e4f1a950df0ed756
+SHA1 (patch-hotspot_make_bsd_makefiles_buildtree.make) = 2605e4f684abb026be91b4993bb2f741822cf169
 SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 85eda2125ef39c5fe5fcfbc072bd8a3591d5c4bf
 SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14
 SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239
@@ -115,6 +117,8 @@ SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = da6017447c5537048fcf04198c4
 SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = 43ae9934ce7cf477f7968bcf9ba3c57e98f65cc8
 SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47
 SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = ea09ffd080fcf4c12b0b69cb622ee3945000cb68
+SHA1 (patch-hotspot_src_share_vm_code_relocInfo.hpp) = c02b2bb64129113b5812feb02033e12969bafe04
+SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = 869d8ec9dc6dae6e0b8a23fe44f2583747059553
 SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = fe40909864fc561495b1e15a5bc6c7c6373830b2
 SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 30084c64570e420fbda8fbd36fcd4aa2641eab8e
 SHA1 (patch-jdk_make_com_sun_Makefile) = 5826c64eb1971d69e8b874d6b8a60d25e0d02c5b
@@ -126,6 +130,7 @@ SHA1 (patch-jdk_make_common_Defs-solaris.gmk) = ea0bef0fd67a1ff809a17005458dadae
 SHA1 (patch-jdk_make_common_Mapfile-vers.gmk) = 7115ec8e0fc25f952a6c72ee78df33901040a7b6
 SHA1 (patch-jdk_make_common_Program.gmk) = 66edaf69cb12c1e024ba1145c98b667d54ea9239
 SHA1 (patch-jdk_make_common_shared_Compiler-gcc.gmk) = e180383490d6c0a8bec4626ed96ad1741c8fb3a2
+SHA1 (patch-jdk_make_common_shared_Defs-java.gmk) = f7c11d33da19e9f255fde7cab387c91e0287509c
 SHA1 (patch-jdk_make_common_shared_Defs-utils.gmk) = d0ae37a032be6bf60da4be11bd38185e89d4ee91
 SHA1 (patch-jdk_make_common_shared_Defs-versions.gmk) = 20a9492180db88cf78bc107f1e2fc4a9101d2eab
 SHA1 (patch-jdk_make_java_Makefile) = c670455f8979b14fe44f0a285d0adfb2666d0005
@@ -154,8 +159,9 @@ SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = 7b1d1c7f84e752ef7c53d5419dc3ab52
 SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = 86ce16bd53c85bc3830ef3f21d52f9a8107b5350
 SHA1 (patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java) = b57411309b8d46de6a9ab3606d72690908989d50
 SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = d509a6ed567493024e3ce5de8986912da99f4a9d
+SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = 883fb8cf76f9a6d47e1c96badb07be162add80f7
 SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = 928e9fbc11d8e64a69e27573efa13482acb62480
-SHA1 (patch-jdk_test_Makefile) = d747987549c2f6e9eb42233edae02d8eae6b4584
+SHA1 (patch-jdk_test_Makefile) = 62618854251a5fe139310fc443af3f2f0103f63c
 SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = a2a13434a4e87730fa96f53efa176fa91d3c1eeb
 SHA1 (patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java) = 98a7c2fbccd50da0c879940131901b3937d72c0d
 SHA1 (patch-jdk_test_java_beans_Introspector_Test4144543.java) = e003869d924ac3cb326c4093891bd0cfc0f7ff9c
diff --git a/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-java.gmk b/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-java.gmk
new file mode 100644
index 00000000000..2340d445dd0
--- /dev/null
+++ b/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-java.gmk
@@ -0,0 +1,13 @@
+$NetBSD: patch-corba_make_common_shared_Defs-java.gmk,v 1.1 2014/01/20 19:25:11 joerg Exp $
+
+--- corba/make/common/shared/Defs-java.gmk.orig	2014-01-05 23:11:01.000000000 +0000
++++ corba/make/common/shared/Defs-java.gmk
+@@ -59,7 +59,7 @@ endif
+ # Options for hotspot to turn off printing of options with fastdebug version
+ #   and creating the hotspot.log file.
+ JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS = \
+-   -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput
++   -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput -Xms256m -XX:+UseSerialGC
+ 
+ # JVM options
+ JAVA_JVM_FLAGS = $(JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS)
diff --git a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_buildtree.make b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_buildtree.make
new file mode 100644
index 00000000000..eb2c41d9de4
--- /dev/null
+++ b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_buildtree.make
@@ -0,0 +1,13 @@
+$NetBSD: patch-hotspot_make_bsd_makefiles_buildtree.make,v 1.1 2014/01/20 19:25:11 joerg Exp $
+
+--- hotspot/make/bsd/makefiles/buildtree.make.orig	2014-01-06 02:36:18.000000000 +0000
++++ hotspot/make/bsd/makefiles/buildtree.make
+@@ -68,7 +68,7 @@ include $(GAMMADIR)/make/altsrc.make
+ QUIETLY$(MAKE_VERBOSE)	= @
+ 
+ # For now, until the compiler is less wobbly:
+-TESTFLAGS	= -Xbatch -showversion
++TESTFLAGS	= -Xbatch -showversion -Xmx512m -XX:+UseSerialGC
+ 
+ ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
+   PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero
diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_code_relocInfo.hpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_code_relocInfo.hpp
new file mode 100644
index 00000000000..d3aeaeeac53
--- /dev/null
+++ b/lang/openjdk7/patches/patch-hotspot_src_share_vm_code_relocInfo.hpp
@@ -0,0 +1,22 @@
+$NetBSD: patch-hotspot_src_share_vm_code_relocInfo.hpp,v 1.1 2014/01/20 19:25:11 joerg Exp $
+
+--- hotspot/src/share/vm/code/relocInfo.hpp.orig	2014-01-05 21:21:58.000000000 +0000
++++ hotspot/src/share/vm/code/relocInfo.hpp
+@@ -371,7 +371,7 @@ class relocInfo VALUE_OBJ_CLASS_SPEC {
+   // "immediate" in the prefix header word itself.  This optimization
+   // is invisible outside this module.)
+ 
+-  inline friend relocInfo prefix_relocInfo(int datalen = 0);
++  inline friend relocInfo prefix_relocInfo(int datalen);
+ 
+  protected:
+   // an immediate relocInfo optimizes a prefix with one 10-bit unsigned value
+@@ -455,6 +455,8 @@ class relocInfo VALUE_OBJ_CLASS_SPEC {
+   };
+ };
+ 
++relocInfo prefix_relocInfo(int datalen = 0);
++
+ #define FORWARD_DECLARE_EACH_CLASS(name)              \
+ class name##_Relocation;
+ APPLY_TO_RELOCATIONS(FORWARD_DECLARE_EACH_CLASS)
diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_opto_node.cpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_opto_node.cpp
new file mode 100644
index 00000000000..6a611e253b6
--- /dev/null
+++ b/lang/openjdk7/patches/patch-hotspot_src_share_vm_opto_node.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-hotspot_src_share_vm_opto_node.cpp,v 1.1 2014/01/20 19:25:11 joerg Exp $
+
+--- hotspot/src/share/vm/opto/node.cpp.orig	2014-01-06 00:27:19.000000000 +0000
++++ hotspot/src/share/vm/opto/node.cpp
+@@ -285,6 +285,10 @@ void DUIterator_Last::verify_step(uint n
+ #pragma warning( disable:4355 ) // 'this' : used in base member initializer list
+ #endif
+ 
++#ifdef __GNUC__
++#pragma GCC diagnostic ignored "-Wuninitialized"
++#endif
++
+ // Out-of-line code from node constructors.
+ // Executed only when extra debug info. is being passed around.
+ static void init_node_notes(Compile* C, int idx, Node_Notes* nn) {
diff --git a/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-java.gmk b/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-java.gmk
new file mode 100644
index 00000000000..f648686aabc
--- /dev/null
+++ b/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-java.gmk
@@ -0,0 +1,13 @@
+$NetBSD: patch-jdk_make_common_shared_Defs-java.gmk,v 1.1 2014/01/20 19:25:11 joerg Exp $
+
+--- jdk/make/common/shared/Defs-java.gmk.orig	2014-01-05 23:07:37.000000000 +0000
++++ jdk/make/common/shared/Defs-java.gmk
+@@ -63,7 +63,7 @@ endif
+ # Options for hotspot to turn off printing of options with fastdebug version
+ #   and creating the hotspot.log file.
+ JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS = \
+-   -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput
++   -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput -XX:+UseSerialGC
+ 
+ # JVM options
+ # MMM: is headless option necessary?
diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.c b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.c
new file mode 100644
index 00000000000..81e21488f84
--- /dev/null
+++ b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-jdk_src_solaris_native_java_net_net__util__md.c,v 1.1 2014/01/20 19:25:11 joerg Exp $
+
+--- jdk/src/solaris/native/java/net/net_util_md.c.orig	2014-01-05 21:54:15.000000000 +0000
++++ jdk/src/solaris/native/java/net/net_util_md.c
+@@ -118,9 +118,9 @@ int getDefaultScopeID(JNIEnv *env) {
+     static jfieldID ni_defaultIndexID;
+     if (ni_class == NULL) {
+         jclass c = (*env)->FindClass(env, "java/net/NetworkInterface");
+-        CHECK_NULL(c);
++        CHECK_NULL_RETURN(c, 0);
+         c = (*env)->NewGlobalRef(env, c);
+-        CHECK_NULL(c);
++        CHECK_NULL_RETURN(c, 0);
+         ni_defaultIndexID = (*env)->GetStaticFieldID(
+             env, c, "defaultIndex", "I");
+         ni_class = c;
diff --git a/lang/openjdk7/patches/patch-jdk_test_Makefile b/lang/openjdk7/patches/patch-jdk_test_Makefile
index 7c03b4c7741..f9e00a26422 100644
--- a/lang/openjdk7/patches/patch-jdk_test_Makefile
+++ b/lang/openjdk7/patches/patch-jdk_test_Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-jdk_test_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $
+$NetBSD: patch-jdk_test_Makefile,v 1.2 2014/01/20 19:25:11 joerg Exp $
 
 Use tools from pkgsrc.
 
---- jdk/test/Makefile.orig	2013-02-20 17:07:30.000000000 +0000
+--- jdk/test/Makefile.orig	2014-01-01 05:53:43.000000000 +0000
 +++ jdk/test/Makefile
 @@ -54,6 +54,8 @@ UNAME     = uname
  UNIQ      = uniq
@@ -13,7 +13,7 @@ Use tools from pkgsrc.
  
  # Get OS name from uname
  UNAME_S := $(shell $(UNAME) -s)
-@@ -376,6 +378,12 @@ else
+@@ -381,6 +383,12 @@ else
    JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%)
  endif
  
@@ -26,3 +26,21 @@ Use tools from pkgsrc.
  ifdef CONCURRENCY
    EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY)
  endif
+@@ -641,7 +649,7 @@ JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OP
+ JTREG_TIMEOUT_OPTION =  -timeoutFactor:4
+ JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION)
+ # Boost the max memory for jtreg to avoid gc thrashing
+-JTREG_MEMORY_OPTION = -J-Xmx512m
++JTREG_MEMORY_OPTION = -J-Xmx512m -J-XX:+UseSerialGC
+ JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION)
+ 
+ # Make sure jtreg exists
+@@ -825,7 +833,7 @@ endif
+ 
+ # The jtjck.jar utility to use to run the tests
+ JTJCK_JAR = $(JCK_HOME)/lib/jtjck.jar
+-JTJCK_JAVA_ARGS =  -XX:MaxPermSize=256m -Xmx512m
++JTJCK_JAVA_ARGS =  -XX:MaxPermSize=256m -Xmx512m -XX:+UseSerialGC
+ JTJCK_OPTIONS = -headless -v
+ 
+ # Default tests to run