diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-12-21 18:20:15 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-12-21 18:20:15 +0400 |
| commit | a9c43789f4a088e7effb1e21f2c74e3349e59d63 (patch) | |
| tree | 5461ebac7fcbd4dba50a9402b9431306e288a8c9 | |
| parent | 8ecfd08aed1c373c97305e9e4f77925eb04038ec (diff) | |
| download | linux-topics-tracking-ll-v3.7-misc-fixes-ll-20121221.1.tar.gz | |
perf: get rid of the <asm/bitsperlong.h> includetracking-ll-v3.7-misc-fixes-ll-20121221.1
The <asm/bitsperlong.h> include seems to cause trouble in some arm64 configs.
Also make libtraceevent to see Bionic -isystem flags passed to us.
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | tools/perf/Makefile | 2 | ||||
| -rw-r--r-- | tools/perf/compat-android.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index efd3e801f3a..653627dcf99 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -503,6 +503,8 @@ ifneq ($(call try-cc,$(SOURCE_LIBELF),$(FLAGS_LIBELF)),y) # That works too, but needs a bit of special treatment ANDROID_CFLAGS := -DANDROID -DHAVE_STRLCPY -include $(CURDIR)/compat-android.h BASIC_CFLAGS += $(ANDROID_CFLAGS) + # Make libtraceevent to see Bionic -isystem flags passed to us + ANDROID_CFLAGS += $(EXTRA_CFLAGS) ANDROID := 1 else msg := $(error No gnu/libc-version.h found, please install glibc-dev[el]/glibc-static); diff --git a/tools/perf/compat-android.h b/tools/perf/compat-android.h index fce9573d257..b76adae2773 100644 --- a/tools/perf/compat-android.h +++ b/tools/perf/compat-android.h @@ -38,8 +38,8 @@ typedef uint64_t u64; #endif #endif #define __deprecated -#include <asm-generic/bitsperlong.h> +#include <linux/bitops.h> #undef BITS_PER_LONG /* Something seems to define this incorrectly */ #define BITS_PER_LONG _BITSIZE |