diff options
| author | Marcel Moolenaar <marcel@FreeBSD.org> | 2004-07-20 07:01:02 +0000 |
|---|---|---|
| committer | Marcel Moolenaar <marcel@FreeBSD.org> | 2004-07-20 07:01:02 +0000 |
| commit | 8af8df6452175af1632c5ed37e6f656481670170 (patch) | |
| tree | 2b711285f022c2fb7013df1b5e2dc51cac322427 /sys/boot/efi | |
| parent | fb7ed0f9ccc201c47ff8c29dc363f207dffe7730 (diff) | |
| download | src-8af8df6452175af1632c5ed37e6f656481670170.tar.gz src-8af8df6452175af1632c5ed37e6f656481670170.zip | |
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.
Notes
Notes:
svn path=/head/; revision=132435
Diffstat (limited to 'sys/boot/efi')
| -rw-r--r-- | sys/boot/efi/libefi/arch/ia64/ldscript.ia64 | 2 | ||||
| -rw-r--r-- | sys/boot/efi/loader/Makefile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/boot/efi/libefi/arch/ia64/ldscript.ia64 b/sys/boot/efi/libefi/arch/ia64/ldscript.ia64 index 002c2639bdb4..0f79b670e027 100644 --- a/sys/boot/efi/libefi/arch/ia64/ldscript.ia64 +++ b/sys/boot/efi/libefi/arch/ia64/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.*) diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile index e58df26cd981..d08c84be81de 100644 --- a/sys/boot/efi/loader/Makefile +++ b/sys/boot/efi/loader/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} \ |