From e6c76d620379fd65fc0310aee1785ff7b1b10236 Mon Sep 17 00:00:00 2001 From: Jiri Olsa Date: Sun, 1 Mar 2015 21:19:44 +0100 Subject: [PATCH] perf build: Move feature checks code under tools/build Moving feature checks code under tools/build directory. Changing also $feature_dir to point to new feature directory location and perf Makefiles to include Makefile.feature from new location. Signed-off-by: Jiri Olsa Cc: Corey Ashford Cc: David Ahern Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Link: http://lkml.kernel.org/n/tip-3lamtb30dhf4wo99y1n8kxg0@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/{perf/config => build}/Makefile.feature | 4 ++-- .../{perf/config/feature-checks => build/feature}/.gitignore | 0 tools/{perf/config/feature-checks => build/feature}/Makefile | 0 .../{perf/config/feature-checks => build/feature}/test-all.c | 0 .../config/feature-checks => build/feature}/test-backtrace.c | 0 .../config/feature-checks => build/feature}/test-bionic.c | 0 .../config/feature-checks => build/feature}/test-compile.c | 0 .../feature-checks => build/feature}/test-cplus-demangle.c | 0 .../config/feature-checks => build/feature}/test-dwarf.c | 0 .../feature-checks => build/feature}/test-fortify-source.c | 0 .../config/feature-checks => build/feature}/test-glibc.c | 0 .../feature-checks => build/feature}/test-gtk2-infobar.c | 0 .../{perf/config/feature-checks => build/feature}/test-gtk2.c | 0 .../config/feature-checks => build/feature}/test-hello.c | 0 .../config/feature-checks => build/feature}/test-libaudit.c | 0 .../feature-checks => build/feature}/test-libbabeltrace.c | 0 .../config/feature-checks => build/feature}/test-libbfd.c | 0 .../feature}/test-libdw-dwarf-unwind.c | 0 .../feature-checks => build/feature}/test-libelf-getphdrnum.c | 0 .../feature-checks => build/feature}/test-libelf-mmap.c | 0 .../config/feature-checks => build/feature}/test-libelf.c | 0 .../config/feature-checks => build/feature}/test-libnuma.c | 0 .../config/feature-checks => build/feature}/test-libperl.c | 0 .../feature-checks => build/feature}/test-libpython-version.c | 0 .../config/feature-checks => build/feature}/test-libpython.c | 0 .../config/feature-checks => build/feature}/test-libslang.c | 0 .../feature}/test-libunwind-debug-frame.c | 0 .../config/feature-checks => build/feature}/test-libunwind.c | 0 .../feature}/test-pthread-attr-setaffinity-np.c | 0 .../feature}/test-stackprotector-all.c | 0 .../feature}/test-sync-compare-and-swap.c | 0 .../config/feature-checks => build/feature}/test-timerfd.c | 0 .../{perf/config/feature-checks => build/feature}/test-zlib.c | 0 tools/perf/Makefile.perf | 2 +- tools/perf/config/Makefile | 2 +- 35 files changed, 4 insertions(+), 4 deletions(-) rename tools/{perf/config => build}/Makefile.feature (97%) rename tools/{perf/config/feature-checks => build/feature}/.gitignore (100%) rename tools/{perf/config/feature-checks => build/feature}/Makefile (100%) rename tools/{perf/config/feature-checks => build/feature}/test-all.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-backtrace.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-bionic.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-compile.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-cplus-demangle.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-dwarf.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-fortify-source.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-glibc.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-gtk2-infobar.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-gtk2.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-hello.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-libaudit.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-libbabeltrace.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-libbfd.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-libdw-dwarf-unwind.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-libelf-getphdrnum.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-libelf-mmap.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-libelf.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-libnuma.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-libperl.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-libpython-version.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-libpython.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-libslang.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-libunwind-debug-frame.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-libunwind.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-pthread-attr-setaffinity-np.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-stackprotector-all.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-sync-compare-and-swap.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-timerfd.c (100%) rename tools/{perf/config/feature-checks => build/feature}/test-zlib.c (100%) diff --git a/tools/perf/config/Makefile.feature b/tools/build/Makefile.feature similarity index 97% rename from tools/perf/config/Makefile.feature rename to tools/build/Makefile.feature index ea83a92630c0..c6f44894d4a1 100644 --- a/tools/perf/config/Makefile.feature +++ b/tools/build/Makefile.feature @@ -1,7 +1,7 @@ -feature_dir := $(srctree)/tools/perf/config/feature-checks +feature_dir := $(srctree)/tools/build/feature ifneq ($(OUTPUT),) - OUTPUT_FEATURES = $(OUTPUT)config/feature-checks/ + OUTPUT_FEATURES = $(OUTPUT)feature/ $(shell mkdir -p $(OUTPUT_FEATURES)) endif diff --git a/tools/perf/config/feature-checks/.gitignore b/tools/build/feature/.gitignore similarity index 100% rename from tools/perf/config/feature-checks/.gitignore rename to tools/build/feature/.gitignore diff --git a/tools/perf/config/feature-checks/Makefile b/tools/build/feature/Makefile similarity index 100% rename from tools/perf/config/feature-checks/Makefile rename to tools/build/feature/Makefile diff --git a/tools/perf/config/feature-checks/test-all.c b/tools/build/feature/test-all.c similarity index 100% rename from tools/perf/config/feature-checks/test-all.c rename to tools/build/feature/test-all.c diff --git a/tools/perf/config/feature-checks/test-backtrace.c b/tools/build/feature/test-backtrace.c similarity index 100% rename from tools/perf/config/feature-checks/test-backtrace.c rename to tools/build/feature/test-backtrace.c diff --git a/tools/perf/config/feature-checks/test-bionic.c b/tools/build/feature/test-bionic.c similarity index 100% rename from tools/perf/config/feature-checks/test-bionic.c rename to tools/build/feature/test-bionic.c diff --git a/tools/perf/config/feature-checks/test-compile.c b/tools/build/feature/test-compile.c similarity index 100% rename from tools/perf/config/feature-checks/test-compile.c rename to tools/build/feature/test-compile.c diff --git a/tools/perf/config/feature-checks/test-cplus-demangle.c b/tools/build/feature/test-cplus-demangle.c similarity index 100% rename from tools/perf/config/feature-checks/test-cplus-demangle.c rename to tools/build/feature/test-cplus-demangle.c diff --git a/tools/perf/config/feature-checks/test-dwarf.c b/tools/build/feature/test-dwarf.c similarity index 100% rename from tools/perf/config/feature-checks/test-dwarf.c rename to tools/build/feature/test-dwarf.c diff --git a/tools/perf/config/feature-checks/test-fortify-source.c b/tools/build/feature/test-fortify-source.c similarity index 100% rename from tools/perf/config/feature-checks/test-fortify-source.c rename to tools/build/feature/test-fortify-source.c diff --git a/tools/perf/config/feature-checks/test-glibc.c b/tools/build/feature/test-glibc.c similarity index 100% rename from tools/perf/config/feature-checks/test-glibc.c rename to tools/build/feature/test-glibc.c diff --git a/tools/perf/config/feature-checks/test-gtk2-infobar.c b/tools/build/feature/test-gtk2-infobar.c similarity index 100% rename from tools/perf/config/feature-checks/test-gtk2-infobar.c rename to tools/build/feature/test-gtk2-infobar.c diff --git a/tools/perf/config/feature-checks/test-gtk2.c b/tools/build/feature/test-gtk2.c similarity index 100% rename from tools/perf/config/feature-checks/test-gtk2.c rename to tools/build/feature/test-gtk2.c diff --git a/tools/perf/config/feature-checks/test-hello.c b/tools/build/feature/test-hello.c similarity index 100% rename from tools/perf/config/feature-checks/test-hello.c rename to tools/build/feature/test-hello.c diff --git a/tools/perf/config/feature-checks/test-libaudit.c b/tools/build/feature/test-libaudit.c similarity index 100% rename from tools/perf/config/feature-checks/test-libaudit.c rename to tools/build/feature/test-libaudit.c diff --git a/tools/perf/config/feature-checks/test-libbabeltrace.c b/tools/build/feature/test-libbabeltrace.c similarity index 100% rename from tools/perf/config/feature-checks/test-libbabeltrace.c rename to tools/build/feature/test-libbabeltrace.c diff --git a/tools/perf/config/feature-checks/test-libbfd.c b/tools/build/feature/test-libbfd.c similarity index 100% rename from tools/perf/config/feature-checks/test-libbfd.c rename to tools/build/feature/test-libbfd.c diff --git a/tools/perf/config/feature-checks/test-libdw-dwarf-unwind.c b/tools/build/feature/test-libdw-dwarf-unwind.c similarity index 100% rename from tools/perf/config/feature-checks/test-libdw-dwarf-unwind.c rename to tools/build/feature/test-libdw-dwarf-unwind.c diff --git a/tools/perf/config/feature-checks/test-libelf-getphdrnum.c b/tools/build/feature/test-libelf-getphdrnum.c similarity index 100% rename from tools/perf/config/feature-checks/test-libelf-getphdrnum.c rename to tools/build/feature/test-libelf-getphdrnum.c diff --git a/tools/perf/config/feature-checks/test-libelf-mmap.c b/tools/build/feature/test-libelf-mmap.c similarity index 100% rename from tools/perf/config/feature-checks/test-libelf-mmap.c rename to tools/build/feature/test-libelf-mmap.c diff --git a/tools/perf/config/feature-checks/test-libelf.c b/tools/build/feature/test-libelf.c similarity index 100% rename from tools/perf/config/feature-checks/test-libelf.c rename to tools/build/feature/test-libelf.c diff --git a/tools/perf/config/feature-checks/test-libnuma.c b/tools/build/feature/test-libnuma.c similarity index 100% rename from tools/perf/config/feature-checks/test-libnuma.c rename to tools/build/feature/test-libnuma.c diff --git a/tools/perf/config/feature-checks/test-libperl.c b/tools/build/feature/test-libperl.c similarity index 100% rename from tools/perf/config/feature-checks/test-libperl.c rename to tools/build/feature/test-libperl.c diff --git a/tools/perf/config/feature-checks/test-libpython-version.c b/tools/build/feature/test-libpython-version.c similarity index 100% rename from tools/perf/config/feature-checks/test-libpython-version.c rename to tools/build/feature/test-libpython-version.c diff --git a/tools/perf/config/feature-checks/test-libpython.c b/tools/build/feature/test-libpython.c similarity index 100% rename from tools/perf/config/feature-checks/test-libpython.c rename to tools/build/feature/test-libpython.c diff --git a/tools/perf/config/feature-checks/test-libslang.c b/tools/build/feature/test-libslang.c similarity index 100% rename from tools/perf/config/feature-checks/test-libslang.c rename to tools/build/feature/test-libslang.c diff --git a/tools/perf/config/feature-checks/test-libunwind-debug-frame.c b/tools/build/feature/test-libunwind-debug-frame.c similarity index 100% rename from tools/perf/config/feature-checks/test-libunwind-debug-frame.c rename to tools/build/feature/test-libunwind-debug-frame.c diff --git a/tools/perf/config/feature-checks/test-libunwind.c b/tools/build/feature/test-libunwind.c similarity index 100% rename from tools/perf/config/feature-checks/test-libunwind.c rename to tools/build/feature/test-libunwind.c diff --git a/tools/perf/config/feature-checks/test-pthread-attr-setaffinity-np.c b/tools/build/feature/test-pthread-attr-setaffinity-np.c similarity index 100% rename from tools/perf/config/feature-checks/test-pthread-attr-setaffinity-np.c rename to tools/build/feature/test-pthread-attr-setaffinity-np.c diff --git a/tools/perf/config/feature-checks/test-stackprotector-all.c b/tools/build/feature/test-stackprotector-all.c similarity index 100% rename from tools/perf/config/feature-checks/test-stackprotector-all.c rename to tools/build/feature/test-stackprotector-all.c diff --git a/tools/perf/config/feature-checks/test-sync-compare-and-swap.c b/tools/build/feature/test-sync-compare-and-swap.c similarity index 100% rename from tools/perf/config/feature-checks/test-sync-compare-and-swap.c rename to tools/build/feature/test-sync-compare-and-swap.c diff --git a/tools/perf/config/feature-checks/test-timerfd.c b/tools/build/feature/test-timerfd.c similarity index 100% rename from tools/perf/config/feature-checks/test-timerfd.c rename to tools/build/feature/test-timerfd.c diff --git a/tools/perf/config/feature-checks/test-zlib.c b/tools/build/feature/test-zlib.c similarity index 100% rename from tools/perf/config/feature-checks/test-zlib.c rename to tools/build/feature/test-zlib.c diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index e323eab10694..d5b9e0dae334 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -521,7 +521,7 @@ $(INSTALL_DOC_TARGETS): # config-clean: $(call QUIET_CLEAN, config) - $(Q)$(MAKE) -C config/feature-checks clean >/dev/null + $(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean config-clean $(call QUIET_CLEAN, core-objs) $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS) diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 01278429965a..6d1918a6b83b 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -176,7 +176,7 @@ LDFLAGS += -Wl,-z,noexecstack EXTLIBS = -lpthread -lrt -lm -ldl -include $(src-perf)/config/Makefile.feature +include $(srctree)/tools/build/Makefile.feature ifeq ($(feature-stackprotector-all), 1) CFLAGS += -fstack-protector-all