summaryrefslogtreecommitdiff
path: root/runtime/parsed_options.cc
diff options
context:
space:
mode:
author Dave Allison <dallison@google.com> 2014-07-10 01:54:57 +0000
committer Dave Allison <dallison@google.com> 2014-07-10 01:54:57 +0000
commit3d14eb620716e92c21c4d2c2d11a95be53319791 (patch)
treeaadce4d6bb70e549b74b537c6f75617cf533576a /runtime/parsed_options.cc
parent34e826ccc80dc1cf7c4c045de6b7f8360d504ccf (diff)
Revert "Add implicit null and stack checks for x86"
It breaks cross compilation with x86_64. This reverts commit 34e826ccc80dc1cf7c4c045de6b7f8360d504ccf. Change-Id: I34ba07821fc0a022fda33a7ae21850957bbec5e7
Diffstat (limited to 'runtime/parsed_options.cc')
-rw-r--r--runtime/parsed_options.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc
index 333ba03f0e..e1e133f1be 100644
--- a/runtime/parsed_options.cc
+++ b/runtime/parsed_options.cc
@@ -286,8 +286,8 @@ bool ParsedOptions::Parse(const Runtime::Options& options, bool ignore_unrecogni
}
}
#else
- // Host. Only suspend check is explicit by default.
- explicit_checks_ = kExplicitSuspendCheck;
+ explicit_checks_ = kExplicitNullCheck | kExplicitSuspendCheck |
+ kExplicitStackOverflowCheck;
#endif
for (size_t i = 0; i < options.size(); ++i) {
@@ -305,7 +305,6 @@ bool ParsedOptions::Parse(const Runtime::Options& options, bool ignore_unrecogni
Exit(0);
} else if (StartsWith(option, "-Xbootclasspath:")) {
boot_class_path_string_ = option.substr(strlen("-Xbootclasspath:")).data();
- LOG(INFO) << "setting boot class path to " << boot_class_path_string_;
} else if (option == "-classpath" || option == "-cp") {
// TODO: support -Djava.class.path
i++;