diff options
author | Ian Rogers <irogers@google.com> | 2014-10-14 17:41:57 -0700 |
---|---|---|
committer | Ian Rogers <irogers@google.com> | 2014-10-16 19:27:28 -0700 |
commit | 6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3 (patch) | |
tree | f7a20779e4d665f948c5fbcd26dac0071dafb8d4 /runtime/parsed_options.cc | |
parent | 2df6840f68dd18d7dd8dbf53f8b6181bbfdc4fc4 (diff) | |
download | art-6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3.tar.gz art-6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3.tar.bz2 art-6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3.zip |
Make ART compile with GCC -O0 again.
Tidy up InstructionSetFeatures so that it has a type hierarchy dependent on
architecture.
Add to instruction_set_test to warn when InstructionSetFeatures don't agree
with ones from system properties, AT_HWCAP and /proc/cpuinfo.
Clean-up class linker entry point logic to not return entry points but to
test whether the passed code is the particular entrypoint. This works around
image trampolines that replicate entrypoints.
Bug: 17993736
Change-Id: I5f4b49e88c3b02a79f9bee04f83395146ed7be23
Diffstat (limited to 'runtime/parsed_options.cc')
-rw-r--r-- | runtime/parsed_options.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc index d82002683a..dcca9d3164 100644 --- a/runtime/parsed_options.cc +++ b/runtime/parsed_options.cc @@ -205,7 +205,7 @@ static gc::CollectorType ParseCollectorType(const std::string& option) { bool ParsedOptions::ParseXGcOption(const std::string& option) { std::vector<std::string> gc_options; - Split(option.substr(strlen("-Xgc:")), ',', gc_options); + Split(option.substr(strlen("-Xgc:")), ',', &gc_options); for (const std::string& gc_option : gc_options) { gc::CollectorType collector_type = ParseCollectorType(gc_option); if (collector_type != gc::kCollectorTypeNone) { @@ -501,7 +501,7 @@ bool ParsedOptions::Parse(const RuntimeOptions& options, bool ignore_unrecognize is_explicit_gc_disabled_ = true; } else if (StartsWith(option, "-verbose:")) { std::vector<std::string> verbose_options; - Split(option.substr(strlen("-verbose:")), ',', verbose_options); + Split(option.substr(strlen("-verbose:")), ',', &verbose_options); for (size_t i = 0; i < verbose_options.size(); ++i) { if (verbose_options[i] == "class") { gLogVerbosity.class_linker = true; @@ -536,7 +536,7 @@ bool ParsedOptions::Parse(const RuntimeOptions& options, bool ignore_unrecognize } } else if (StartsWith(option, "-verbose-methods:")) { gLogVerbosity.compiler = false; - Split(option.substr(strlen("-verbose-methods:")), ',', gVerboseMethods); + Split(option.substr(strlen("-verbose-methods:")), ',', &gVerboseMethods); } else if (StartsWith(option, "-Xlockprofthreshold:")) { if (!ParseUnsignedInteger(option, ':', &lock_profiling_threshold_)) { return false; |