From 8af8df6452175af1632c5ed37e6f656481670170 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Tue, 20 Jul 2004 07:01:02 +0000 Subject: Fix the creation of EFI images that got broken by the import of binutils 2.15. The linker now creates a .rela.dyn section for dynamic relocations, while our script created a .rela section. Likewise, we copied the .rela section to the EFI image, but not the .rela.dyn section. The fix is to rename .rela to .rela.dyn in the linker script so that all relocations end up in the same section again. This we copy into the EFI image. --- sys/boot/ia64/efi/Makefile | 4 ++-- sys/boot/ia64/efi/ldscript.ia64 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/boot/ia64') diff --git a/sys/boot/ia64/efi/Makefile b/sys/boot/ia64/efi/Makefile index e58df26cd981..d08c84be81de 100644 --- a/sys/boot/ia64/efi/Makefile +++ b/sys/boot/ia64/efi/Makefile @@ -41,12 +41,12 @@ vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version loader.efi: loader.sym ${OBJCOPY} -j .text \ - -j .hash \ -j .data \ -j .sdata \ -j .dynamic \ - -j .rela \ + -j .rela.dyn \ -j .reloc \ + -j .hash \ -j .dynsym \ -j .dynstr \ --target=efi-app-${MACHINE_ARCH} \ diff --git a/sys/boot/ia64/efi/ldscript.ia64 b/sys/boot/ia64/efi/ldscript.ia64 index 002c2639bdb4..0f79b670e027 100644 --- a/sys/boot/ia64/efi/ldscript.ia64 +++ b/sys/boot/ia64/efi/ldscript.ia64 @@ -47,7 +47,7 @@ SECTIONS . = ALIGN(4096); .dynamic : { *(.dynamic) } . = ALIGN(4096); - .rela : { + .rela.dyn : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) -- cgit v1.2.3