diff options
| author | peter <peter@FreeBSD.org> | 2002-04-06 03:39:22 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2002-04-06 03:39:22 +0000 |
| commit | 4e70269a832650804853a8e07584a30e01aa78ad (patch) | |
| tree | 98bdf192600ce160cf10a098cdc17744b53e1ff5 /sys/boot | |
| parent | ec999f832387fd1008c02c820d4bb1e8eca81b97 (diff) | |
| download | FreeBSD-src-4e70269a832650804853a8e07584a30e01aa78ad.zip FreeBSD-src-4e70269a832650804853a8e07584a30e01aa78ad.tar.gz | |
Fix self hosted loader building. When you use a self configured gcc, it
detects and uses the gas section merge support. As a result, a whole bunch
of new sections arrive, including .rodata.str1.8, which was not included
in our custom ldscript.ia64. The result was a loader binary that EFI
rejected.
While here, collect the loader shell commands linker set and include it
in the data area rather than having its own section.
/boot/loader.efi was the last holdout for having a 100% self built ia64
system.
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/efi/libefi/arch/ia64/ldscript.ia64 | 7 | ||||
| -rw-r--r-- | sys/boot/efi/loader/Makefile | 1 | ||||
| -rw-r--r-- | sys/boot/ia64/efi/Makefile | 1 | ||||
| -rw-r--r-- | sys/boot/ia64/efi/ldscript.ia64 | 7 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/boot/efi/libefi/arch/ia64/ldscript.ia64 b/sys/boot/efi/libefi/arch/ia64/ldscript.ia64 index 3d2e4e5..aa02808 100644 --- a/sys/boot/efi/libefi/arch/ia64/ldscript.ia64 +++ b/sys/boot/efi/libefi/arch/ia64/ldscript.ia64 @@ -22,9 +22,10 @@ SECTIONS . = ALIGN(4096); .data : { - *(.rodata) - *(.rodata1) - *(.set.*) + *(.rodata*) + __start_set_Xcommand_set = .; + *(set_Xcommand_set) + __stop_set_Xcommand_set = .; *(.ctors) *(.data) *(.data1) diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile index 9e6200f..61848df 100644 --- a/sys/boot/efi/loader/Makefile +++ b/sys/boot/efi/loader/Makefile @@ -54,7 +54,6 @@ vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${BASE}.efi: ${BASE}.sym ${OBJCOPY} -j .text \ - -j set_Xcommand_set \ -j .hash \ -j .data \ -j .sdata \ diff --git a/sys/boot/ia64/efi/Makefile b/sys/boot/ia64/efi/Makefile index 9e6200f..61848df 100644 --- a/sys/boot/ia64/efi/Makefile +++ b/sys/boot/ia64/efi/Makefile @@ -54,7 +54,6 @@ vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${BASE}.efi: ${BASE}.sym ${OBJCOPY} -j .text \ - -j set_Xcommand_set \ -j .hash \ -j .data \ -j .sdata \ diff --git a/sys/boot/ia64/efi/ldscript.ia64 b/sys/boot/ia64/efi/ldscript.ia64 index 3d2e4e5..aa02808 100644 --- a/sys/boot/ia64/efi/ldscript.ia64 +++ b/sys/boot/ia64/efi/ldscript.ia64 @@ -22,9 +22,10 @@ SECTIONS . = ALIGN(4096); .data : { - *(.rodata) - *(.rodata1) - *(.set.*) + *(.rodata*) + __start_set_Xcommand_set = .; + *(set_Xcommand_set) + __stop_set_Xcommand_set = .; *(.ctors) *(.data) *(.data1) |
