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

boot/loader/x86: select between 32-bit and 64-bit ELF support based on arch and platform

Browse Source 
Build both when building BIOS loader.
Build only 32-bit ELF support for 32-bit EFI loader.
Build only 64-bit ELF support for 64-bit EFI loader.

Change-Id: I88bb287fbb9a4b6618b365b2d03f85f64021f499
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4818
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
David Karoly
2021-12-27 15:17:17 +00:00
committed by Adrien Destugues
parent 5fcc7f71b5
commit 182eaee962
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/loader/Jamfile
+8 -2
View File
@@ -54,17 +54,23 @@ for platform in [ MultiBootSubDirSetup ] {
{ {
DEFINES += DEFINES +=
ALTERNATE_BOOT_ARCH=\\\"x86_64\\\" ALTERNATE_BOOT_ARCH=\\\"x86_64\\\"
BOOT_SUPPORT_ELF64
BOOT_SUPPORT_PARTITION_EFI BOOT_SUPPORT_PARTITION_EFI
#BOOT_SUPPORT_FILE_SYSTEM_FAT #BOOT_SUPPORT_FILE_SYSTEM_FAT
; ;
if $(TARGET_BOOT_PLATFORM) != efi { if $(TARGET_BOOT_PLATFORM) != efi {
DEFINES += DEFINES +=
_BOOT_PLATFORM_BIOS _BOOT_PLATFORM_BIOS
BOOT_SUPPORT_ELF32 BOOT_SUPPORT_ELF32
BOOT_SUPPORT_ELF64
; ;
} else {
if $(TARGET_ARCH) = x86_64 {
DEFINES += BOOT_SUPPORT_ELF64 ;
} else {
DEFINES += BOOT_SUPPORT_ELF32 ;
}
} }
} }
case "sparc" : case "sparc" :