summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYabin Cui <yabinc@google.com>2015-09-23 05:24:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-23 05:24:54 +0000
commitd39e8e3e25c786fdfbbc45d29ba7da14db764c59 (patch)
tree033e09dd88676b62d0af985b1029021656d92a35
parentea6306faa9cbbb55003f1a63708877ba5b6b5536 (diff)
parent033a5afc9c75db40e188264d36dcd570ef6a833e (diff)
downloadunwinding-d39e8e3e25c786fdfbbc45d29ba7da14db764c59.tar.gz
am 033a5afc: am 2d352922: Merge "libbacktrace: enable -fno-omit-frame-pointer for host build."
* commit '033a5afc9c75db40e188264d36dcd570ef6a833e': libbacktrace: enable -fno-omit-frame-pointer for host build.
-rw-r--r--libbacktrace/Android.build.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk
index 8e63dab..84d07f2 100644
--- a/libbacktrace/Android.build.mk
+++ b/libbacktrace/Android.build.mk
@@ -79,8 +79,13 @@ endif
ifeq ($(build_type),host)
# Only build if host builds are supported.
ifeq ($(build_host),true)
- LOCAL_CFLAGS += -Wno-extern-c-compat -fno-omit-frame-pointer
include $(LLVM_HOST_BUILD_MK)
+ # -fno-omit-frame-pointer should be set for host build. Because currently
+ # libunwind can't recognize .debug_frame using dwarf version 4, and it relies
+ # on stack frame pointer to do unwinding on x86.
+ # $(LLVM_HOST_BUILD_MK) overwrites -fno-omit-frame-pointer. so the below line
+ # must be after the include.
+ LOCAL_CFLAGS += -Wno-extern-c-compat -fno-omit-frame-pointer
include $(BUILD_HOST_$(build_target))
endif
endif