From 035e9ba97e6b8956475b5ba07202f1b22f00abff Mon Sep 17 00:00:00 2001
From: Stephen Hines <srhines@google.com>
Date: Tue, 31 Mar 2015 09:39:20 -0700
Subject: 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
---
 libbacktrace/Android.build.mk | 3 +++
 libbacktrace/Android.mk       | 4 ++++
 2 files changed, 7 insertions(+)

(limited to 'libbacktrace')

diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk
index 7e1cd53e5..2898f2fb7 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 f3b28dd4b..f72d6670d 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))
-- 
cgit v1.2.3