Skip to content

Commit 28d747f

Browse files
torvaldstorvalds
committed
Merge tag 'kbuild-v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild updates from Masahiro Yamada: - add more Build-Depends to Debian source package - prefix header search paths with $(srctree)/ - make modpost show verbose section mismatch warnings - avoid hard-coded CROSS_COMPILE for h8300 - fix regression for Debian make-kpkg command - add semantic patch to detect missing put_device() - fix some warnings of 'make deb-pkg' - optimize NOSTDINC_FLAGS evaluation - add warnings about redundant generic-y - clean up Makefiles and scripts * tag 'kbuild-v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: kconfig: remove stale lxdialog/.gitignore kbuild: force all architectures except um to include mandatory-y kbuild: warn redundant generic-y Revert "modsign: Abort modules_install when signing fails" kbuild: Make NOSTDINC_FLAGS a simply expanded variable kbuild: deb-pkg: avoid implicit effects coccinelle: semantic code search for missing put_device() kbuild: pkg: grep include/config/auto.conf instead of $KCONFIG_CONFIG kbuild: deb-pkg: introduce is_enabled and if_enabled_echo to builddeb kbuild: deb-pkg: add CONFIG_ prefix to kernel config options kbuild: add workaround for Debian make-kpkg kbuild: source include/config/auto.conf instead of ${KCONFIG_CONFIG} unicore32: simplify linker script generation for decompressor h8300: use cc-cross-prefix instead of hardcoding h8300-unknown-linux- kbuild: move archive command to scripts/Makefile.lib modpost: always show verbose warning for section mismatch ia64: prefix header search path with $(srctree)/ libfdt: prefix header search paths with $(srctree)/ deb-pkg: generate correct build dependencies
2 parents 80b98e9 + c71bb9f commit 28d747f

File tree

57 files changed

+153
-156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+153
-156
lines changed

‎Documentation/kbuild/makefiles.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1274,7 +1274,7 @@ See subsequent chapter for the syntax of the Kbuild file.
12741274

12751275
--- 7.4 mandatory-y
12761276

1277-
mandatory-y is essentially used by include/(uapi/)asm-generic/Kbuild.asm
1277+
mandatory-y is essentially used by include/(uapi/)asm-generic/Kbuild
12781278
to define the minimum set of ASM headers that all architectures must have.
12791279

12801280
This works like optional generic-y. If a mandatory header is missing

‎Makefile

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,16 @@ _all:
3131
# descending is started. They are now explicitly listed as the
3232
# prepare rule.
3333

34+
# Ugly workaround for Debian make-kpkg:
35+
# make-kpkg directly includes the top Makefile of Linux kernel. In such a case,
36+
# skip sub-make to support debian_* targets in ruleset/kernel_version.mk, but
37+
# displays warning to discourage such abusage.
38+
ifneq ($(word 2, $(MAKEFILE_LIST)),)
39+
$(warning Do not include top Makefile of Linux Kernel)
40+
sub-make-done := 1
41+
MAKEFLAGS += -rR
42+
endif
43+
3444
ifneq ($(sub-make-done),1)
3545

3646
# Do not use make's built-in rules and variables
@@ -402,7 +412,7 @@ CHECK = sparse
402412

403413
CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
404414
-Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF)
405-
NOSTDINC_FLAGS =
415+
NOSTDINC_FLAGS :=
406416
CFLAGS_MODULE =
407417
AFLAGS_MODULE =
408418
LDFLAGS_MODULE =
@@ -1088,9 +1098,11 @@ asm-generic := -f $(srctree)/scripts/Makefile.asm-generic obj
10881098

10891099
PHONY += asm-generic uapi-asm-generic
10901100
asm-generic: uapi-asm-generic
1091-
$(Q)$(MAKE) $(asm-generic)=arch/$(SRCARCH)/include/generated/asm
1101+
$(Q)$(MAKE) $(asm-generic)=arch/$(SRCARCH)/include/generated/asm \
1102+
generic=include/asm-generic
10921103
uapi-asm-generic:
1093-
$(Q)$(MAKE) $(asm-generic)=arch/$(SRCARCH)/include/generated/uapi/asm
1104+
$(Q)$(MAKE) $(asm-generic)=arch/$(SRCARCH)/include/generated/uapi/asm \
1105+
generic=include/uapi/asm-generic
10941106

10951107
PHONY += prepare-objtool
10961108
prepare-objtool: $(objtool_target)

‎arch/alpha/include/uapi/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
include include/uapi/asm-generic/Kbuild.asm
2-
31
generated-y += unistd_32.h

‎arch/arc/include/uapi/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
include include/uapi/asm-generic/Kbuild.asm
2-
31
generic-y += kvm_para.h
42
generic-y += ucontext.h

‎arch/arm/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ generic-y += segment.h
1818
generic-y += serial.h
1919
generic-y += simd.h
2020
generic-y += sizes.h
21-
generic-y += timex.h
2221
generic-y += trace_clock.h
2322

2423
generated-y += mach-types.h

‎arch/arm/include/uapi/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
include include/uapi/asm-generic/Kbuild.asm
32

43
generated-y += unistd-common.h
54
generated-y += unistd-oabi.h

‎arch/arm64/include/uapi/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
include include/uapi/asm-generic/Kbuild.asm
32

43
generic-y += kvm_para.h

‎arch/c6x/include/uapi/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
include include/uapi/asm-generic/Kbuild.asm
2-
31
generic-y += kvm_para.h
42
generic-y += ucontext.h

‎arch/csky/include/uapi/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
include include/uapi/asm-generic/Kbuild.asm
2-
31
generic-y += ucontext.h

‎arch/h8300/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ KBUILD_LDFLAGS += $(ldflags-y)
2727
CHECKFLAGS += -msize-long
2828

2929
ifeq ($(CROSS_COMPILE),)
30-
CROSS_COMPILE := h8300-unknown-linux-
30+
CROSS_COMPILE := $(call cc-cross-prefix, h8300-unknown-linux- h8300-linux-)
3131
endif
3232

3333
core-y += arch/$(ARCH)/kernel/ arch/$(ARCH)/mm/

‎arch/h8300/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ generic-y += fb.h
1717
generic-y += ftrace.h
1818
generic-y += futex.h
1919
generic-y += hardirq.h
20-
generic-y += hash.h
2120
generic-y += hw_irq.h
2221
generic-y += irq_regs.h
2322
generic-y += irq_work.h

‎arch/h8300/include/uapi/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
include include/uapi/asm-generic/Kbuild.asm
2-
31
generic-y += kvm_para.h
42
generic-y += ucontext.h

‎arch/hexagon/include/uapi/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
include include/uapi/asm-generic/Kbuild.asm
2-
31
generic-y += ucontext.h

‎arch/ia64/include/uapi/asm/Kbuild

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
include include/uapi/asm-generic/Kbuild.asm
2-
31
generated-y += unistd_64.h
42
generic-y += kvm_para.h
5-
generic-y += socket.h

‎arch/ia64/sn/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# Copyright (C) 1999,2001-2006,2008 Silicon Graphics, Inc. All Rights Reserved.
88
#
99

10-
ccflags-y := -Iarch/ia64/sn/include
10+
ccflags-y := -I $(srctree)/arch/ia64/sn/include
1111

1212
obj-y += setup.o bte.o bte_error.o irq.o mca.o idle.o \
1313
huberror.o io_acpi_init.o io_common.o \

‎arch/ia64/sn/kernel/sn2/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,5 @@
99
# sn2 specific kernel files
1010
#
1111

12-
ccflags-y := -Iarch/ia64/sn/include
13-
1412
obj-y += cache.o io.o ptc_deadlock.o sn2_smp.o sn_proc_fs.o \
1513
prominfo_proc.o timer.o timer_interrupt.o sn_hwperf.o

‎arch/ia64/sn/pci/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@
77
#
88
# Makefile for the sn pci general routines.
99

10-
ccflags-y := -Iarch/ia64/sn/include
11-
1210
obj-y := pci_dma.o tioca_provider.o tioce_provider.o pcibr/

‎arch/ia64/sn/pci/pcibr/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
# Makefile for the sn2 io routines.
99

10-
ccflags-y := -Iarch/ia64/sn/include
10+
ccflags-y := -I $(srctree)/arch/ia64/sn/include
1111

1212
obj-y += pcibr_dma.o pcibr_reg.o \
1313
pcibr_ate.o pcibr_provider.o

‎arch/m68k/include/uapi/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
include include/uapi/asm-generic/Kbuild.asm
2-
31
generated-y += unistd_32.h
42
generic-y += kvm_para.h

‎arch/microblaze/include/uapi/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include include/uapi/asm-generic/Kbuild.asm
2-
31
generated-y += unistd_32.h
42
generic-y += kvm_para.h
53
generic-y += ucontext.h

‎arch/mips/include/uapi/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include include/uapi/asm-generic/Kbuild.asm
2-
31
generated-y += unistd_n32.h
42
generated-y += unistd_n64.h
53
generated-y += unistd_o32.h

‎arch/nds32/include/uapi/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
include include/uapi/asm-generic/Kbuild.asm
2-
31
generic-y += ucontext.h

‎arch/nios2/include/uapi/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
include include/uapi/asm-generic/Kbuild.asm
2-
31
generic-y += kvm_para.h
42
generic-y += ucontext.h

‎arch/openrisc/include/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ generic-y += fb.h
1515
generic-y += ftrace.h
1616
generic-y += hardirq.h
1717
generic-y += hw_irq.h
18-
generic-y += irq.h
1918
generic-y += irq_regs.h
2019
generic-y += irq_work.h
2120
generic-y += kdebug.h
@@ -35,7 +34,6 @@ generic-y += qrwlock.h
3534
generic-y += sections.h
3635
generic-y += segment.h
3736
generic-y += shmparam.h
38-
generic-y += string.h
3937
generic-y += switch_to.h
4038
generic-y += topology.h
4139
generic-y += trace_clock.h

‎arch/openrisc/include/uapi/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
include include/uapi/asm-generic/Kbuild.asm
2-
31
generic-y += kvm_para.h
42
generic-y += ucontext.h

‎arch/parisc/include/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
generated-y += syscall_table_32.h
22
generated-y += syscall_table_64.h
33
generated-y += syscall_table_c32.h
4-
generic-y += barrier.h
54
generic-y += current.h
65
generic-y += device.h
76
generic-y += div64.h
@@ -20,7 +19,6 @@ generic-y += percpu.h
2019
generic-y += preempt.h
2120
generic-y += seccomp.h
2221
generic-y += segment.h
23-
generic-y += topology.h
2422
generic-y += trace_clock.h
2523
generic-y += user.h
2624
generic-y += vga.h

‎arch/parisc/include/uapi/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include include/uapi/asm-generic/Kbuild.asm
2-
31
generated-y += unistd_32.h
42
generated-y += unistd_64.h
53
generic-y += kvm_para.h

‎arch/powerpc/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ generated-y += syscall_table_spu.h
55
generic-y += div64.h
66
generic-y += export.h
77
generic-y += irq_regs.h
8-
generic-y += irq_work.h
98
generic-y += local64.h
109
generic-y += mcs_spinlock.h
1110
generic-y += preempt.h

‎arch/powerpc/include/uapi/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
include include/uapi/asm-generic/Kbuild.asm
2-
31
generated-y += unistd_32.h
42
generated-y += unistd_64.h

‎arch/riscv/include/uapi/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
include include/uapi/asm-generic/Kbuild.asm

‎arch/s390/boot/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ $(obj)/section_cmp%: vmlinux $(obj)/compressed/vmlinux FORCE
5757
$(obj)/compressed/vmlinux: $(obj)/startup.a FORCE
5858
$(Q)$(MAKE) $(build)=$(obj)/compressed $@
5959

60-
quiet_cmd_ar = AR $@
61-
cmd_ar = rm -f $@; $(AR) rcsTP$(KBUILD_ARFLAGS) $@ $(real-prereqs)
62-
6360
$(obj)/startup.a: $(OBJECTS) FORCE
6461
$(call if_changed,ar)
6562

‎arch/s390/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ generic-y += local.h
2020
generic-y += local64.h
2121
generic-y += mcs_spinlock.h
2222
generic-y += mm-arch-hooks.h
23-
generic-y += preempt.h
2423
generic-y += rwsem.h
2524
generic-y += trace_clock.h
2625
generic-y += unaligned.h

‎arch/s390/include/uapi/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
include include/uapi/asm-generic/Kbuild.asm
32

43
generated-y += unistd_32.h
54
generated-y += unistd_64.h
6-
generic-y += socket.h

‎arch/sh/include/uapi/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
include include/uapi/asm-generic/Kbuild.asm
32

43
generated-y += unistd_32.h
54
generic-y += kvm_para.h

‎arch/sparc/include/uapi/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
include include/uapi/asm-generic/Kbuild.asm
2-
31
generated-y += unistd_32.h
42
generated-y += unistd_64.h

‎arch/unicore32/boot/compressed/Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,4 @@ $(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/head.o $(obj)/piggy.o \
6161
ZTEXTADDR := 0x03000000
6262
ZBSSADDR := ALIGN(4)
6363

64-
SEDFLAGS_lds = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
65-
$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/unicore32/boot/Makefile $(KCONFIG_CONFIG)
66-
@sed "$(SEDFLAGS_lds)" < $< > $@
67-
64+
CPPFLAGS_vmlinux.lds = -DTEXT_START="$(ZTEXTADDR)" -DBSS_START="$(ZBSSADDR)"

‎arch/unicore32/boot/compressed/vmlinux.lds.in renamed to ‎arch/unicore32/boot/compressed/vmlinux.lds.S

File renamed without changes.

‎arch/unicore32/include/uapi/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
include include/uapi/asm-generic/Kbuild.asm
2-
31
generic-y += kvm_para.h
42
generic-y += ucontext.h

‎arch/x86/include/uapi/asm/Kbuild

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
include include/uapi/asm-generic/Kbuild.asm
2-
31
generated-y += unistd_32.h
42
generated-y += unistd_64.h
53
generated-y += unistd_x32.h
6-
generic-y += socket.h

‎arch/xtensa/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ generic-y += irq_work.h
1515
generic-y += kdebug.h
1616
generic-y += kmap_types.h
1717
generic-y += kprobes.h
18-
generic-y += linkage.h
1918
generic-y += local.h
2019
generic-y += local64.h
2120
generic-y += mcs_spinlock.h

‎arch/xtensa/include/uapi/asm/Kbuild

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
include include/uapi/asm-generic/Kbuild.asm
2-
31
generated-y += unistd_32.h
42
generic-y += kvm_para.h
5-
generic-y += socket.h

‎include/asm-generic/Kbuild

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
#
3+
# asm headers that all architectures except um should have
4+
# (This file is not included when SRCARCH=um since UML borrows several
5+
# asm headers from the host architecutre.)

‎include/uapi/asm-generic/Kbuild.asm renamed to ‎include/uapi/asm-generic/Kbuild

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
# SPDX-License-Identifier: GPL-2.0
12
#
23
# Headers that are mandatory in usr/include/asm/
3-
#
4+
# (This file is not included when SRCARCH=um since UML does not support UAPI.)
5+
46
mandatory-y += auxvec.h
57
mandatory-y += bitsperlong.h
68
mandatory-y += bpf_perf_event.h

‎lib/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ KCOV_INSTRUMENT_stackdepot.o := n
213213
libfdt_files = fdt.o fdt_ro.o fdt_wip.o fdt_rw.o fdt_sw.o fdt_strerror.o \
214214
fdt_empty_tree.o
215215
$(foreach file, $(libfdt_files), \
216-
$(eval CFLAGS_$(file) = -I$(src)/../scripts/dtc/libfdt))
216+
$(eval CFLAGS_$(file) = -I $(srctree)/scripts/dtc/libfdt))
217217
lib-$(CONFIG_LIBFDT) += $(libfdt_files)
218218

219219
obj-$(CONFIG_RBTREE_TEST) += rbtree_test.o

‎scripts/Makefile.asm-generic

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,19 @@ all:
1212
src := $(subst /generated,,$(obj))
1313
-include $(src)/Kbuild
1414

15+
# $(generic)/Kbuild lists mandatory-y. Exclude um since it is a special case.
16+
ifneq ($(SRCARCH),um)
17+
include $(generic)/Kbuild
18+
endif
19+
1520
include scripts/Kbuild.include
1621

22+
redundant := $(filter $(mandatory-y) $(generated-y), $(generic-y))
23+
redundant += $(foreach f, $(generic-y), $(if $(wildcard $(srctree)/$(src)/$(f)),$(f)))
24+
redundant := $(sort $(redundant))
25+
$(if $(redundant),\
26+
$(warning redundant generic-y found in $(src)/Kbuild: $(redundant)))
27+
1728
# If arch does not implement mandatory headers, fallback to asm-generic ones.
1829
mandatory-y := $(filter-out $(generated-y), $(mandatory-y))
1930
generic-y += $(foreach f, $(mandatory-y), $(if $(wildcard $(srctree)/$(src)/$(f)),,$(f)))

‎scripts/Makefile.build

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -426,13 +426,9 @@ $(modorder-target): $(subdir-ym) FORCE
426426
# Rule to compile a set of .o files into one .a file (with symbol table)
427427
#
428428
ifdef lib-target
429-
quiet_cmd_link_l_target = AR $@
430-
431-
# lib target archives do get a symbol table and index
432-
cmd_link_l_target = rm -f $@; $(AR) rcsTP$(KBUILD_ARFLAGS) $@ $(real-prereqs)
433429

434430
$(lib-target): $(lib-y) FORCE
435-
$(call if_changed,link_l_target)
431+
$(call if_changed,ar)
436432

437433
targets += $(lib-target)
438434

‎scripts/Makefile.lib

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,12 @@ $(obj)/%: $(src)/%_shipped
233233
quiet_cmd_ld = LD $@
234234
cmd_ld = $(LD) $(ld_flags) $(real-prereqs) -o $@
235235

236+
# Archive
237+
# ---------------------------------------------------------------------------
238+
239+
quiet_cmd_ar = AR $@
240+
cmd_ar = rm -f $@; $(AR) rcsTP$(KBUILD_ARFLAGS) $@ $(real-prereqs)
241+
236242
# Objcopy
237243
# ---------------------------------------------------------------------------
238244

‎scripts/Makefile.modinst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ quiet_cmd_modules_install = INSTALL $@
2323
mkdir -p $(2) ; \
2424
cp $@ $(2) ; \
2525
$(mod_strip_cmd) $(2)/$(notdir $@) ; \
26-
$(mod_sign_cmd) $(2)/$(notdir $@) $(patsubst %,|| true,$(KBUILD_EXTMOD)) && \
26+
$(mod_sign_cmd) $(2)/$(notdir $@) $(patsubst %,|| true,$(KBUILD_EXTMOD)) ; \
2727
$(mod_compress_cmd) $(2)/$(notdir $@)
2828

2929
# Modules built outside the kernel source tree go into extra by default

‎scripts/Makefile.modpost

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ modpost = scripts/mod/modpost \
7777
$(if $(KBUILD_EXTMOD),-I $(modulesymfile)) \
7878
$(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(KBUILD_EXTRA_SYMBOLS))) \
7979
$(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \
80-
$(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S) \
8180
$(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E) \
8281
$(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w)
8382

0 commit comments

Comments
 (0)