Merge tag 'kbuild-thinar-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild thin archives updates from Masahiro Yamada: "Thin archives migration by Nicholas Piggin. THIN_ARCHIVES has been available for a while as an optional feature only for PowerPC architecture, but we do not need two different intermediate-artifact schemes. Using thin archives instead of conventional incremental linking has various advantages: - save disk space for builds - speed-up building a little - fix some link issues (for example, allyesconfig on ARM) due to more flexibility for the final linking - work better with dead code elimination we are planning As discussed before, this migration has been done unconditionally so that any problems caused by this will show up with "git bisect". With testing with 0-day and linux-next, some architectures actually showed up problems, but they were trivial and all fixed now" * tag 'kbuild-thinar-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: tile: remove unneeded extra-y in Makefile kbuild: thin archives make default for all archs x86/um: thin archives build fix tile: thin archives fix linking ia64: thin archives fix linking sh: thin archives fix linking kbuild: handle libs-y archives separately from built-in.o archives kbuild: thin archives use P option to ar kbuild: thin archives final link close --whole-archives option ia64: remove unneeded extra-y in Makefile.gate tile: fix dependency and .*.cmd inclusion for incremental build sparc64: Use indirect calls in hamming weight stubs

Linus Torvalds committed 9 years ago

Commit 98ced882 parents 16ffc4c 42317ea12 files · +93 −72Browse files

Unified · Split

12 files

Documentation/kbuild/kbuild.txt +6 −2
Documentation/process/changes.rst +4 −5
Makefile +4 −4
arch/Kconfig +1 −1
arch/ia64/kernel/Makefile.gate +8 −7
arch/powerpc/Kconfig +0 −8
arch/sh/kernel/vsyscall/Makefile +8 −8
arch/sparc/lib/hweight.S +8 −8
arch/tile/kernel/vdso/Makefile +12 −14
arch/x86/um/vdso/Makefile +1 −1
scripts/Makefile.build +4 −4
scripts/link-vmlinux.sh +37 −10

Documentation/kbuild/kbuild.txt+6−2

@@ -236,5 +236,9 @@ Files specified with KBUILD_VMLINUX_INIT are linked first. · 235 unmodified lines
236	236	KBUILD_VMLINUX_MAIN
237	237	--------------------------------------------------
238	238	All object files for the main part of vmlinux.
239		−KBUILD_VMLINUX_INIT and KBUILD_VMLINUX_MAIN together specify
240		−all the object files used to link vmlinux.
	239	+
	240	+KBUILD_VMLINUX_LIBS
	241	+--------------------------------------------------
	242	+All .a "lib" files for vmlinux.
	243	+KBUILD_VMLINUX_INIT, KBUILD_VMLINUX_MAIN, and KBUILD_VMLINUX_LIBS together
	244	+specify all the object files used to link vmlinux.

Documentation/process/changes.rst+4−5

@@ -31,7 +31,7 @@ you probably needn't concern yourself with isdn4k-utils. · 30 unmodified lines
31	31	====================== =============== ========================================
32	32	GNU C 3.2 gcc --version
33	33	GNU make 3.81 make --version
34		−binutils 2.12 ld -v
	34	+binutils 2.20 ld -v
35	35	util-linux 2.10o fdformat --version
36	36	module-init-tools 0.9.10 depmod -V
37	37	e2fsprogs 1.41.4 e2fsck -V
@@ -75,10 +75,9 @@ You will need GNU make 3.81 or later to build the kernel. · 37 unmodified lines
75	75	Binutils
76	76	--------
77	77
78		−Linux on IA-32 has recently switched from using ``as86`` to using ``gas`` for
79		−assembling the 16-bit boot code, removing the need for ``as86`` to compile
80		−your kernel. This change does, however, mean that you need a recent
81		−release of binutils.
	78	+The build system has, as of 4.13, switched to using thin archives (`ar T`)
	79	+rather than incremental linking (`ld -r`) for built-in.o intermediate steps.
	80	+This requires binutils 2.20 or newer.
82	81
83	82	Perl
84	83	----

Makefile+4−4

@@ -944,19 +944,19 @@ core-y := $(patsubst %/, %/built-in.o, $(core-y)) · 943 unmodified lines
944	944	drivers-y := $(patsubst %/, %/built-in.o, $(drivers-y))
945	945	net-y := $(patsubst %/, %/built-in.o, $(net-y))
946	946	libs-y1 := $(patsubst %/, %/lib.a, $(libs-y))
947		−libs-y2 := $(patsubst %/, %/built-in.o, $(libs-y))
948		−libs-y := $(libs-y1) $(libs-y2)
	947	+libs-y2 := $(filter-out %.a, $(patsubst %/, %/built-in.o, $(libs-y)))
949	948	virt-y := $(patsubst %/, %/built-in.o, $(virt-y))
950	949
951	950	# Externally visible symbols (used by link-vmlinux.sh)
952	951	export KBUILD_VMLINUX_INIT := $(head-y) $(init-y)
953		−export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y) $(virt-y)
	952	+export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y2) $(drivers-y) $(net-y) $(virt-y)
	953	+export KBUILD_VMLINUX_LIBS := $(libs-y1)
954	954	export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds
955	955	export LDFLAGS_vmlinux
956	956	# used by scripts/pacmage/Makefile
957	957	export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch Documentation include samples scripts tools)
958	958
959		−vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_INIT) $(KBUILD_VMLINUX_MAIN)
	959	+vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_INIT) $(KBUILD_VMLINUX_MAIN) $(KBUILD_VMLINUX_LIBS)
960	960
961	961	# Include targets which we want to execute sequentially if the rest of the
962	962	# kernel build went well. If CONFIG_TRIM_UNUSED_KSYMS is set, this might be

arch/Kconfig+1−1

@@ -550,7 +550,7 @@ config CC_STACKPROTECTOR_STRONG · 549 unmodified lines
550	550	endchoice
551	551
552	552	config THIN_ARCHIVES
553		− bool
	553	+ def_bool y
554	554	help
555	555	Select this if the architecture wants to use thin archives
556	556	instead of ld -r to create the built-in.o files.

arch/ia64/kernel/Makefile.gate+8−7

@@ -1,8 +1,8 @@
1	1	# The gate DSO image is built using a special linker script.
2	2
3		−targets += gate.so gate-syms.o
	3	+targets += gate.so gate.lds gate.o gate-dummy.o
4	4
5		−extra-y += gate.so gate-syms.o gate.lds gate.o
	5	+obj-y += gate-syms.o
6	6
7	7	CPPFLAGS_gate.lds := -P -C -U$(ARCH)
8	8
@@ -14,13 +14,14 @@ GATECFLAGS_gate.so = -shared -s -Wl,-soname=linux-gate.so.1 \ · 5 unmodified lines
14	14	$(obj)/gate.so: $(obj)/gate.lds $(obj)/gate.o FORCE
15	15	$(call if_changed,gate)
16	16
17		−$(obj)/built-in.o: $(obj)/gate-syms.o
18		−$(obj)/built-in.o: ld_flags += -R $(obj)/gate-syms.o
19		−
20		−GATECFLAGS_gate-syms.o = -r
21		−$(obj)/gate-syms.o: $(obj)/gate.lds $(obj)/gate.o FORCE
	17	+GATECFLAGS_gate-dummy.o = -r
	18	+$(obj)/gate-dummy.o: $(obj)/gate.lds $(obj)/gate.o FORCE
22	19	$(call if_changed,gate)
23	20
	21	+LDFLAGS_gate-syms.o := -r -R
	22	+$(obj)/gate-syms.o: $(obj)/gate-dummy.o FORCE
	23	+ $(call if_changed,ld)
	24	+
24	25	# gate-data.o contains the gate DSO image as data in section .data..gate.
25	26	# We must build gate.so before we can assemble it.
26	27	# Note: kbuild does not track this dependency due to usage of .incbin

arch/powerpc/Kconfig+0−8

@@ -463,14 +463,6 @@ config MPROFILE_KERNEL · 462 unmodified lines
463	463	depends on PPC64 && CPU_LITTLE_ENDIAN
464	464	def_bool !DISABLE_MPROFILE_KERNEL
465	465
466		−config USE_THIN_ARCHIVES
467		− bool "Build the kernel using thin archives"
468		− default n
469		− select THIN_ARCHIVES
470		− help
471		− Build the kernel using thin archives.
472		− If you're unsure say N.
473		−
474	466	config IOMMU_HELPER
475	467	def_bool PPC64
476	468

arch/sh/kernel/vsyscall/Makefile+8−8

@@ -1,11 +1,11 @@
1		−obj-y += vsyscall.o vsyscall-syscall.o
	1	+obj-y += vsyscall.o vsyscall-syscall.o vsyscall-syms.o
2	2
3	3	$(obj)/vsyscall-syscall.o: \
4	4	$(foreach F,trapa,$(obj)/vsyscall-$F.so)
5	5
6	6	# Teach kbuild about targets
7	7	targets += $(foreach F,trapa,vsyscall-$F.o vsyscall-$F.so)
8		−targets += vsyscall-note.o vsyscall.lds
	8	+targets += vsyscall-note.o vsyscall.lds vsyscall-dummy.o
9	9
10	10	# The DSO images are built using a special linker script
11	11	quiet_cmd_syscall = SYSCALL $@
@@ -26,11 +26,11 @@ $(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE · 14 unmodified lines
26	26	# We also create a special relocatable object that should mirror the symbol
27	27	# table and layout of the linked DSO. With ld -R we can then refer to
28	28	# these symbols in the kernel code rather than hand-coded addresses.
29		−extra-y += vsyscall-syms.o
30		−$(obj)/built-in.o: $(obj)/vsyscall-syms.o
31		−$(obj)/built-in.o: ld_flags += -R $(obj)/vsyscall-syms.o
32		−
33		−SYSCFLAGS_vsyscall-syms.o = -r
34		−$(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \
	29	+SYSCFLAGS_vsyscall-dummy.o = -r
	30	+$(obj)/vsyscall-dummy.o: $(src)/vsyscall.lds \
35	31	$(obj)/vsyscall-trapa.o $(obj)/vsyscall-note.o FORCE
36	32	$(call if_changed,syscall)
	33	+
	34	+LDFLAGS_vsyscall-syms.o := -r -R
	35	+$(obj)/vsyscall-syms.o: $(obj)/vsyscall-dummy.o FORCE
	36	+ $(call if_changed,ld)

arch/sparc/lib/hweight.S+8−8

@@ -4,9 +4,9 @@ · 3 unmodified lines
4	4	.text
5	5	.align 32
6	6	ENTRY(__arch_hweight8)
7		− ba,pt %xcc, __sw_hweight8
	7	+ sethi %hi(__sw_hweight8), %g1
	8	+ jmpl %g1 + %lo(__sw_hweight8), %g0
8	9	nop
9		− nop
10	10	ENDPROC(__arch_hweight8)
11	11	EXPORT_SYMBOL(__arch_hweight8)
12	12	.section .popc_3insn_patch, "ax"
@@ -17,9 +17,9 @@ EXPORT_SYMBOL(__arch_hweight8) · 4 unmodified lines
17	17	.previous
18	18
19	19	ENTRY(__arch_hweight16)
20		− ba,pt %xcc, __sw_hweight16
	20	+ sethi %hi(__sw_hweight16), %g1
	21	+ jmpl %g1 + %lo(__sw_hweight16), %g0
21	22	nop
22		− nop
23	23	ENDPROC(__arch_hweight16)
24	24	EXPORT_SYMBOL(__arch_hweight16)
25	25	.section .popc_3insn_patch, "ax"
@@ -30,9 +30,9 @@ EXPORT_SYMBOL(__arch_hweight16) · 4 unmodified lines
30	30	.previous
31	31
32	32	ENTRY(__arch_hweight32)
33		− ba,pt %xcc, __sw_hweight32
	33	+ sethi %hi(__sw_hweight32), %g1
	34	+ jmpl %g1 + %lo(__sw_hweight32), %g0
34	35	nop
35		− nop
36	36	ENDPROC(__arch_hweight32)
37	37	EXPORT_SYMBOL(__arch_hweight32)
38	38	.section .popc_3insn_patch, "ax"
@@ -43,9 +43,9 @@ EXPORT_SYMBOL(__arch_hweight32) · 4 unmodified lines
43	43	.previous
44	44
45	45	ENTRY(__arch_hweight64)
46		− ba,pt %xcc, __sw_hweight64
	46	+ sethi %hi(__sw_hweight16), %g1
	47	+ jmpl %g1 + %lo(__sw_hweight16), %g0
47	48	nop
48		− nop
49	49	ENDPROC(__arch_hweight64)
50	50	EXPORT_SYMBOL(__arch_hweight64)
51	51	.section .popc_3insn_patch, "ax"

arch/tile/kernel/vdso/Makefile+12−14

@@ -5,15 +5,14 @@ vdso-syms = rt_sigreturn gettimeofday · 4 unmodified lines
5	5	obj-vdso = $(patsubst %, v%.o, $(vdso-syms))
6	6
7	7	# Build rules
8		−targets := $(obj-vdso) vdso.so vdso.so.dbg vdso.lds
	8	+targets := $(obj-vdso) vdso.so vdso.so.dbg vdso.lds vdso-dummy.o
9	9	obj-vdso := $(addprefix $(obj)/, $(obj-vdso))
10	10
11	11	# vdso32 is only for tilegx -m32 compat task.
12	12	VDSO32-$(CONFIG_COMPAT) := y
13	13
14		−obj-y += vdso.o
	14	+obj-y += vdso.o vdso-syms.o
15	15	obj-$(VDSO32-y) += vdso32.o
16		−extra-y += vdso.lds
17	16	CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
18	17
19	18	# vDSO code runs in userspace and -pg doesn't help with profiling anyway.
@@ -42,23 +41,22 @@ $(obj)/vdso.o: $(obj)/vdso.so · 22 unmodified lines
42	41
43	42	# link rule for the .so file, .lds has to be first
44	43	SYSCFLAGS_vdso.so.dbg = $(c_flags)
45		−$(obj)/vdso.so.dbg: $(src)/vdso.lds $(obj-vdso)
	44	+$(obj)/vdso.so.dbg: $(src)/vdso.lds $(obj-vdso) FORCE
46	45	$(call if_changed,vdsold)
47	46
48		−
49	47	# We also create a special relocatable object that should mirror the symbol
50	48	# table and layout of the linked DSO. With ld -R we can then refer to
51	49	# these symbols in the kernel code rather than hand-coded addresses.
52		−extra-y += vdso-syms.o
53		−$(obj)/built-in.o: $(obj)/vdso-syms.o
54		−$(obj)/built-in.o: ld_flags += -R $(obj)/vdso-syms.o
55	50
56	51	SYSCFLAGS_vdso.so.dbg = -shared -s -Wl,-soname=linux-vdso.so.1 \
57	52	$(call cc-ldoption, -Wl$(comma)--hash-style=both)
58		−SYSCFLAGS_vdso_syms.o = -r
59		−$(obj)/vdso-syms.o: $(src)/vdso.lds $(obj)/vrt_sigreturn.o FORCE
	53	+SYSCFLAGS_vdso_dummy.o = -r
	54	+$(obj)/vdso-dummy.o: $(src)/vdso.lds $(obj)/vrt_sigreturn.o FORCE
60	55	$(call if_changed,vdsold)
61	56
	57	+LDFLAGS_vdso-syms.o := -r -R
	58	+$(obj)/vdso-syms.o: $(obj)/vdso-dummy.o FORCE
	59	+ $(call if_changed,ld)
62	60
63	61	# strip rule for the .so file
64	62	$(obj)/%.so: OBJCOPYFLAGS := -S
@@ -96,17 +94,17 @@ KBUILD_CFLAGS_32 := $(filter-out -m64,$(KBUILD_CFLAGS)) · 31 unmodified lines
96	94	KBUILD_CFLAGS_32 += -m32 -fPIC -shared
97	95
98	96	obj-vdso32 = $(patsubst %, v%32.o, $(vdso-syms))
99		−obj-vdso32 := $(addprefix $(obj)/, $(obj-vdso32))
100	97
101	98	targets += $(obj-vdso32) vdso32.so vdso32.so.dbg
	99	+obj-vdso32 := $(addprefix $(obj)/, $(obj-vdso32))
102	100
103	101	$(obj-vdso32:%=%): KBUILD_AFLAGS = $(KBUILD_AFLAGS_32)
104	102	$(obj-vdso32:%=%): KBUILD_CFLAGS = $(KBUILD_CFLAGS_32)
105	103
106		−$(obj)/vgettimeofday32.o: $(obj)/vgettimeofday.c
	104	+$(obj)/vgettimeofday32.o: $(obj)/vgettimeofday.c FORCE
107	105	$(call if_changed_rule,cc_o_c)
108	106
109		−$(obj)/vrt_sigreturn32.o: $(obj)/vrt_sigreturn.S
	107	+$(obj)/vrt_sigreturn32.o: $(obj)/vrt_sigreturn.S FORCE
110	108	$(call if_changed,as_o_S)
111	109
112	110	# Force dependency
@@ -114,5 +112,5 @@ $(obj)/vdso32.o: $(obj)/vdso32.so · 1 unmodified line
114	112
115	113	SYSCFLAGS_vdso32.so.dbg = -m32 -shared -s -Wl,-soname=linux-vdso32.so.1 \
116	114	$(call cc-ldoption, -Wl$(comma)--hash-style=both)
117		−$(obj)/vdso32.so.dbg: $(src)/vdso.lds $(obj-vdso32)
	115	+$(obj)/vdso32.so.dbg: $(src)/vdso.lds $(obj-vdso32) FORCE
118	116	$(call if_changed,vdsold)

arch/x86/um/vdso/Makefile+1−1

@@ -53,7 +53,7 @@ CFLAGS_REMOVE_vdso-note.o = -pg -fprofile-arcs -ftest-coverage · 52 unmodified lines
53	53	CFLAGS_REMOVE_um_vdso.o = -pg -fprofile-arcs -ftest-coverage
54	54
55	55	targets += vdso-syms.lds
56		−obj-$(VDSO64-y) += vdso-syms.lds
	56	+extra-$(VDSO64-y) += vdso-syms.lds
57	57
58	58	#
59	59	# Match symbols in the DSO that look like VDSO*; produce a file of constants.

scripts/Makefile.build+4−4

@@ -437,8 +437,8 @@ $(sort $(subdir-obj-y)): $(subdir-ym) ; · 436 unmodified lines
437	437	ifdef builtin-target
438	438
439	439	ifdef CONFIG_THIN_ARCHIVES
440		− cmd_make_builtin = rm -f $@; $(AR) rcST$(KBUILD_ARFLAGS)
441		− cmd_make_empty_builtin = rm -f $@; $(AR) rcST$(KBUILD_ARFLAGS)
	440	+ cmd_make_builtin = rm -f $@; $(AR) rcSTP$(KBUILD_ARFLAGS)
	441	+ cmd_make_empty_builtin = rm -f $@; $(AR) rcSTP$(KBUILD_ARFLAGS)
442	442	quiet_cmd_link_o_target = AR $@
443	443	else
444	444	cmd_make_builtin = $(LD) $(ld_flags) -r -o
@@ -478,7 +478,7 @@ ifdef lib-target · 33 unmodified lines
478	478	quiet_cmd_link_l_target = AR $@
479	479
480	480	ifdef CONFIG_THIN_ARCHIVES
481		− cmd_link_l_target = rm -f $@; $(AR) rcsT$(KBUILD_ARFLAGS) $@ $(lib-y)
	481	+ cmd_link_l_target = rm -f $@; $(AR) rcsTP$(KBUILD_ARFLAGS) $@ $(lib-y)
482	482	else
483	483	cmd_link_l_target = rm -f $@; $(AR) rcs$(KBUILD_ARFLAGS) $@ $(lib-y)
484	484	endif
@@ -531,7 +531,7 @@ cmd_link_multi-link = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) $(cmd_secana · 46 unmodified lines
531	531
532	532	ifdef CONFIG_THIN_ARCHIVES
533	533	quiet_cmd_link_multi-y = AR $@
534		− cmd_link_multi-y = rm -f $@; $(AR) rcST$(KBUILD_ARFLAGS) $@ $(link_multi_deps)
	534	+ cmd_link_multi-y = rm -f $@; $(AR) rcSTP$(KBUILD_ARFLAGS) $@ $(link_multi_deps)
535	535	else
536	536	quiet_cmd_link_multi-y = LD $@
537	537	cmd_link_multi-y = $(cmd_link_multi-link)

scripts/link-vmlinux.sh+37−10

@@ -3,9 +3,12 @@ · 2 unmodified lines
3	3	# link vmlinux
4	4	#
5	5	# vmlinux is linked from the objects selected by $(KBUILD_VMLINUX_INIT) and
6		−# $(KBUILD_VMLINUX_MAIN). Most are built-in.o files from top-level directories
7		−# in the kernel tree, others are specified in arch/$(ARCH)/Makefile.
8		−# Ordering when linking is important, and $(KBUILD_VMLINUX_INIT) must be first.
	6	+# $(KBUILD_VMLINUX_MAIN) and $(KBUILD_VMLINUX_LIBS). Most are built-in.o files
	7	+# from top-level directories in the kernel tree, others are specified in
	8	+# arch/$(ARCH)/Makefile. Ordering when linking is important, and
	9	+# $(KBUILD_VMLINUX_INIT) must be first. $(KBUILD_VMLINUX_LIBS) are archives
	10	+# which are linked conditionally (not within --whole-archive), and do not
	11	+# require symbol indexes added.
9	12	#
10	13	# vmlinux
11	14	# ^
@@ -16,6 +19,9 @@ · 4 unmodified lines
16	19	# +--< $(KBUILD_VMLINUX_MAIN)
17	20	# \| +--< drivers/built-in.o mm/built-in.o + more
18	21	# \|
	22	+# +--< $(KBUILD_VMLINUX_LIBS)
	23	+# \| +--< lib/lib.a + more
	24	+# \|
19	25	# +-< ${kallsymso} (see description in KALLSYMS section)
20	26	#
21	27	# vmlinux version (uname -v) cannot be updated during normal
@@ -37,9 +43,10 @@ info() · 15 unmodified lines
37	43	fi
38	44	}
39	45
40		−# Thin archive build here makes a final archive with
41		−# symbol table and indexes from vmlinux objects, which can be
42		−# used as input to linker.
	46	+# Thin archive build here makes a final archive with symbol table and indexes
	47	+# from vmlinux objects INIT and MAIN, which can be used as input to linker.
	48	+# KBUILD_VMLINUX_LIBS archives should already have symbol table and indexes
	49	+# added.
43	50	#
44	51	# Traditional incremental style of link does not require this step
45	52	#
@@ -50,7 +57,7 @@ archive_builtin() · 4 unmodified lines
50	57	if [ -n "${CONFIG_THIN_ARCHIVES}" ]; then
51	58	info AR built-in.o
52	59	rm -f built-in.o;
53		− ${AR} rcsT${KBUILD_ARFLAGS} built-in.o \
	60	+ ${AR} rcsTP${KBUILD_ARFLAGS} built-in.o \
54	61	${KBUILD_VMLINUX_INIT} \
55	62	${KBUILD_VMLINUX_MAIN}
56	63	fi
@@ -63,11 +70,17 @@ modpost_link() · 6 unmodified lines
63	70	local objects
64	71
65	72	if [ -n "${CONFIG_THIN_ARCHIVES}" ]; then
66		− objects="--whole-archive built-in.o"
	73	+ objects="--whole-archive \
	74	+ built-in.o \
	75	+ --no-whole-archive \
	76	+ --start-group \
	77	+ ${KBUILD_VMLINUX_LIBS} \
	78	+ --end-group"
67	79	else
68	80	objects="${KBUILD_VMLINUX_INIT} \
69	81	--start-group \
70	82	${KBUILD_VMLINUX_MAIN} \
	83	+ ${KBUILD_VMLINUX_LIBS} \
71	84	--end-group"
72	85	fi
73	86	${LD} ${LDFLAGS} -r -o ${1} ${objects}
@@ -83,11 +96,18 @@ vmlinux_link() · 9 unmodified lines
83	96
84	97	if [ "${SRCARCH}" != "um" ]; then
85	98	if [ -n "${CONFIG_THIN_ARCHIVES}" ]; then
86		− objects="--whole-archive built-in.o ${1}"
	99	+ objects="--whole-archive \
	100	+ built-in.o \
	101	+ --no-whole-archive \
	102	+ --start-group \
	103	+ ${KBUILD_VMLINUX_LIBS} \
	104	+ --end-group \
	105	+ ${1}"
87	106	else
88	107	objects="${KBUILD_VMLINUX_INIT} \
89	108	--start-group \
90	109	${KBUILD_VMLINUX_MAIN} \
	110	+ ${KBUILD_VMLINUX_LIBS} \
91	111	--end-group \
92	112	${1}"
93	113	fi
@@ -96,11 +116,18 @@ vmlinux_link() · 2 unmodified lines
96	116	-T ${lds} ${objects}
97	117	else
98	118	if [ -n "${CONFIG_THIN_ARCHIVES}" ]; then
99		− objects="-Wl,--whole-archive built-in.o ${1}"
	119	+ objects="-Wl,--whole-archive \
	120	+ built-in.o \
	121	+ -Wl,--no-whole-archive \
	122	+ -Wl,--start-group \
	123	+ ${KBUILD_VMLINUX_LIBS} \
	124	+ -Wl,--end-group \
	125	+ ${1}"
100	126	else
101	127	objects="${KBUILD_VMLINUX_INIT} \
102	128	-Wl,--start-group \
103	129	${KBUILD_VMLINUX_MAIN} \
	130	+ ${KBUILD_VMLINUX_LIBS} \
104	131	-Wl,--end-group \
105	132	${1}"
106	133	fi

Merge tag 'kbuild-thinar-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code