Skip to content

Commit a043934

Browse files
Ard BiesheuvelMichal Marek
Ard Biesheuvel
authored and
Michal Marek
committed
scripts/link-vmlinux.sh: force error on kallsyms failure
Since the output of the invocation of scripts/kallsyms is piped directly into the assembler, error messages it emits are visible on stderr, but a non-zero return code is ignored, and the build simply proceeds in that case. However, the resulting kernel is most likely broken, and will crash at boot. So instead, capture the output of kallsyms in a separate .S file, and pass that to the assembler in a separate step. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Michal Marek <mmarek@suse.com>
1 parent b41c29b commit a043934

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

scripts/link-vmlinux.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,10 @@ kallsyms()
9393
local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} \
9494
${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
9595

96-
${NM} -n ${1} | \
97-
scripts/kallsyms ${kallsymopt} | \
98-
${CC} ${aflags} -c -o ${2} -x assembler-with-cpp -
96+
local afile="`basename ${2} .o`.S"
97+
98+
${NM} -n ${1} | scripts/kallsyms ${kallsymopt} > ${afile}
99+
${CC} ${aflags} -c -o ${2} ${afile}
99100
}
100101

101102
# Create map file with all symbols from ${1}

0 commit comments

Comments
 (0)