diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2015-01-09 23:23:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-09 23:23:46 +0000 |
| commit | c8fcdaa0d0d4b4c93660fea15bee06e4893796ad (patch) | |
| tree | a4ad9a62d5975dd31e0ac0fb5c7f7c84f3c065f2 | |
| parent | f608ab242d9b37e4b4c087314806071202d71f41 (diff) | |
| parent | c26c17c48e3234ff2169107e282ec29e54432874 (diff) | |
| download | linux-tools-perf-c8fcdaa0d0d4b4c93660fea15bee06e4893796ad.tar.gz | |
Merge "Disable clang only for the arm target."
| -rw-r--r-- | perf-3.12.0/tools/perf/Android.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/perf-3.12.0/tools/perf/Android.mk b/perf-3.12.0/tools/perf/Android.mk index 400e548..30f8414 100644 --- a/perf-3.12.0/tools/perf/Android.mk +++ b/perf-3.12.0/tools/perf/Android.mk @@ -134,6 +134,9 @@ common_elfutil_headers := \ common_clang_compiler_flags := \ -Wno-int-conversion \ + -Wno-tautological-pointer-compare \ + -Wno-tautological-constant-out-of-range-compare \ + -Wno-pointer-bool-conversion \ common_compiler_flags := \ -include external/linux-tools-perf/android-fixes.h \ @@ -179,9 +182,11 @@ host_predefined_macros := \ -DHAVE_ON_EXIT \ include $(CLEAR_VARS) -# builtin-report.c and builtin-top.c have undefined __aeabi_read_tp +ifeq ($(TARGET_ARCH),arm) +# b/17167262, builtin-report.c and builtin-top.c have undefined __aeabi_read_tp # when compiled with clang -fpie. LOCAL_CLANG := false +endif LOCAL_SRC_FILES := $(libperf_src_files) @@ -275,9 +280,11 @@ perf_src_files_x86 = \ tests/perf-time-to-tsc.c \ include $(CLEAR_VARS) -# builtin-report.c and builtin-top.c have undefined __aeabi_read_tp +ifeq ($(TARGET_ARCH),arm) +# b/17167262, builtin-report.c and builtin-top.c have undefined __aeabi_read_tp # when compiled with clang -fpie. LOCAL_CLANG := false +endif LOCAL_SRC_FILES := $(perf_src_files) LOCAL_SRC_FILES_x86 := $(perf_src_files_x86) |