diff options
Diffstat (limited to 'compiler/driver')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 4 | ||||
| -rw-r--r-- | compiler/driver/compiler_options.cc | 9 | ||||
| -rw-r--r-- | compiler/driver/compiler_options.h | 17 |
3 files changed, 10 insertions, 20 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 55fabcc369..e5fa54e989 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -76,8 +76,8 @@ namespace art { static constexpr bool kTimeCompileMethod = !kIsDebugBuild; -// Whether to produce 64-bit ELF files for 64-bit targets. Leave this off for now. -static constexpr bool kProduce64BitELFFiles = false; +// Whether to produce 64-bit ELF files for 64-bit targets. +static constexpr bool kProduce64BitELFFiles = true; // Whether classes-to-compile and methods-to-compile are only applied to the boot image, or, when // given, too all compilations. diff --git a/compiler/driver/compiler_options.cc b/compiler/driver/compiler_options.cc index c5fc98a957..226e6b7952 100644 --- a/compiler/driver/compiler_options.cc +++ b/compiler/driver/compiler_options.cc @@ -30,8 +30,7 @@ CompilerOptions::CompilerOptions() include_patch_information_(kDefaultIncludePatchInformation), top_k_profile_threshold_(kDefaultTopKProfileThreshold), debuggable_(false), - include_debug_symbols_(kDefaultIncludeDebugSymbols), - include_cfi_(false), + generate_debug_info_(kDefaultGenerateDebugInfo), implicit_null_checks_(true), implicit_so_checks_(true), implicit_suspend_checks_(false), @@ -56,8 +55,7 @@ CompilerOptions::CompilerOptions(CompilerFilter compiler_filter, bool include_patch_information, double top_k_profile_threshold, bool debuggable, - bool include_debug_symbols, - bool include_cfi, + bool generate_debug_info, bool implicit_null_checks, bool implicit_so_checks, bool implicit_suspend_checks, @@ -76,8 +74,7 @@ CompilerOptions::CompilerOptions(CompilerFilter compiler_filter, include_patch_information_(include_patch_information), top_k_profile_threshold_(top_k_profile_threshold), debuggable_(debuggable), - include_debug_symbols_(include_debug_symbols), - include_cfi_(include_cfi), + generate_debug_info_(generate_debug_info), implicit_null_checks_(implicit_null_checks), implicit_so_checks_(implicit_so_checks), implicit_suspend_checks_(implicit_suspend_checks), diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h index bf3f8ec08a..356663bd8a 100644 --- a/compiler/driver/compiler_options.h +++ b/compiler/driver/compiler_options.h @@ -49,7 +49,7 @@ class CompilerOptions FINAL { static const size_t kDefaultTinyMethodThreshold = 20; static const size_t kDefaultNumDexMethodsThreshold = 900; static constexpr double kDefaultTopKProfileThreshold = 90.0; - static const bool kDefaultIncludeDebugSymbols = kIsDebugBuild; + static const bool kDefaultGenerateDebugInfo = kIsDebugBuild; static const bool kDefaultIncludePatchInformation = false; CompilerOptions(); @@ -64,8 +64,7 @@ class CompilerOptions FINAL { bool include_patch_information, double top_k_profile_threshold, bool debuggable, - bool include_debug_symbols, - bool include_cfi, + bool generate_debug_info, bool implicit_null_checks, bool implicit_so_checks, bool implicit_suspend_checks, @@ -146,13 +145,8 @@ class CompilerOptions FINAL { return debuggable_; } - bool GetIncludeDebugSymbols() const { - return include_debug_symbols_; - } - - bool GetIncludeCFI() const { - // include-debug-symbols implies include-cfi. - return include_cfi_ || include_debug_symbols_; + bool GetGenerateDebugInfo() const { + return generate_debug_info_; } bool GetImplicitNullChecks() const { @@ -212,8 +206,7 @@ class CompilerOptions FINAL { // When using a profile file only the top K% of the profiled samples will be compiled. const double top_k_profile_threshold_; const bool debuggable_; - const bool include_debug_symbols_; - const bool include_cfi_; + const bool generate_debug_info_; const bool implicit_null_checks_; const bool implicit_so_checks_; const bool implicit_suspend_checks_; |