History

kbuild: merge KBUILD_VMLINUX_{INIT,MAIN} into KBUILD_VMLINUX_OBJS

The top Makefile does not need to export KBUILD_VMLINUX_INIT and KBUILD_VMLINUX_MAIN separately. Put every built-in.a into KBUILD_VMLINUX_OBJS. The order of $(head-y), $(init-y), $(core-y), ... is still retained.

Masahiro Yamada committed 7 years ago

Commit d151e971 parent dee94953 files · +18 −31Browse files

Unified · Split

3 files
  1. Documentation/kbuild/kbuild.txt +5 −10
  2. Makefile +3 −3
  3. scripts/link-vmlinux.sh +10 −18
Documentation/kbuild/kbuild.txt+5−10
@@ -232,17 +232,12 @@ KBUILD_LDS · 231 unmodified lines
232--------------------------------------------------232--------------------------------------------------
233The linker script with full path. Assigned by the top-level Makefile.233The linker script with full path. Assigned by the top-level Makefile.
234 234
235KBUILD_VMLINUX_INIT235KBUILD_VMLINUX_OBJS
236--------------------------------------------------236--------------------------------------------------
237All object files for the init (first) part of vmlinux.237All object files for vmlinux. They are linked to vmlinux in the same
238Files specified with KBUILD_VMLINUX_INIT are linked first.238order as listed in KBUILD_VMLINUX_OBJS.
239
240KBUILD_VMLINUX_MAIN
241--------------------------------------------------
242All object files for the main part of vmlinux.
243 239
244KBUILD_VMLINUX_LIBS240KBUILD_VMLINUX_LIBS
245--------------------------------------------------241--------------------------------------------------
246All .a "lib" files for vmlinux.242All .a "lib" files for vmlinux. KBUILD_VMLINUX_OBJS and KBUILD_VMLINUX_LIBS
247KBUILD_VMLINUX_INIT, KBUILD_VMLINUX_MAIN, and KBUILD_VMLINUX_LIBS together243together specify all the object files used to link vmlinux.
248specify all the object files used to link vmlinux.
Makefile+3−3
@@ -976,15 +976,15 @@ libs-y2 := $(patsubst %/, %/built-in.a, $(filter-out %.a, $(libs-y))) · 975 unmodified lines
976virt-y := $(patsubst %/, %/built-in.a, $(virt-y))976virt-y := $(patsubst %/, %/built-in.a, $(virt-y))
977 977
978# Externally visible symbols (used by link-vmlinux.sh)978# Externally visible symbols (used by link-vmlinux.sh)
979export KBUILD_VMLINUX_INIT := $(head-y) $(init-y)979export KBUILD_VMLINUX_OBJS := $(head-y) $(init-y) $(core-y) $(libs-y2) \
980export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y2) $(drivers-y) $(net-y) $(virt-y)980 $(drivers-y) $(net-y) $(virt-y)
981export KBUILD_VMLINUX_LIBS := $(libs-y1)981export KBUILD_VMLINUX_LIBS := $(libs-y1)
982export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds982export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds
983export LDFLAGS_vmlinux983export LDFLAGS_vmlinux
984# used by scripts/package/Makefile984# used by scripts/package/Makefile
985export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch Documentation include samples scripts tools)985export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch Documentation include samples scripts tools)
986 986
987vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_INIT) $(KBUILD_VMLINUX_MAIN) $(KBUILD_VMLINUX_LIBS)987vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS)
988 988
989# Recurse until adjust_autoksyms.sh is satisfied989# Recurse until adjust_autoksyms.sh is satisfied
990PHONY += autoksyms_recursive990PHONY += autoksyms_recursive
scripts/link-vmlinux.sh+10−18
@@ -3,22 +3,17 @@ · 2 unmodified lines
3#3#
4# link vmlinux4# link vmlinux
5#5#
6# vmlinux is linked from the objects selected by $(KBUILD_VMLINUX_INIT) and6# vmlinux is linked from the objects selected by $(KBUILD_VMLINUX_OBJS) and
7# $(KBUILD_VMLINUX_MAIN) and $(KBUILD_VMLINUX_LIBS). Most are built-in.a files7# $(KBUILD_VMLINUX_LIBS). Most are built-in.a files from top-level directories
8# from top-level directories in the kernel tree, others are specified in8# in the kernel tree, others are specified in arch/$(ARCH)/Makefile.
9# arch/$(ARCH)/Makefile. Ordering when linking is important, and9# $(KBUILD_VMLINUX_LIBS) are archives which are linked conditionally
10# $(KBUILD_VMLINUX_INIT) must be first. $(KBUILD_VMLINUX_LIBS) are archives10# (not within --whole-archive), and do not require symbol indexes added.
11# which are linked conditionally (not within --whole-archive), and do not
12# require symbol indexes added.
13#11#
14# vmlinux12# vmlinux
15# ^13# ^
16# |14# |
17# +-< $(KBUILD_VMLINUX_INIT)15# +--< $(KBUILD_VMLINUX_OBJS)
18# | +--< init/version.o + more16# | +--< init/built-in.a drivers/built-in.a mm/built-in.a + more
19# |
20# +--< $(KBUILD_VMLINUX_MAIN)
21# | +--< drivers/built-in.a mm/built-in.a + more
22# |17# |
23# +--< $(KBUILD_VMLINUX_LIBS)18# +--< $(KBUILD_VMLINUX_LIBS)
24# | +--< lib/lib.a + more19# | +--< lib/lib.a + more
@@ -51,8 +46,7 @@ modpost_link() · 26 unmodified lines
51 local objects46 local objects
52 47
53 objects="--whole-archive \48 objects="--whole-archive \
54 ${KBUILD_VMLINUX_INIT} \49 ${KBUILD_VMLINUX_OBJS} \
55 ${KBUILD_VMLINUX_MAIN} \
56 --no-whole-archive \50 --no-whole-archive \
57 --start-group \51 --start-group \
58 ${KBUILD_VMLINUX_LIBS} \52 ${KBUILD_VMLINUX_LIBS} \
@@ -71,8 +65,7 @@ vmlinux_link() · 12 unmodified lines
71 65
72 if [ "${SRCARCH}" != "um" ]; then66 if [ "${SRCARCH}" != "um" ]; then
73 objects="--whole-archive \67 objects="--whole-archive \
74 ${KBUILD_VMLINUX_INIT} \68 ${KBUILD_VMLINUX_OBJS} \
75 ${KBUILD_VMLINUX_MAIN} \
76 --no-whole-archive \69 --no-whole-archive \
77 --start-group \70 --start-group \
78 ${KBUILD_VMLINUX_LIBS} \71 ${KBUILD_VMLINUX_LIBS} \
@@ -83,8 +76,7 @@ vmlinux_link() · 4 unmodified lines
83 -T ${lds} ${objects}76 -T ${lds} ${objects}
84 else77 else
85 objects="-Wl,--whole-archive \78 objects="-Wl,--whole-archive \
86 ${KBUILD_VMLINUX_INIT} \79 ${KBUILD_VMLINUX_OBJS} \
87 ${KBUILD_VMLINUX_MAIN} \
88 -Wl,--no-whole-archive \80 -Wl,--no-whole-archive \
89 -Wl,--start-group \81 -Wl,--start-group \
90 ${KBUILD_VMLINUX_LIBS} \82 ${KBUILD_VMLINUX_LIBS} \