Skip to contentSkip to conversation

perf build: Move feature checks code under tools/ build

tip:perf/core tip-bot for Jiri Olsa 1 participant 1 message Mar 22, 2015 perf events

lore
Share & tools
lore

tip-bot for Jiri Olsa

author merge bot
#0 lore raw
Commit-ID:  e6c76d620379fd65fc0310aee1785ff7b1b10236
Gitweb:     http://git.kernel.org/tip/e6c76d620379fd65fc0310aee1785ff7b1b10236
Author:     Jiri Olsa <[email protected]>
AuthorDate: Sun, 1 Mar 2015 21:19:44 +0100
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Sat, 21 Mar 2015 14:53:35 -0300

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 <[email protected]>
Cc Corey Ashford <[email protected]>
Cc David Ahern <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Link http://lkml.kernel.org/n/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/{perf/config => build}/Makefile.feature                         | 4 ++--
 tools/{perf/config/feature-checks => build/feature}/.gitignore        | 0
 tools/{perf/config/feature-checks => build/feature}/Makefile          | 0
 tools/{perf/config/feature-checks => build/feature}/test-all.c        | 0
 tools/{perf/config/feature-checks => build/feature}/test-backtrace.c  | 0
 tools/{perf/config/feature-checks => build/feature}/test-bionic.c     | 0
 tools/{perf/config/feature-checks => build/feature}/test-compile.c    | 0
 .../config/feature-checks => build/feature}/test-cplus-demangle.c     | 0
 tools/{perf/config/feature-checks => build/feature}/test-dwarf.c      | 0
 .../config/feature-checks => build/feature}/test-fortify-source.c     | 0
 tools/{perf/config/feature-checks => build/feature}/test-glibc.c      | 0
 .../{perf/config/feature-checks => build/feature}/test-gtk2-infobar.c | 0
 tools/{perf/config/feature-checks => build/feature}/test-gtk2.c       | 0
 tools/{perf/config/feature-checks => build/feature}/test-hello.c      | 0
 tools/{perf/config/feature-checks => build/feature}/test-libaudit.c   | 0
 .../config/feature-checks => build/feature}/test-libbabeltrace.c      | 0
 tools/{perf/config/feature-checks => build/feature}/test-libbfd.c     | 0
 .../config/feature-checks => build/feature}/test-libdw-dwarf-unwind.c | 0
 .../config/feature-checks => build/feature}/test-libelf-getphdrnum.c  | 0
 .../{perf/config/feature-checks => build/feature}/test-libelf-mmap.c  | 0
 tools/{perf/config/feature-checks => build/feature}/test-libelf.c     | 0
 tools/{perf/config/feature-checks => build/feature}/test-libnuma.c    | 0
 tools/{perf/config/feature-checks => build/feature}/test-libperl.c    | 0
 .../config/feature-checks => build/feature}/test-libpython-version.c  | 0
 tools/{perf/config/feature-checks => build/feature}/test-libpython.c  | 0
 tools/{perf/config/feature-checks => build/feature}/test-libslang.c   | 0
 .../feature-checks => build/feature}/test-libunwind-debug-frame.c     | 0
 tools/{perf/config/feature-checks => build/feature}/test-libunwind.c  | 0
 .../feature}/test-pthread-attr-setaffinity-np.c                       | 0
 .../config/feature-checks => build/feature}/test-stackprotector-all.c | 0
 .../feature-checks => build/feature}/test-sync-compare-and-swap.c     | 0
 tools/{perf/config/feature-checks => build/feature}/test-timerfd.c    | 0
 tools/{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(-)
tools/build/Makefile.feature renamed from tools/perf/config/Makefile.feature +2 -2
similarity index 97%
rename from tools/perf/config/Makefile.feature
rename to tools/build/Makefile.feature
index ea83a92..c6f4489 100644
@@ -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
tools/build/feature/.gitignore renamed from tools/perf/config/feature-checks/.gitignore +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/.gitignore
rename to tools/build/feature/.gitignore
tools/build/feature/Makefile renamed from tools/perf/config/feature-checks/Makefile +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/Makefile
rename to tools/build/feature/Makefile
tools/build/feature/test-all.c renamed from tools/perf/config/feature-checks/test-all.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-all.c
rename to tools/build/feature/test-all.c
tools/build/feature/test-backtrace.c renamed from tools/perf/config/feature-checks/test-backtrace.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-backtrace.c
rename to tools/build/feature/test-backtrace.c
tools/build/feature/test-bionic.c renamed from tools/perf/config/feature-checks/test-bionic.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-bionic.c
rename to tools/build/feature/test-bionic.c
tools/build/feature/test-compile.c renamed from tools/perf/config/feature-checks/test-compile.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-compile.c
rename to tools/build/feature/test-compile.c
tools/build/feature/test-cplus-demangle.c renamed from tools/perf/config/feature-checks/test-cplus-demangle.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-cplus-demangle.c
rename to tools/build/feature/test-cplus-demangle.c
tools/build/feature/test-dwarf.c renamed from tools/perf/config/feature-checks/test-dwarf.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-dwarf.c
rename to tools/build/feature/test-dwarf.c
tools/build/feature/test-fortify-source.c renamed from tools/perf/config/feature-checks/test-fortify-source.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-fortify-source.c
rename to tools/build/feature/test-fortify-source.c
tools/build/feature/test-glibc.c renamed from tools/perf/config/feature-checks/test-glibc.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-glibc.c
rename to tools/build/feature/test-glibc.c
tools/build/feature/test-gtk2-infobar.c renamed from tools/perf/config/feature-checks/test-gtk2-infobar.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-gtk2-infobar.c
rename to tools/build/feature/test-gtk2-infobar.c
tools/build/feature/test-gtk2.c renamed from tools/perf/config/feature-checks/test-gtk2.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-gtk2.c
rename to tools/build/feature/test-gtk2.c
tools/build/feature/test-hello.c renamed from tools/perf/config/feature-checks/test-hello.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-hello.c
rename to tools/build/feature/test-hello.c
tools/build/feature/test-libaudit.c renamed from tools/perf/config/feature-checks/test-libaudit.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-libaudit.c
rename to tools/build/feature/test-libaudit.c
tools/build/feature/test-libbabeltrace.c renamed from tools/perf/config/feature-checks/test-libbabeltrace.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-libbabeltrace.c
rename to tools/build/feature/test-libbabeltrace.c
tools/build/feature/test-libbfd.c renamed from tools/perf/config/feature-checks/test-libbfd.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-libbfd.c
rename to tools/build/feature/test-libbfd.c
tools/build/feature/test-libdw-dwarf-unwind.c renamed from tools/perf/config/feature-checks/test-libdw-dwarf-unwind.c +0 -0
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
tools/build/feature/test-libelf-getphdrnum.c renamed from tools/perf/config/feature-checks/test-libelf-getphdrnum.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-libelf-getphdrnum.c
rename to tools/build/feature/test-libelf-getphdrnum.c
tools/build/feature/test-libelf-mmap.c renamed from tools/perf/config/feature-checks/test-libelf-mmap.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-libelf-mmap.c
rename to tools/build/feature/test-libelf-mmap.c
tools/build/feature/test-libelf.c renamed from tools/perf/config/feature-checks/test-libelf.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-libelf.c
rename to tools/build/feature/test-libelf.c
tools/build/feature/test-libnuma.c renamed from tools/perf/config/feature-checks/test-libnuma.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-libnuma.c
rename to tools/build/feature/test-libnuma.c
tools/build/feature/test-libperl.c renamed from tools/perf/config/feature-checks/test-libperl.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-libperl.c
rename to tools/build/feature/test-libperl.c
tools/build/feature/test-libpython-version.c renamed from tools/perf/config/feature-checks/test-libpython-version.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-libpython-version.c
rename to tools/build/feature/test-libpython-version.c
tools/build/feature/test-libpython.c renamed from tools/perf/config/feature-checks/test-libpython.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-libpython.c
rename to tools/build/feature/test-libpython.c
tools/build/feature/test-libslang.c renamed from tools/perf/config/feature-checks/test-libslang.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-libslang.c
rename to tools/build/feature/test-libslang.c
tools/build/feature/test-libunwind-debug-frame.c renamed from tools/perf/config/feature-checks/test-libunwind-debug-frame.c +0 -0
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
tools/build/feature/test-libunwind.c renamed from tools/perf/config/feature-checks/test-libunwind.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-libunwind.c
rename to tools/build/feature/test-libunwind.c
tools/build/feature/test-pthread-attr-setaffinity-np.c renamed from tools/perf/config/feature-checks/test-pthread-attr-setaffinity-np.c +0 -0
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
tools/build/feature/test-stackprotector-all.c renamed from tools/perf/config/feature-checks/test-stackprotector-all.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-stackprotector-all.c
rename to tools/build/feature/test-stackprotector-all.c
tools/build/feature/test-sync-compare-and-swap.c renamed from tools/perf/config/feature-checks/test-sync-compare-and-swap.c +0 -0
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
tools/build/feature/test-timerfd.c renamed from tools/perf/config/feature-checks/test-timerfd.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-timerfd.c
rename to tools/build/feature/test-timerfd.c
tools/build/feature/test-zlib.c renamed from tools/perf/config/feature-checks/test-zlib.c +0 -0
similarity index 100%
rename from tools/perf/config/feature-checks/test-zlib.c
rename to tools/build/feature/test-zlib.c
tools/perf/Makefile.perf +1 -1
index e323eab..d5b9e0d 100644
@@ -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)
tools/perf/config/Makefile +1 -1
index 0127842..6d1918a 100644
@@ -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