diff options
| author | marcel <marcel@FreeBSD.org> | 2004-07-20 07:01:02 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2004-07-20 07:01:02 +0000 |
| commit | 8b3a02d853f897d3f683a9554fb6ead2f556c9d7 (patch) | |
| tree | 2b711285f022c2fb7013df1b5e2dc51cac322427 /sys | |
| parent | 1aa85164b17800f0af5848dc5cc0a6254bfb15b9 (diff) | |
| download | FreeBSD-src-8b3a02d853f897d3f683a9554fb6ead2f556c9d7.zip FreeBSD-src-8b3a02d853f897d3f683a9554fb6ead2f556c9d7.tar.gz | |
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.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/boot/efi/libefi/arch/ia64/ldscript.ia64 | 2 | ||||
| -rw-r--r-- | sys/boot/efi/loader/Makefile | 4 | ||||
| -rw-r--r-- | sys/boot/ia64/efi/Makefile | 4 | ||||
| -rw-r--r-- | sys/boot/ia64/efi/ldscript.ia64 | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sys/boot/efi/libefi/arch/ia64/ldscript.ia64 b/sys/boot/efi/libefi/arch/ia64/ldscript.ia64 index 002c263..0f79b67 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 e58df26..d08c84b 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} \ diff --git a/sys/boot/ia64/efi/Makefile b/sys/boot/ia64/efi/Makefile index e58df26..d08c84b 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 002c263..0f79b67 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.*) |
