diff options
| author | Mark Brown <broonie@kernel.org> | 2024-06-03 12:45:28 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-06-03 12:45:28 +0100 |
| commit | 8832266dae4f4b401fedce537448bf0cda233b1a (patch) | |
| tree | bc3b3ebf0fecc6e406472ae7b9cbd399bbd1355b /scripts/link-vmlinux.sh | |
| parent | f31f012d799cb3a1ab0e99db3694dd5616e59947 (diff) | |
| parent | c3f38fa61af77b49866b006939479069cd451173 (diff) | |
| download | linux-8832266dae4f4b401fedce537448bf0cda233b1a.tar.gz linux-8832266dae4f4b401fedce537448bf0cda233b1a.tar.bz2 linux-8832266dae4f4b401fedce537448bf0cda233b1a.zip | |
regulator: Merge up fixes
We need these to get the i.MX8 boards working in CI again.
Diffstat (limited to 'scripts/link-vmlinux.sh')
| -rwxr-xr-x | scripts/link-vmlinux.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index 7862a8101747..46ce5d04dbeb 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -179,10 +179,10 @@ kallsyms_step() kallsyms_S=${kallsyms_vmlinux}.S vmlinux_link ${kallsyms_vmlinux} "${kallsymso_prev}" ${btf_vmlinux_bin_o} - mksysmap ${kallsyms_vmlinux} ${kallsyms_vmlinux}.syms ${kallsymso_prev} + mksysmap ${kallsyms_vmlinux} ${kallsyms_vmlinux}.syms kallsyms ${kallsyms_vmlinux}.syms ${kallsyms_S} - info AS ${kallsyms_S} + info AS ${kallsymso} ${CC} ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS} \ ${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} \ -c -o ${kallsymso} ${kallsyms_S} @@ -193,7 +193,7 @@ kallsyms_step() mksysmap() { info NM ${2} - ${CONFIG_SHELL} "${srctree}/scripts/mksysmap" ${1} ${2} ${3} + ${NM} -n "${1}" | "${srctree}/scripts/mksysmap" > "${2}" } sorttable() @@ -201,7 +201,6 @@ sorttable() ${objtree}/scripts/sorttable ${1} } -# Delete output files in case of error cleanup() { rm -f .btf.* @@ -282,7 +281,7 @@ if is_enabled CONFIG_DEBUG_INFO_BTF && is_enabled CONFIG_BPF; then ${RESOLVE_BTFIDS} vmlinux fi -mksysmap vmlinux System.map ${kallsymso} +mksysmap vmlinux System.map if is_enabled CONFIG_BUILDTIME_TABLE_SORT; then info SORTTAB vmlinux |