aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-06-15 18:26:10 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-06-15 18:26:10 +0000
commitef6049a09792c8642ebaac878e34909c7cc2b126 (patch)
treeffd98f7ee70e6dfb66bcf492b1665a74f06181bb
parent77006d8a6973d6e73b6843c5f09f879f2ee42569 (diff)
parent4697a5ddba3df1036ba349a4a98fd1a2df9ba6ee (diff)
downloadlinux-tools-perf-ef6049a09792c8642ebaac878e34909c7cc2b126.tar.gz
Merge "Lock to GCC for all architectures."
-rw-r--r--src/tools/perf/Android.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/perf/Android.mk b/src/tools/perf/Android.mk
index 4330a07..0b81231 100644
--- a/src/tools/perf/Android.mk
+++ b/src/tools/perf/Android.mk
@@ -221,11 +221,13 @@ common_predefined_macros := \
-DNO_LIBAUDIT \
include $(CLEAR_VARS)
-ifeq ($(TARGET_ARCH),arm)
+
# b/17167262, builtin-report.c and builtin-top.c have undefined __aeabi_read_tp
# when compiled with clang -fpie.
+#
+# Aside from that, this code is not -Wreturn-type safe. Rather than rewriting
+# the bison generated code, just use GCC.
LOCAL_CLANG := false
-endif
LOCAL_SRC_FILES := $(perf_src_files)
LOCAL_SRC_FILES_x86 := $(perf_src_files_x86)