History

kbuild: split the build log of kallsyms

Currently, the build log shows KSYM + object name. Precisely speaking, kallsyms generates a .S file and then the compiler compiles it into a .o file. Split the build log into two. [Before] GEN modules.builtin LD .tmp_vmlinux.kallsyms1 KSYM .tmp_vmlinux.kallsyms1.o LD .tmp_vmlinux.kallsyms2 KSYM .tmp_vmlinux.kallsyms2.o LD vmlinux [After] GEN modules.builtin LD .tmp_vmlinux.kallsyms1 KSYMS .tmp_vmlinux.kallsyms1.S AS .tmp_vmlinux.kallsyms1.o LD .tmp_vmlinux.kallsyms2 KSYMS .tmp_vmlinux.kallsyms2.S AS .tmp_vmlinux.kallsyms2.o LD vmlinux

Masahiro Yamada committed 6 years ago

Commit 08beb661 parent a9684331 file · +10 −10Browse files

Unified · Split

scripts/link-vmlinux.sh+10−10
@@ -169,10 +169,9 @@ gen_btf() · 168 unmodified lines
169 printf '\1' | dd of=${2} conv=notrunc bs=1 seek=16 status=none169 printf '\1' | dd of=${2} conv=notrunc bs=1 seek=16 status=none
170}170}
171 171
172# Create ${2} .o file with all symbols from the ${1} object file172# Create ${2} .S file with all symbols from the ${1} object file
173kallsyms()173kallsyms()
174{174{
175 info KSYM ${2}
176 local kallsymopt;175 local kallsymopt;
177 176
178 if [ -n "${CONFIG_KALLSYMS_ALL}" ]; then177 if [ -n "${CONFIG_KALLSYMS_ALL}" ]; then
@@ -187,13 +186,8 @@ kallsyms() · 8 unmodified lines
187 kallsymopt="${kallsymopt} --base-relative"186 kallsymopt="${kallsymopt} --base-relative"
188 fi187 fi
189 188
190 local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} \189 info KSYMS ${2}
191 ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"190 ${NM} -n ${1} | scripts/kallsyms ${kallsymopt} > ${2}
192
193 local afile="`basename ${2} .o`.S"
194
195 ${NM} -n ${1} | scripts/kallsyms ${kallsymopt} > ${afile}
196 ${CC} ${aflags} -c -o ${2} ${afile}
197}191}
198 192
199# Perform one step in kallsyms generation, including temporary linking of193# Perform one step in kallsyms generation, including temporary linking of
@@ -203,9 +197,15 @@ kallsyms_step() · 3 unmodified lines
203 kallsymso_prev=${kallsymso}197 kallsymso_prev=${kallsymso}
204 kallsyms_vmlinux=.tmp_vmlinux.kallsyms${1}198 kallsyms_vmlinux=.tmp_vmlinux.kallsyms${1}
205 kallsymso=${kallsyms_vmlinux}.o199 kallsymso=${kallsyms_vmlinux}.o
200 kallsyms_S=${kallsyms_vmlinux}.S
206 201
207 vmlinux_link ${kallsyms_vmlinux} "${kallsymso_prev}" ${btf_vmlinux_bin_o}202 vmlinux_link ${kallsyms_vmlinux} "${kallsymso_prev}" ${btf_vmlinux_bin_o}
208 kallsyms ${kallsyms_vmlinux} ${kallsymso}203 kallsyms ${kallsyms_vmlinux} ${kallsyms_S}
204
205 info AS ${kallsyms_S}
206 ${CC} ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS} \
207 ${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} \
208 -c -o ${kallsymso} ${kallsyms_S}
209}209}
210 210
211# Create map file with all symbols from ${1}211# Create map file with all symbols from ${1}