From ddf7e72f86a6fc8b64c3e4e7fbca3fd2dc7fcf7a Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Mon, 25 Mar 2019 19:43:39 +0100 Subject: [PATCH] loader: Do not assume ELF32 for any non-EFI target. 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 --- src/system/boot/loader/Jamfile | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/src/system/boot/loader/Jamfile b/src/system/boot/loader/Jamfile index 0f4917369a..eab74569a0 100644 --- a/src/system/boot/loader/Jamfile +++ b/src/system/boot/loader/Jamfile @@ -52,16 +52,39 @@ for platform in [ MultiBootSubDirSetup ] { #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 { DEFINES += _BOOT_PLATFORM_EFI ; } } - } - - if $(TARGET_BOOT_PLATFORM) != efi { - DEFINES += BOOT_SUPPORT_ELF32 ; } local kernelC++Header = [ FDirName $(HAIKU_TOP) headers private kernel util