summaryrefslogtreecommitdiffstats
path: root/libbacktrace
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2015-03-31 09:39:20 -0700
committerStephen Hines <srhines@google.com>2015-03-31 09:41:24 -0700
commit035e9ba97e6b8956475b5ba07202f1b22f00abff (patch)
treee6c26abc0747346c0fc4820d26628e2964edd9ad /libbacktrace
parentde52ebc3f97500e7d618c32cf5d627a1beb0ead7 (diff)
downloadsystem_core-035e9ba97e6b8956475b5ba07202f1b22f00abff.zip
system_core-035e9ba97e6b8956475b5ba07202f1b22f00abff.tar.gz
system_core-035e9ba97e6b8956475b5ba07202f1b22f00abff.tar.bz2
Add -Wno-inline-asm to Clang flags.
The latest clang (r230699) does not allow SP/PC to be declared in inline asm lists. This is a problem for libraries that are attempting to save all register state. Change-Id: I1ce80530f8be85fd74e949d0c65b60080e0aaf2a
Diffstat (limited to 'libbacktrace')
-rw-r--r--libbacktrace/Android.build.mk3
-rwxr-xr-xlibbacktrace/Android.mk4
2 files changed, 7 insertions, 0 deletions
diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk
index 7e1cd53..2898f2f 100644
--- a/libbacktrace/Android.build.mk
+++ b/libbacktrace/Android.build.mk
@@ -29,6 +29,9 @@ LOCAL_CFLAGS := \
$($(module)_cflags) \
$($(module)_cflags_$(build_type)) \
+LOCAL_CLANG_CFLAGS += \
+ $(libbacktrace_common_clang_cflags) \
+
LOCAL_CONLYFLAGS += \
$(common_conlyflags) \
$($(module)_conlyflags) \
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_conlyflags := \
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))