mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-14 10:09:48 +00:00
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.
This commit is contained in:
parent
8e5fd46198
commit
a6d81d83a2
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=93921
@ -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)
|
||||
|
@ -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 \
|
||||
|
@ -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 \
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user