From: Andi Kleen <[email protected]> Add autoprobing for the xed disassembler library.
Can be downloaded from https://github.com/intelxed/xed 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/build/feature/test-xed.c | 9 +++++++++ tools/perf/Makefile.config | 5 +++++ 5 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 tools/build/feature/test-xed.c diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature index e3fb5ecbdcb6..25183fa39963 100644 --- a/tools/build/Makefile.feature +++ b/tools/build/Makefile.feature @@ -63,7 +63,8 @@ FEATURE_TESTS_BASIC := \ lzma \ get_cpuid \ bpf \ - sdt + sdt \ + xed # FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list # of all feature tests @@ -105,7 +106,8 @@ FEATURE_DISPLAY ?= \ zlib \ lzma \ get_cpuid \ - bpf + bpf \ + xed # 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 b564a2eea039..a1275965c67d 100644 --- a/tools/build/feature/Makefile +++ b/tools/build/feature/Makefile @@ -48,7 +48,8 @@ FILES= \ test-get_cpuid.bin \ test-sdt.bin \ test-cxx.bin \ - test-jvmti.bin + test-jvmti.bin \ + test-xed.bin FILES := $(addprefix $(OUTPUT),$(FILES)) @@ -68,7 +69,7 @@ __BUILDXX = $(CXX) $(CXXFLAGS) -Wall -Werror -o $@ $(patsubst %.bin,%.cpp,$(@F)) ############################### $(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 -lxed $(OUTPUT)test-hello.bin: $(BUILD) @@ -123,6 +124,9 @@ $(OUTPUT)test-numa_num_possible_cpus.bin: $(OUTPUT)test-libunwind.bin: $(BUILD) -lelf +$(OUTPUT)test-xed.bin: + $(BUILD) -lxed + $(OUTPUT)test-libunwind-debug-frame.bin: $(BUILD) -lelf $(OUTPUT)test-libunwind-x86.bin: diff --git a/tools/build/feature/test-all.c b/tools/build/feature/test-all.c index 699e43627397..4a6dd1d1ff49 100644 --- a/tools/build/feature/test-all.c +++ b/tools/build/feature/test-all.c @@ -149,6 +149,10 @@ # include "test-sdt.c" #undef main +#define main main_test_xed +# include "test-xed.c" +#endif + int main(int argc, char *argv[]) { main_test_libpython(); @@ -183,6 +187,7 @@ int main(int argc, char *argv[]) main_test_bpf(); main_test_libcrypto(); main_test_sdt(); + main_test_xed(); return 0; } diff --git a/tools/build/feature/test-xed.c b/tools/build/feature/test-xed.c new file mode 100644 index 000000000000..ef9aebf1559d --- /dev/null +++ b/tools/build/feature/test-xed.c @@ -0,0 +1,9 @@ +#include <xed/xed-interface.h> +#include <xed/xed-decode.h> +#include <xed/xed-decoded-inst-api.h> + +int main(void) +{ + xed_tables_init(); + return 0; +} diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 76c84f0eec52..41cc34ce81f8 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -682,6 +682,11 @@ ifndef NO_ZLIB endif endif +ifeq ($(feature-xed), 1) + EXTLIBS += -lxed + $(call detected,CONFIG_XED) +endif + ifndef NO_LZMA ifeq ($(feature-lzma), 1) CFLAGS += -DHAVE_LZMA_SUPPORT -- 2.9.3
