diff options
author | joerg <joerg@pkgsrc.org> | 2014-01-20 19:25:11 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2014-01-20 19:25:11 +0000 |
commit | 76449dc3634e63aa71a77599b23422d9019f4c24 (patch) | |
tree | ac67ea70f46409d7be6a64cf731caa69a10f8e05 /lang/openjdk7/patches | |
parent | 22514ec037295b74a1516c84d46029954f13c22e (diff) | |
download | pkgsrc-76449dc3634e63aa71a77599b23422d9019f4c24.tar.gz |
Force serial GC during build. Fix friend forward with default arguments.
Fix incorrect return value.
Diffstat (limited to 'lang/openjdk7/patches')
7 files changed, 113 insertions, 3 deletions
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 |