Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

loader: Do not assume ELF32 for any non-EFI target.

Browse Source 
sparc is 64bit even at the bootloader stage.

Change-Id: Idbf39497503aac08e72c691cf655e97f95347784
Reviewed-on: https://review.haiku-os.org/c/1324
Reviewed-by: Alex von Gluck IV <kallisti5@unixzen.com>
This commit is contained in:
PulkoMandy 2019-03-25 19:43:39 +01:00 committed by waddlesplash
parent f23db0edb5
commit ddf7e72f86
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/system/boot/loader/Jamfile
View File

@ -52,16 +52,39 @@ for platform in [ MultiBootSubDirSetup ] {
#BOOT_SUPPORT_FILE_SYSTEM_FAT #BOOT_SUPPORT_FILE_SYSTEM_FAT
; ;
if $(TARGET_BOOT_PLATFORM) = efi {
DEFINES +=
_BOOT_PLATFORM_EFI
;
} else {
DEFINES += BOOT_SUPPORT_ELF32 ;
}
}
case "sparc" :
{
DEFINES +=
BOOT_SUPPORT_ELF64
;
}
case "risc-v" :
{
DEFINES +=
BOOT_SUPPORT_ELF64
;
}
case "m68k" :
{
DEFINES += BOOT_SUPPORT_ELF32 ;
}
case "arm" :
{
DEFINES += BOOT_SUPPORT_ELF32 ;
if $(TARGET_BOOT_PLATFORM) = efi { if $(TARGET_BOOT_PLATFORM) = efi {
DEFINES += DEFINES +=
_BOOT_PLATFORM_EFI _BOOT_PLATFORM_EFI
; ;
} }
} }
}
if $(TARGET_BOOT_PLATFORM) != efi {
DEFINES += BOOT_SUPPORT_ELF32 ;
} }
local kernelC++Header = [ FDirName $(HAIKU_TOP) headers private kernel util local kernelC++Header = [ FDirName $(HAIKU_TOP) headers private kernel util