commit 611603536be3a6caaafb4289e2713cd117c70048
author Chih-hung Hsieh <chh@google.com> Fri Nov 20 22:19:58 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 20 22:19:58 2015 +0000
tree e46b967c44e4b5453d9806497102436df1396db6
parent 1aa3db0923daf1cd2a430d05f48b0c3680ccae17
parent e223eb95c4f3df36a7c24c3b9a4dfdeec06ac15d

Merge "Disable clang for arm64 where local __thread is used."

libdw/Android.mk

diff --git a/libdw/Android.mk b/libdw/Android.mk
index 6e8d77d..55a04dc 100755
--- a/libdw/Android.mk
+++ b/libdw/Android.mk
@@ -178,6 +178,9 @@
 # Clang has no nested functions.
 LOCAL_CLANG := false
 
+# b/25642296, local __thread variable does not work with arm64 clang/llvm.
+LOCAL_CLANG_arm64 := false
+
 LOCAL_SRC_FILES := $(LIBDW_SRC_FILES)
 
 LOCAL_C_INCLUDES := \

libdwfl/Android.mk

diff --git a/libdwfl/Android.mk b/libdwfl/Android.mk
index eb668e2..a2c0993 100755
--- a/libdwfl/Android.mk
+++ b/libdwfl/Android.mk
@@ -134,6 +134,9 @@
 # Clang has no nested functions.
 LOCAL_CLANG := false
 
+# b/25642296, local __thread variable does not work with arm64 clang/llvm.
+LOCAL_CLANG_arm64 := false
+
 LOCAL_SRC_FILES := $(LIBDWFL_SRC_FILES)
 
 LOCAL_C_INCLUDES := \

libelf/Android.mk

diff --git a/libelf/Android.mk b/libelf/Android.mk
index 9fc71ac..1c0195c 100755
--- a/libelf/Android.mk
+++ b/libelf/Android.mk
@@ -160,6 +160,9 @@
 
 include $(CLEAR_VARS)
 
+# b/25642296, local __thread variable does not work with arm64 clang/llvm.
+LOCAL_CLANG_arm64 := false
+
 LOCAL_SRC_FILES := $(LIBELF_SRC_FILES)
 
 LOCAL_C_INCLUDES := \