ports/java/bootstrap-openjdk/files/bootstrap.patch
Jung-uk Kim 30b9bd7b94 - 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.
2013-10-21 21:27:59 +00:00

45 lines
2.2 KiB
Diff

--- 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:<directories and zip/jar files separated by ;>
set search path for bootstrap classes and resources
-Xbootclasspath/a:<directories and zip/jar files separated by ;>
--- 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:<directories and zip/jar files separated by {0}>\n\
\ set search path for bootstrap classes and resources\n\
\ -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n\