From 30b9bd7b949781c7a8a2c12f5c1a65c0ef557e7a Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Mon, 21 Oct 2013 21:27:59 +0000 Subject: - Update to r330538. - Turn off mixed mode for HotSpot (i. e., JIT compiler) by default for extreme safety. Although it may be too conservative and/or slow, it is okay because it is not useful for anything but bootstrapping OpenJDK itself. In fact, it does not seem stable within jails (e. g., QAT) for unknown reasons. - Revert r330422. Now it is obsolete by r330500. --- java/bootstrap-openjdk/files/bootstrap.patch | 45 ++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 java/bootstrap-openjdk/files/bootstrap.patch (limited to 'java/bootstrap-openjdk/files/bootstrap.patch') diff --git a/java/bootstrap-openjdk/files/bootstrap.patch b/java/bootstrap-openjdk/files/bootstrap.patch new file mode 100644 index 000000000000..fef466f77103 --- /dev/null +++ b/java/bootstrap-openjdk/files/bootstrap.patch @@ -0,0 +1,45 @@ +--- hotspot/src/share/vm/Xusage.txt ++++ hotspot/src/share/vm/Xusage.txt +@@ -1,5 +1,5 @@ +- -Xmixed mixed mode execution (default) +- -Xint interpreted mode execution only ++ -Xint interpreted mode execution only (default) ++ -Xmixed mixed mode execution + -Xbootclasspath: + set search path for bootstrap classes and resources + -Xbootclasspath/a: +--- hotspot/src/share/vm/runtime/arguments.cpp ++++ hotspot/src/share/vm/runtime/arguments.cpp +@@ -67,7 +67,7 @@ + bool Arguments::_has_profile = false; + bool Arguments::_has_alloc_profile = false; + uintx Arguments::_min_heap_size = 0; +-Arguments::Mode Arguments::_mode = _mixed; ++Arguments::Mode Arguments::_mode = _int; + bool Arguments::_java_compiler = false; + bool Arguments::_xdebug_mode = false; + const char* Arguments::_java_vendor_url_bug = DEFAULT_VENDOR_URL_BUG; +@@ -2036,8 +2036,8 @@ + Arguments::_ClipInlining = ClipInlining; + Arguments::_BackgroundCompilation = BackgroundCompilation; + +- // Setup flags for mixed which is the default +- set_mode_flags(_mixed); ++ // Setup flags for interpreter which is the default ++ set_mode_flags(_int); + + // Parse JAVA_TOOL_OPTIONS environment variable (if present) + jint result = parse_java_tool_options_environment_variable(&scp, &scp_assembly_required); +--- jdk/src/share/classes/sun/launcher/resources/launcher.properties ++++ jdk/src/share/classes/sun/launcher/resources/launcher.properties +@@ -75,8 +75,8 @@ + + # Translators please note do not translate the options themselves + java.launcher.X.usage=\ +-\ -Xmixed mixed mode execution (default)\n\ +-\ -Xint interpreted mode execution only\n\ ++\ -Xint interpreted mode execution only (default)\n\ ++\ -Xmixed mixed mode execution\n\ + \ -Xbootclasspath:\n\ + \ set search path for bootstrap classes and resources\n\ + \ -Xbootclasspath/a:\n\ -- cgit v1.2.3