From 5cab99f0f602cedbbb6aabb9ddf546aea0ef0819 Mon Sep 17 00:00:00 2001 From: Nick Alcock Date: Thu, 18 Oct 2012 17:01:57 +0100 Subject: [PATCH] ctf: cosmetic improvements to CTF linking DWARF2CTF is too long a tag: CTF aligns better. We should also not carry around the CONFIG_MODULE_SIG ctf module-name-setting code while module signing is not present in this kernel. Signed-off-by: Nick Alcock --- scripts/Makefile.modpost | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 28a1971d67f2..de50b794033a 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -16,7 +16,7 @@ # 5) compile all .mod.c files # 6) generate CTF for the entire kernel, or for the module alone if this is # a build of an external module -# 7) final link of the module +# 7) final link of the module to a file # Step 3 is used to place certain information in the module's ELF # section, including information such as: @@ -141,7 +141,7 @@ ifndef CONFIG_DT_DISABLE_CTF ifeq ($(KBUILD_EXTMOD),) ctf-dir := .ctf -quiet_cmd_ctf = DWARF2CTF +quiet_cmd_ctf = CTF cmd_ctf = scripts/dwarf2ctf/dwarf2ctf $(ctf-dir) objects.builtin modules.builtin scripts/dwarf2ctf/dedup.blacklist $^ builtins := $(shell cat objects.builtin 2>/dev/null) ctf-stamp := .ctf/ctf.stamp @@ -153,7 +153,7 @@ kernel/ctf/ctf.ko: .ctf/ctf.stamp else ctf-dir := $(KBUILD_EXTMOD)/.ctf -quiet_cmd_ctf = DWARF2CTF +quiet_cmd_ctf = CTF cmd_ctf = scripts/dwarf2ctf/dwarf2ctf $(ctf-dir) -e $^ builtins := ctf-stamp := $(ctf-dir)/$(notdir $(M)-extmod).stamp @@ -188,11 +188,7 @@ module-ctfs-modular = $(addprefix $(ctf-dir)/,$(notdir $*.mod.ctf)) # Expands to the name of a CTF file, given a target of a module name given to # one of the link rules below. -ifneq ($(CONFIG_MODULE_SIG),y) ctf-module-name = $(addprefix $(ctf-dir)/,$(notdir $(basename $@)).mod.ctf) -else -ctf-module-name = $(addprefix $(ctf-dir)/,$(notdir $(basename $(basename $@))).mod.ctf) -endif # Expands to a series of objcopy --add-section arguments to add all # necessary CTF files to a module, with appropriate section names. -- 2.50.1