summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2019-02-05 16:33:37 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2019-03-14 02:39:10 +0900
commit898f5a009f226fbaee0ff9ea58b919a31f627d1e (patch)
tree38bf96460fdae43067d057cd27ecb37dbd403eb5
parent46c7dd56d54133e3fb9414844d90e563627f3feb (diff)
downloadlinux-0-day-898f5a009f226fbaee0ff9ea58b919a31f627d1e.tar.gz
linux-0-day-898f5a009f226fbaee0ff9ea58b919a31f627d1e.tar.xz
kbuild: move archive command to scripts/Makefile.lib
scripts/Makefile.build and arch/s390/boot/Makefile use the same command (thin archiving with symbol table creation). Avoid the code duplication, and move it to scripts/Makefile.lib. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-rw-r--r--arch/s390/boot/Makefile3
-rw-r--r--scripts/Makefile.build6
-rw-r--r--scripts/Makefile.lib6
3 files changed, 7 insertions, 8 deletions
diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile
index 11ca8795b74a..c844eaf24ed7 100644
--- a/arch/s390/boot/Makefile
+++ b/arch/s390/boot/Makefile
@@ -57,9 +57,6 @@ $(obj)/section_cmp%: vmlinux $(obj)/compressed/vmlinux FORCE
$(obj)/compressed/vmlinux: $(obj)/startup.a FORCE
$(Q)$(MAKE) $(build)=$(obj)/compressed $@
-quiet_cmd_ar = AR $@
- cmd_ar = rm -f $@; $(AR) rcsTP$(KBUILD_ARFLAGS) $@ $(real-prereqs)
-
$(obj)/startup.a: $(OBJECTS) FORCE
$(call if_changed,ar)
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 850b611f4aba..2554a15ecf2b 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -426,13 +426,9 @@ $(modorder-target): $(subdir-ym) FORCE
# Rule to compile a set of .o files into one .a file (with symbol table)
#
ifdef lib-target
-quiet_cmd_link_l_target = AR $@
-
-# lib target archives do get a symbol table and index
-cmd_link_l_target = rm -f $@; $(AR) rcsTP$(KBUILD_ARFLAGS) $@ $(real-prereqs)
$(lib-target): $(lib-y) FORCE
- $(call if_changed,link_l_target)
+ $(call if_changed,ar)
targets += $(lib-target)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index c0abd9a779c3..8a1f64f17740 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -233,6 +233,12 @@ $(obj)/%: $(src)/%_shipped
quiet_cmd_ld = LD $@
cmd_ld = $(LD) $(ld_flags) $(real-prereqs) -o $@
+# Archive
+# ---------------------------------------------------------------------------
+
+quiet_cmd_ar = AR $@
+ cmd_ar = rm -f $@; $(AR) rcsTP$(KBUILD_ARFLAGS) $@ $(real-prereqs)
+
# Objcopy
# ---------------------------------------------------------------------------