Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
kbuild: refactor variables in scripts/link-vmlinux.sh
Clean up the variables in scripts/link-vmlinux.sh
- Specify the extra objects directly in vmlinux_link()
- Move the AS rule to kallsyms()
- Set kallsymso and btf_vmlinux_bin_o where they are generated
- Remove unneeded variable, kallsymso_prev
- Introduce the btf_data variable
- Introduce the strip_debug flag instead of checking the output name
No functional change intended.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
+35
-32
+35
-32
scripts/link-vmlinux.sh
+35
-32
scripts/link-vmlinux.sh
···
45
45
46
46
# Link of vmlinux
47
47
# ${1} - output file
48
-
# ${2}, ${3}, ... - optional extra .o files
49
48
vmlinux_link()
50
49
{
51
50
local output=${1}
···
89
90
ldflags="${ldflags} ${wl}--script=${objtree}/${KBUILD_LDS}"
90
91
91
92
# The kallsyms linking does not need debug symbols included.
92
-
if [ "$output" != "${output#.tmp_vmlinux.kallsyms}" ] ; then
93
+
if [ -n "${strip_debug}" ] ; then
93
94
ldflags="${ldflags} ${wl}--strip-debug"
94
95
fi
95
96
···
100
101
${ld} ${ldflags} -o ${output} \
101
102
${wl}--whole-archive ${objs} ${wl}--no-whole-archive \
102
103
${wl}--start-group ${libs} ${wl}--end-group \
103
-
$@ ${ldlibs}
104
+
${kallsymso} ${btf_vmlinux_bin_o} ${ldlibs}
104
105
}
105
106
106
107
# generate .BTF typeinfo from DWARF debuginfo
···
109
110
gen_btf()
110
111
{
111
112
local pahole_ver
113
+
local btf_data=${2}
112
114
113
115
if ! [ -x "$(command -v ${PAHOLE})" ]; then
114
116
echo >&2 "BTF: ${1}: pahole (${PAHOLE}) is not available"
···
124
124
125
125
vmlinux_link ${1}
126
126
127
-
info "BTF" ${2}
127
+
info BTF "${btf_data}"
128
128
LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${PAHOLE_FLAGS} ${1}
129
129
130
-
# Create ${2} which contains just .BTF section but no symbols. Add
130
+
# Create ${btf_data} which contains just .BTF section but no symbols. Add
131
131
# SHF_ALLOC because .BTF will be part of the vmlinux image. --strip-all
132
132
# deletes all symbols including __start_BTF and __stop_BTF, which will
133
133
# be redefined in the linker script. Add 2>/dev/null to suppress GNU
134
134
# objcopy warnings: "empty loadable segment detected at ..."
135
135
${OBJCOPY} --only-section=.BTF --set-section-flags .BTF=alloc,readonly \
136
-
--strip-all ${1} ${2} 2>/dev/null
136
+
--strip-all ${1} "${btf_data}" 2>/dev/null
137
137
# Change e_type to ET_REL so that it can be used to link final vmlinux.
138
138
# GNU ld 2.35+ and lld do not allow an ET_EXEC input.
139
139
if is_enabled CONFIG_CPU_BIG_ENDIAN; then
···
141
141
else
142
142
et_rel='\1\0'
143
143
fi
144
-
printf "${et_rel}" | dd of=${2} conv=notrunc bs=1 seek=16 status=none
144
+
printf "${et_rel}" | dd of="${btf_data}" conv=notrunc bs=1 seek=16 status=none
145
+
146
+
btf_vmlinux_bin_o=${btf_data}
145
147
}
146
148
147
-
# Create ${2} .S file with all symbols from the ${1} object file
149
+
# Create ${2}.o file with all symbols from the ${1} object file
148
150
kallsyms()
149
151
{
150
152
local kallsymopt;
···
167
165
kallsymopt="${kallsymopt} --lto-clang"
168
166
fi
169
167
170
-
info KSYMS ${2}
171
-
scripts/kallsyms ${kallsymopt} ${1} > ${2}
168
+
info KSYMS "${2}.S"
169
+
scripts/kallsyms ${kallsymopt} "${1}" > "${2}.S"
170
+
171
+
info AS "${2}.o"
172
+
${CC} ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS} \
173
+
${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} -c -o "${2}.o" "${2}.S"
174
+
175
+
kallsymso=${2}.o
172
176
}
173
177
174
178
# Perform one step in kallsyms generation, including temporary linking of
175
179
# vmlinux.
176
180
kallsyms_step()
177
181
{
178
-
kallsymso_prev=${kallsymso}
179
182
kallsyms_vmlinux=.tmp_vmlinux.kallsyms${1}
180
-
kallsymso=${kallsyms_vmlinux}.o
181
-
kallsyms_S=${kallsyms_vmlinux}.S
182
183
183
-
vmlinux_link ${kallsyms_vmlinux} "${kallsymso_prev}" ${btf_vmlinux_bin_o}
184
-
mksysmap ${kallsyms_vmlinux} ${kallsyms_vmlinux}.syms
185
-
kallsyms ${kallsyms_vmlinux}.syms ${kallsyms_S}
186
-
187
-
info AS ${kallsymso}
188
-
${CC} ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS} \
189
-
${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} \
190
-
-c -o ${kallsymso} ${kallsyms_S}
184
+
vmlinux_link "${kallsyms_vmlinux}"
185
+
mksysmap "${kallsyms_vmlinux}" "${kallsyms_vmlinux}.syms"
186
+
kallsyms "${kallsyms_vmlinux}.syms" "${kallsyms_vmlinux}"
191
187
}
192
188
193
189
# Create map file with all symbols from ${1}
···
223
223
224
224
${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init init/version-timestamp.o
225
225
226
-
btf_vmlinux_bin_o=""
226
+
btf_vmlinux_bin_o=
227
+
kallsymso=
228
+
strip_debug=
229
+
227
230
if is_enabled CONFIG_DEBUG_INFO_BTF; then
228
-
btf_vmlinux_bin_o=.btf.vmlinux.bin.o
229
-
if ! gen_btf .tmp_vmlinux.btf $btf_vmlinux_bin_o ; then
231
+
if ! gen_btf .tmp_vmlinux.btf .btf.vmlinux.bin.o ; then
230
232
echo >&2 "Failed to generate BTF for vmlinux"
231
233
echo >&2 "Try to disable CONFIG_DEBUG_INFO_BTF"
232
234
exit 1
233
235
fi
234
236
fi
235
237
236
-
kallsymso=""
237
-
kallsymso_prev=""
238
-
kallsyms_vmlinux=""
239
238
if is_enabled CONFIG_KALLSYMS; then
240
239
241
240
# kallsyms support
···
260
261
# a) Verify that the System.map from vmlinux matches the map from
261
262
# ${kallsymso}.
262
263
263
-
kallsyms_step 1
264
-
kallsyms_step 2
264
+
# The kallsyms linking does not need debug symbols included.
265
+
strip_debug=1
265
266
266
-
# step 3
267
-
size1=$(${CONFIG_SHELL} "${srctree}/scripts/file-size.sh" ${kallsymso_prev})
267
+
kallsyms_step 1
268
+
size1=$(${CONFIG_SHELL} "${srctree}/scripts/file-size.sh" ${kallsymso})
269
+
270
+
kallsyms_step 2
268
271
size2=$(${CONFIG_SHELL} "${srctree}/scripts/file-size.sh" ${kallsymso})
269
272
270
273
if [ $size1 -ne $size2 ] || [ -n "${KALLSYMS_EXTRA_PASS}" ]; then
···
274
273
fi
275
274
fi
276
275
277
-
vmlinux_link vmlinux "${kallsymso}" ${btf_vmlinux_bin_o}
276
+
strip_debug=
277
+
278
+
vmlinux_link vmlinux
278
279
279
280
# fill in BTF IDs
280
281
if is_enabled CONFIG_DEBUG_INFO_BTF && is_enabled CONFIG_BPF; then