diff options
| author | Dan Albert <danalbert@google.com> | 2015-06-15 18:46:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-15 18:46:17 +0000 |
| commit | 1aea4ce5992ad450d824b586b485ca62dc19999a (patch) | |
| tree | ffd98f7ee70e6dfb66bcf492b1665a74f06181bb | |
| parent | 1f1e9247c2356a325ed1e3af4cd05d693e707809 (diff) | |
| parent | ef6049a09792c8642ebaac878e34909c7cc2b126 (diff) | |
| download | linux-tools-perf-1aea4ce5992ad450d824b586b485ca62dc19999a.tar.gz | |
am ef6049a0: Merge "Lock to GCC for all architectures."
* commit 'ef6049a09792c8642ebaac878e34909c7cc2b126':
Lock to GCC for all architectures.
| -rw-r--r-- | src/tools/perf/Android.mk | 6 |
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) |