Based on linux v4.10 patch: 7e2b37c971a2a20ec8a311a195a626c16c774031
kbuild: kallsyms allow 3-pass generation if symbols size has changed
kallsyms generation is not foolproof, due to some linkers adding
symbols (e.g., branch trampolines) when a binary size changes.
Have it attempt a 3rd pass automatically if the kallsyms size changes
in the 2nd pass.
This allows powerpc64 allyesconfig to build without adding another
pass when it's not required.
This can be solved other ways by directing the linker not to add labels
on branch stubs, or to move kallsyms near the end of the image. The
former is undesirable for debugging/tracing, and the latter is a more
significant change that requires more testing and review.
Signed-off-by: Nicholas Piggin <npiggin@xxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxxx>
Signed-off-by: Steffen Trumtrar <s.trumtrar@xxxxxxxxxxxxxx>
---
scripts/link-barebox.sh | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/scripts/link-barebox.sh b/scripts/link-barebox.sh
index a783dd6d5532..34fa1944002c 100755
--- a/scripts/link-barebox.sh
+++ b/scripts/link-barebox.sh
@@ -200,7 +200,14 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then
# 2a) We may use an extra pass as this has been necessary to
# woraround some alignment related bugs.
# KALLSYMS_EXTRA_PASS=1 is used to trigger this.
- # 3) The correct ${kallsymso} is linked into the final barebox.
+ # 3) That link may have expanded the kernel image enough that
+ # more linker branch stubs / trampolines had to be added, which
+ # introduces new names, which further expands kallsyms. Do another
+ # pass if that is the case. In theory it's possible this results
+ # in even more stubs, but unlikely.
+ # KALLSYMS_EXTRA_PASS=1 may also used to debug or work around
+ # other bugs.
+ # 4) The correct ${kallsymso} is linked into the final vmlinux.
#
# a) Verify that the System.map from barebox matches the map from
# ${kallsymso}.
@@ -216,8 +223,11 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then
barebox_link .tmp_kallsyms1.o .tmp_barebox2
kallsyms .tmp_barebox2 .tmp_kallsyms2.o
- # step 2a
- if [ -n "${CONFIG_KALLSYMS_EXTRA_PASS}" ]; then
+ # step 3
+ size1=$(stat -c "%s" .tmp_kallsyms1.o)
+ size2=$(stat -c "%s" .tmp_kallsyms2.o)
+
+ if [ $size1 -ne $size2 ] || [ -n "${CONFIG_KALLSYMS_EXTRA_PASS}" ]; then
kallsymso=.tmp_kallsyms3.o
kallsyms_barebox=.tmp_barebox3
--
2.19.2
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
