i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

efi: Switch to direct EFI loader creation

Browse Source 
* efi-app-x86_64 is a undocumented legacy compatibility
  target from the early days of EFI.
* This opens the door to native arm,arm64 loaders without
  the gnu-efi 'fake pe' stubs in the future.
* This change also clairifies what's happening within the
  undocumented efi-app-x86_64
* Future as in binutils fixing these:
  https://sourceware.org/bugzilla/show_bug.cgi?id=26206
  https://sourceware.org/bugzilla/show_bug.cgi?id=26218

Change-Id: I60b4a4f5ceb36059033debbe6bf5b01928d6b223
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3016
Reviewed-by: Alex von Gluck IV <[email protected]>
Reviewed-by: Adrien Destugues <[email protected]>
Reviewed-by: Fredrik Holmqvist <[email protected]>
This commit is contained in:
Alexander von Gluck IV
2020-08-01 16:16:23 +00:00
committed by Alex von Gluck IV
parent 7e8f3368fa
commit c17fa27430
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/Jamfile
+13 -4
View File
@@ -104,7 +104,7 @@ rule BuildEFILoader {
switch $(TARGET_ARCH) {
case x86_64 :
OUTPUT_TARGET on $(efiLoader) = efi-app-x86_64 ;
OUTPUT_TARGET on $(efiLoader) = pei-x86-64 ;
case arm :
OUTPUT_TARGET on $(efiLoader) = binary ;
case arm64 :
@@ -119,9 +119,18 @@ rule BuildEFILoader {
actions BuildEFILoader
{
rm -f $(1)
$(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -j .text -j .sdata -j .data \
-j .dynamic -j .dynsym -j .rel -j .rela -j .reloc -j .dynstr \
--output-target=$(OUTPUT_TARGET) $(2) $(1)
if [ "$(OUTPUT_TARGET)" = "binary" ]; then
# no bfd support, fake efi Pe header
$(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -j .text -j .sdata -j .data \
-j .dynamic -j .dynsym -j .rel -j .rela -j .reloc -j .dynstr \
--output-target=$(OUTPUT_TARGET) $(2) $(1)
else
# bfd supports pe + efi for arch
$(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -j .text -j .sdata -j .data \
-j .dynamic -j .dynsym -j .rel -j .rela -j .reloc -j .dynstr \
--output-target=$(OUTPUT_TARGET) \
--subsystem=efi-app $(2) $(1)
fi
}