commit 509c5b3f67968008ab0d0aec4aa1bcf74ea4726c
author Stephen Hines <srhines@google.com> Tue Mar 31 21:09:40 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 31 21:09:40 2015 +0000
tree 95e75fe22424a98d47feb3566b65fa4eb0cbce0f
parent a98fad7bbf0446bddbcc6ccb3a4e9257d9d4556a
parent 3c951eb54adb5f6387e47cebb7eaf2b0096826ab

am 0ede6ef3: am 9c01c44b: Merge "Add -Wno-inline-asm to Clang flags."

* commit '0ede6ef3a52da2e9cc6dc25c81b7ca6f39109117':
  Add -Wno-inline-asm to Clang flags.

libbacktrace/Android.build.mk

diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk
index d7eaa68..ec3a71b 100644
--- a/libbacktrace/Android.build.mk
+++ b/libbacktrace/Android.build.mk
@@ -29,6 +29,9 @@
     $($(module)_cflags) \
     $($(module)_cflags_$(build_type)) \
 
+LOCAL_CLANG_CFLAGS += \
+    $(libbacktrace_common_clang_cflags) \
+
 LOCAL_CONLYFLAGS += \
     $(common_conlyflags) \
     $($(module)_conlyflags) \

libbacktrace/Android.mk

diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index f3b28dd..f72d667 100755
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@@ -26,6 +26,10 @@
 common_cppflags := \
 	-std=gnu++11 \
 
+# The latest clang (r230699) does not allow SP/PC to be declared in inline asm lists.
+libbacktrace_common_clang_cflags += \
+    -Wno-inline-asm
+
 build_host := false
 ifeq ($(HOST_OS),linux)
 ifeq ($(HOST_ARCH),$(filter $(HOST_ARCH),x86 x86_64))