Skip to content

Commit e21efe8

Browse files
committed
arch: use always-$(KBUILD_BUILTIN) for vmlinux.lds
The extra-y syntax is deprecated. Instead, use always-$(KBUILD_BUILTIN), which behaves equivalently. Signed-off-by: Masahiro Yamada <[email protected]> Acked-by: Johannes Berg <[email protected]> Reviewed-by: Nicolas Schier <[email protected]>
1 parent 1bf807b commit e21efe8

File tree

21 files changed

+21
-21
lines changed

21 files changed

+21
-21
lines changed

arch/alpha/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Makefile for the linux kernel.
44
#
55

6-
extra-y := vmlinux.lds
6+
always-$(KBUILD_BUILTIN) := vmlinux.lds
77
asflags-y := $(KBUILD_CFLAGS)
88
ccflags-y := -Wno-sign-compare
99

arch/arc/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ ifdef CONFIG_ISA_ARCOMPACT
2626
CFLAGS_fpu.o += -mdpfp
2727
endif
2828

29-
extra-y := vmlinux.lds
29+
always-$(KBUILD_BUILTIN) := vmlinux.lds

arch/arm/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,4 @@ obj-$(CONFIG_HAVE_ARM_SMCCC) += smccc-call.o
104104

105105
obj-$(CONFIG_GENERIC_CPU_VULNERABILITIES) += spectre.o
106106

107-
extra-y := vmlinux.lds
107+
always-$(KBUILD_BUILTIN) := vmlinux.lds

arch/arm64/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ $(obj)/vdso32-wrap.o: $(obj)/vdso32/vdso.so
7878

7979
obj-y += probes/
8080
obj-y += head.o
81-
extra-y += vmlinux.lds
81+
always-$(KBUILD_BUILTIN) += vmlinux.lds
8282

8383
ifeq ($(CONFIG_DEBUG_EFI),y)
8484
AFLAGS_head.o += -DVMLINUX_PATH="\"$(realpath $(objtree)/vmlinux)\""

arch/csky/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
extra-y := vmlinux.lds
2+
always-$(KBUILD_BUILTIN) := vmlinux.lds
33

44
obj-y += head.o entry.o atomic.o signal.o traps.o irq.o time.o vdso.o vdso/
55
obj-y += power.o syscall.o syscall_table.o setup.o

arch/hexagon/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
extra-y := vmlinux.lds
2+
always-$(KBUILD_BUILTIN) := vmlinux.lds
33

44
obj-y += head.o
55
obj-$(CONFIG_SMP) += smp.o

arch/loongarch/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
OBJECT_FILES_NON_STANDARD_head.o := y
77

8-
extra-y := vmlinux.lds
8+
always-$(KBUILD_BUILTIN) := vmlinux.lds
99

1010
obj-y += head.o cpu-probe.o cacheinfo.o env.o setup.o entry.o genex.o \
1111
traps.o irq.o idle.o process.o dma.o mem.o reset.o switch.o \

arch/m68k/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Makefile for the linux kernel.
44
#
55

6-
extra-y += vmlinux.lds
6+
always-$(KBUILD_BUILTIN) += vmlinux.lds
77

88
obj-$(CONFIG_MMU_MOTOROLA) := head.o
99
obj-$(CONFIG_SUN3) := sun3-head.o

arch/microblaze/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ CFLAGS_REMOVE_ftrace.o = -pg
1111
CFLAGS_REMOVE_process.o = -pg
1212
endif
1313

14-
extra-y := vmlinux.lds
14+
always-$(KBUILD_BUILTIN) := vmlinux.lds
1515

1616
obj-y += head.o dma.o exceptions.o \
1717
hw_exception_handler.o irq.o \

arch/mips/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Makefile for the Linux/MIPS kernel.
44
#
55

6-
extra-y := vmlinux.lds
6+
always-$(KBUILD_BUILTIN) := vmlinux.lds
77

88
obj-y += head.o branch.o cmpxchg.o elf.o entry.o genex.o idle.o irq.o \
99
process.o prom.o ptrace.o reset.o setup.o signal.o \

0 commit comments

Comments
 (0)