diff options
| author | Stephen Hines <srhines@google.com> | 2015-03-31 20:56:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-31 20:56:06 +0000 |
| commit | 9c01c44bd6641f934afeece3c2ab2ab91e791dfc (patch) | |
| tree | 80f8cccecc66b6c91ba60aa5014cb0552cfdacce /libbacktrace | |
| parent | b6f38def22add4b5d6878185d238f91659239161 (diff) | |
| parent | 035e9ba97e6b8956475b5ba07202f1b22f00abff (diff) | |
| download | system_core-9c01c44bd6641f934afeece3c2ab2ab91e791dfc.zip system_core-9c01c44bd6641f934afeece3c2ab2ab91e791dfc.tar.gz system_core-9c01c44bd6641f934afeece3c2ab2ab91e791dfc.tar.bz2 | |
Merge "Add -Wno-inline-asm to Clang flags."
Diffstat (limited to 'libbacktrace')
| -rw-r--r-- | libbacktrace/Android.build.mk | 3 | ||||
| -rwxr-xr-x | libbacktrace/Android.mk | 4 |
2 files changed, 7 insertions, 0 deletions
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 @@ 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)) |