From: Andi Kleen <[email protected]> Add support for autoprobing for the udev86 disassembler library.
Signed-off-by: Andi Kleen <[email protected]> --- tools/build/Makefile.feature | 6 ++++-- tools/build/feature/Makefile | 8 ++++++-- tools/build/feature/test-all.c | 5 +++++ tools/perf/config/Makefile | 5 +++++ 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature index 02db3cd..7de4fcb 100644 --- a/tools/build/Makefile.feature +++ b/tools/build/Makefile.feature @@ -54,7 +54,8 @@ FEATURE_TESTS ?= \ zlib \ lzma \ get_cpuid \ - bpf + bpf \ + udis86 FEATURE_DISPLAY ?= \ dwarf \ @@ -73,7 +74,8 @@ FEATURE_DISPLAY ?= \ zlib \ lzma \ get_cpuid \ - bpf + bpf \ + udis86 # Set FEATURE_CHECK_(C|LD)FLAGS-all for all FEATURE_TESTS features. # If in the future we need per-feature checks/flags for features not diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile index bf8f035..c89941e 100644 --- a/tools/build/feature/Makefile +++ b/tools/build/feature/Makefile @@ -35,7 +35,8 @@ FILES= \ test-zlib.bin \ test-lzma.bin \ test-bpf.bin \ - test-get_cpuid.bin + test-get_cpuid.bin \ + test-udis86.bin FILES := $(addprefix $(OUTPUT),$(FILES)) @@ -50,7 +51,7 @@ __BUILD = $(CC) $(CFLAGS) -Wall -Werror -o $@ $(patsubst %.bin,%.c,$(@F)) $(LDFL ############################### $(OUTPUT)test-all.bin: - $(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -laudit -I/usr/include/slang -lslang $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -llzma + $(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -laudit -I/usr/include/slang -lslang $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -llzma -ludis86 $(OUTPUT)test-hello.bin: $(BUILD) @@ -96,6 +97,9 @@ $(OUTPUT)test-numa_num_possible_cpus.bin: $(OUTPUT)test-libunwind.bin: $(BUILD) -lelf +$(OUTPUT)test-udis86.bin: + $(BUILD) -ludis86 + $(OUTPUT)test-libunwind-debug-frame.bin: $(BUILD) -lelf diff --git a/tools/build/feature/test-all.c b/tools/build/feature/test-all.c index 81025ca..d67b1d5 100644 --- a/tools/build/feature/test-all.c +++ b/tools/build/feature/test-all.c @@ -129,6 +129,10 @@ # include "test-bpf.c" #undef main +#define main main_test_udis86 +# include "test-udis86.c" +#endif + int main(int argc, char *argv[]) { main_test_libpython(); @@ -158,6 +162,7 @@ int main(int argc, char *argv[]) main_test_lzma(); main_test_get_cpuid(); main_test_bpf(); + main_test_udis86(); return 0; } diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 511141b..19bac7c 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -576,6 +576,11 @@ ifneq ($(filter -lbfd,$(EXTLIBS)),) CFLAGS += -DHAVE_LIBBFD_SUPPORT endif +ifeq ($(feature-udis86), 1) + CFLAGS += -DHAVE_UDIS86 + EXTLIBS += -ludis86 +endif + ifndef NO_ZLIB ifeq ($(feature-zlib), 1) CFLAGS += -DHAVE_ZLIB_SUPPORT -- 2.5.0
