diff options
| author | Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com> | 2020-12-10 18:00:37 -0300 |
|---|---|---|
| committer | Vasant Hegde <hegdevasant@linux.vnet.ibm.com> | 2020-12-15 13:13:41 +0530 |
| commit | a98262ee0634fde35a3d8b86b654f42aa27b00b5 (patch) | |
| tree | 65936a6ead545334a8c561e25ca21bd4529cba62 | |
| parent | b2ac14f459feebd774e2177d74cda0708f38da2a (diff) | |
| download | skiboot-a98262ee0634fde35a3d8b86b654f42aa27b00b5.zip skiboot-a98262ee0634fde35a3d8b86b654f42aa27b00b5.tar.gz skiboot-a98262ee0634fde35a3d8b86b654f42aa27b00b5.tar.bz2 | |
build: Fix linker script for builtin Kernel
Commit '6b08928d - build/lds: place debug sections according to
defaults' introduced a DEBUG_SECTIONS macro that is effectivelly
resetting the location pointer back to zero, making the next section
(builtin_kernel) collide with the earlier sections.
Fix by moving these sections to the very end.
Error message:
$ make KERNEL=zImage.epapr
[CC] asm/asm-offsets.s
[GN] include/asm-offsets.h
<...>
[LD] skiboot.tmp.elf
ld: section .builtin_kernel LMA [0000000000000000,0000000000285d87]
overlaps section .head LMA [0000000000000000,0000000000003897]
ld: section .naca LMA [0000000000004000,000000000000505f] overlaps
section .builtin_kernel LMA [0000000000000000,0000000000285d87]
make: *** [/skiboot/Makefile.main:333: skiboot.tmp.elf] Error 1
Fixes: 6b08928d - build/lds: place debug sections according to defaults
Signed-off-by: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com>
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
| -rw-r--r-- | skiboot.lds.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/skiboot.lds.S b/skiboot.lds.S index 5da6f9d..5a7f9e3 100644 --- a/skiboot.lds.S +++ b/skiboot.lds.S @@ -233,8 +233,6 @@ SECTIONS ASSERT((HEAP_BASE - SKIBOOT_BASE) >= _end, "Heap collision with image") - DEBUG_SECTIONS - /* Optional kernel image */ . = ALIGN(PAGE_SIZE); .builtin_kernel : { @@ -243,6 +241,8 @@ SECTIONS __builtin_kernel_end = .; } + DEBUG_SECTIONS + /* Discards */ /DISCARD/ : { *(.note.GNU-stack) |