From: Andi Kleen <a...@linux.intel.com> Add autoprobing for the udev86 disassembler library.
Signed-off-by: Andi Kleen <a...@linux.intel.com> Acked-by: Jiri Olsa <jo...@kernel.org> Cc: Stephane Eranian <eran...@google.com> Link: http://lkml.kernel.org/r/1459187142-20035-2-git-send-email-a...@firstfloor.org Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/build/Makefile.feature | 6 ++++-- tools/build/feature/Makefile | 8 ++++++-- tools/build/feature/test-all.c | 5 +++++ tools/build/feature/test-udis86.c | 8 ++++++++ tools/perf/config/Makefile | 5 +++++ 5 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 tools/build/feature/test-udis86.c diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature index 6b7707270aa3..db4f426cae09 100644 --- a/tools/build/Makefile.feature +++ b/tools/build/Makefile.feature @@ -55,7 +55,8 @@ FEATURE_TESTS_BASIC := \ zlib \ lzma \ get_cpuid \ - bpf + bpf \ + udis86 # FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list # of all feature tests @@ -94,7 +95,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 c5f4c417428d..d05c312f25c0 100644 --- a/tools/build/feature/Makefile +++ b/tools/build/feature/Makefile @@ -36,7 +36,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)) @@ -51,7 +52,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) @@ -97,6 +98,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 e499a36c1e4a..76b0de3d145a 100644 --- a/tools/build/feature/test-all.c +++ b/tools/build/feature/test-all.c @@ -133,6 +133,10 @@ # include "test-libcrypto.c" #undef main +#define main main_test_udis86 +# include "test-udis86.c" +#endif + int main(int argc, char *argv[]) { main_test_libpython(); @@ -163,6 +167,7 @@ int main(int argc, char *argv[]) main_test_get_cpuid(); main_test_bpf(); main_test_libcrypto(); + main_test_udis86(); return 0; } diff --git a/tools/build/feature/test-udis86.c b/tools/build/feature/test-udis86.c new file mode 100644 index 000000000000..623c545f4bad --- /dev/null +++ b/tools/build/feature/test-udis86.c @@ -0,0 +1,8 @@ +#include <udis86.h> + +int main(void) +{ + ud_t ud; + ud_init(&ud); + return 0; +} diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index f7d7f5a1cad5..399ada8e7a47 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -587,6 +587,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.5
