summaryrefslogtreecommitdiff
path: root/java/bootstrap-openjdk/files/bootstrap.patch
blob: fef466f77103af6e1b39857bfbb5a9b46a6f6a09 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
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:<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\