Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934107AbaFCWJ7 (ORCPT ); Tue, 3 Jun 2014 18:09:59 -0400 Received: from mail-wi0-f180.google.com ([209.85.212.180]:50677 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965359AbaFCWJV (ORCPT ); Tue, 3 Jun 2014 18:09:21 -0400 From: Alexis Berlemont To: linux-kernel@vger.kernel.org Cc: Alexis Berlemont , jolsa@redhat.com, dsahern@gmail.com, mingo@kernel.org, sam@ravnborg.org, mmarek@suse.cz Subject: [PATCH 31/32] perf kbuild: minor changes Date: Wed, 4 Jun 2014 00:06:24 +0200 Message-Id: <1401833185-10347-32-git-send-email-alexis.berlemont@gmail.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1401833185-10347-1-git-send-email-alexis.berlemont@gmail.com> References: <1401833185-10347-1-git-send-email-alexis.berlemont@gmail.com> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Correctly rename internal makefile variables * Remove makefiles in tools/perf/config which became empty --- tools/perf/Makefile.kbuild | 1 - tools/perf/arch/x86/Makefile | 2 +- tools/perf/config/Makefile | 40 +++++++++++++++++------------------ tools/perf/config/Makefile.fix-config | 6 ------ tools/perf/config/Makefile.fix-legacy | 2 -- 5 files changed, 21 insertions(+), 30 deletions(-) delete mode 100644 tools/perf/config/Makefile.fix-config delete mode 100644 tools/perf/config/Makefile.fix-legacy diff --git a/tools/perf/Makefile.kbuild b/tools/perf/Makefile.kbuild index 5372cc9..e5cda88 100644 --- a/tools/perf/Makefile.kbuild +++ b/tools/perf/Makefile.kbuild @@ -155,7 +155,6 @@ $(CONFIG_DETECTED): $(KCONFIG_CONFIG) # no need to include auto.conf.cmd, because .config # is the only dependency here $(KCONFIG_AUTOCONFIG): $(KCONFIG_CONFIG) $(CONFIG_DETECTED) - $(Q)$(MAKE) -f $(src-perf)/config/Makefile.fix-config $(Q)mkdir -p $(obj-perf)/include/config $(Q)mkdir -p $(obj-perf)/include/generated $(Q)$(MAKE) -s $(build)=scripts/kconfig silentoldconfig diff --git a/tools/perf/arch/x86/Makefile b/tools/perf/arch/x86/Makefile index d37e641..f95187e 100644 --- a/tools/perf/arch/x86/Makefile +++ b/tools/perf/arch/x86/Makefile @@ -1,4 +1,4 @@ -ifeq ($(LIBDWARF), 1) +ifeq ($(config-libdwarf), 1) PERF_HAVE_DWARF_REGS := 1 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o endif diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 9983254..8957c94 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -38,7 +38,7 @@ endif ifeq ($(LIBUNWIND_LIBS),) $(shell $(KCONFIG_SCRIPT) -d CONFIG_LIBUNWIND) else - LIBUNWIND = 1 + config-libunwind = 1 # # For linking with debug library, run like: # @@ -71,7 +71,7 @@ ifdef CONFIG_LIBELF endif ifdef KCONFIG_CONFIG -include $(src-perf)/config/Makefile.fix-legacy +include $(KCONFIG_CONFIG) endif # include ARCH specific config @@ -275,12 +275,12 @@ endif ifdef CONFIG_LIBELF ifeq ($(feature-libelf), 0) ifeq ($(feature-glibc), 1) - LIBC_SUPPORT := 1 + config-libc := 1 endif ifeq ($(BIONIC),1) - LIBC_SUPPORT := 1 + config-libc := 1 endif - ifeq ($(LIBC_SUPPORT),1) + ifeq ($(config-libc),1) msg := $(warning No libelf found, disables 'probe' tool, please install elfutils-libelf-devel/libelf-dev); $(shell $(KCONFIG_SCRIPT) -d CONFIG_LIBELF) $(shell $(KCONFIG_SCRIPT) -E CONFIG_LIBELF_MINIMAL) @@ -288,13 +288,13 @@ ifdef CONFIG_LIBELF msg := $(error No gnu/libc-version.h found, please install glibc-dev[el]/glibc-static); endif else - LIBELF = 1 + config-libelf = 1 ifdef CONFIG_LIBDWARF ifneq ($(feature-dwarf), 1) msg := $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev); $(shell $(KCONFIG_SCRIPT) -d CONFIG_LIBDWARF) else - LIBDWARF = 1 + config-libdwarf = 1 endif # Dwarf support ifdef CONFIG_LIBDWARF_UNWIND # So far there's only x86 libdw unwind support merged in @@ -306,7 +306,7 @@ ifdef CONFIG_LIBELF msg := $(warning No libdw DWARF unwind found, Please install elfutils-devel/libdw-dev >= 0.158 and/or set CONFIG_LIBDWARF_DIR); $(shell $(KCONFIG_SCRIPT) -d CONFIG_LIBDWARF_UNWIND) else - LIBDWARF_UNWIND = 1 + config-libdwarf-unwind = 1 endif # Dwarf unwind support else $(shell $(KCONFIG_SCRIPT) -d CONFIG_LIBDWARF_UNWIND) @@ -316,7 +316,7 @@ ifdef CONFIG_LIBELF endif # libelf support endif # CONFIG_LIBELF -ifeq ($(LIBELF), 1) +ifeq ($(config-libelf), 1) ifdef CONFIG_LIBELF_MMAP ifneq ($(feature-libelf-mmap), 1) @@ -324,16 +324,16 @@ ifeq ($(LIBELF), 1) endif endif - ifdef CONFIG_LIBELF_MMAP + ifdef CONFIG_LIBELF_GETPHDRNUM ifneq ($(feature-libelf-getphdrnum), 1) - $(shell $(KCONFIG_SCRIPT) -d CONFIG_LIBELF_MMAP) + $(shell $(KCONFIG_SCRIPT) -d CONFIG_LIBELF_GETPHDRNUM) endif endif # include ARCH specific config -include $(src-perf)/arch/$(ARCH)/Makefile - ifeq ($(LIBDWARF), 1) + ifeq ($(config-libdwarf), 1) ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined) msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled); $(shell $(KCONFIG_SCRIPT) -d CONFIG_LIBDWARF) @@ -349,17 +349,17 @@ ifdef CONFIG_UNWIND # CONFIG_LIBUNWIND is the default choice; so, if it is not # available, let's try another one ifdef CONFIG_LIBUNWIND - ifeq ($(LIBUNWIND), 1) + ifeq ($(config-libunwind), 1) ifneq ($(feature-libunwind), 1) - LIBUNWIND = 0 + config-libunwind = 0 $(shell $(KCONFIG_SCRIPT) -d CONFIG_LIBUNWIND) - ifeq ($(LIBDWARF_UNWIND), 1) + ifeq ($(config-libdwarf-unwind), 1) msg := $(warning No libunwind found, post unwind will rely on libdwarf-unwind. Please install libunwind-dev[el] >= 1.1); $(shell $(KCONFIG_SCRIPT) -e CONFIG_LIBDWARF_UNWIND) else msg := $(warning No libunwind found, disabling post unwind support. Please install libunwind-dev[el] >= 1.1); $(shell $(KCONFIG_SCRIPT) -d CONFIG_UNWIND) - endif # LIBDWARF_UNWIND + endif # config-libdwarf-unwind else # feature-libunwind OK EXTLIBS += $(LIBUNWIND_LIBS) CFLAGS += $(LIBUNWIND_CFLAGS) @@ -371,7 +371,7 @@ ifdef CONFIG_UNWIND # CONFIG_LIBDWARF_UNWIND is not the default choice (so the user's # choice); so, we disable CONFIG_UNWIND if it is not available ifdef CONFIG_LIBDWARF_UNWIND - ifneq ($(LIBDWARF_UNWIND), 1) + ifneq ($(config-libdwarf-unwind), 1) msg := $(warning Disabling post unwing because (libdwarf-unwind is not available)); $(shell $(KCONFIG_SCRIPT) -d CONFIG_UNWIND) endif @@ -379,7 +379,7 @@ ifdef CONFIG_UNWIND # if libunwind is OK, let's check the option DEBUG_FRAME ifdef CONFIG_LIBUNWIND - ifeq ($(LIBUNWIND), 1) + ifeq ($(config-libunwind), 1) ifeq ($(ARCH),arm) $(call feature_check,libunwind-debug-frame) ifneq ($(feature-libunwind-debug-frame), 1) @@ -396,11 +396,11 @@ ifdef CONFIG_UNWIND dwarf-post-unwind = 0 dwarf-post-unwind-text = BUG -ifeq ($(LIBUNWIND), 1) +ifeq ($(config-libunwind), 1) dwarf-post-unwind := 1 dwarf-post-unwind-text := libunwind else - ifeq ($(LIBDWARF_UNWIND), 1) + ifeq ($(config-libdwarf-unwind), 1) dwarf-post-unwind := 1 dwarf-post-unwind-text := libdw endif diff --git a/tools/perf/config/Makefile.fix-config b/tools/perf/config/Makefile.fix-config deleted file mode 100644 index 3f0e33e..0000000 --- a/tools/perf/config/Makefile.fix-config +++ /dev/null @@ -1,6 +0,0 @@ -include $(CONFIG_DETECTED) -include $(KCONFIG_CONFIG) - -CONFIG := $(srctree)/scripts/config --file $(KCONFIG_CONFIG) - -all: diff --git a/tools/perf/config/Makefile.fix-legacy b/tools/perf/config/Makefile.fix-legacy deleted file mode 100644 index 431c9bf..0000000 --- a/tools/perf/config/Makefile.fix-legacy +++ /dev/null @@ -1,2 +0,0 @@ - -include $(KCONFIG_CONFIG) -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/