diff options
| author | Andreas Gampe <agampe@google.com> | 2015-04-24 16:33:43 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-04-24 16:34:30 -0700 |
| commit | 00bb87898502fae7d46e196f5170bad9993877f6 (patch) | |
| tree | 101c9be3f3d23f927ef34488ff2188fd6d376b84 /runtime/native/dalvik_system_ZygoteHooks.cc | |
| parent | 33984b4d6b79b2d65258e69506e5669be704db82 (diff) | |
| download | android_art-00bb87898502fae7d46e196f5170bad9993877f6.tar.gz android_art-00bb87898502fae7d46e196f5170bad9993877f6.tar.bz2 android_art-00bb87898502fae7d46e196f5170bad9993877f6.zip | |
ART: Add GENERATE_CFI to the ZygoteHooks debug flags
Add code to understand the implications of the debug.gencfi system
property that forces generation of CFI data.
Change-Id: Ida66f8c1567634d05cfdbba1a982be3684e94369
Diffstat (limited to 'runtime/native/dalvik_system_ZygoteHooks.cc')
| -rw-r--r-- | runtime/native/dalvik_system_ZygoteHooks.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/runtime/native/dalvik_system_ZygoteHooks.cc b/runtime/native/dalvik_system_ZygoteHooks.cc index af01a02787..8524348164 100644 --- a/runtime/native/dalvik_system_ZygoteHooks.cc +++ b/runtime/native/dalvik_system_ZygoteHooks.cc @@ -65,6 +65,7 @@ static void EnableDebugFeatures(uint32_t debug_flags) { DEBUG_ENABLE_SAFEMODE = 1 << 3, DEBUG_ENABLE_JNI_LOGGING = 1 << 4, DEBUG_ENABLE_JIT = 1 << 5, + DEBUG_GENERATE_CFI = 1 << 6, }; Runtime* const runtime = Runtime::Current(); @@ -111,6 +112,12 @@ static void EnableDebugFeatures(uint32_t debug_flags) { } runtime->GetJITOptions()->SetUseJIT(use_jit); + const bool generate_cfi = (debug_flags & DEBUG_GENERATE_CFI) != 0; + if (generate_cfi) { + runtime->AddCompilerOption("--include-cfi"); + debug_flags &= ~DEBUG_GENERATE_CFI; + } + // This is for backwards compatibility with Dalvik. debug_flags &= ~DEBUG_ENABLE_ASSERT; |