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 <[email protected]>
2019-03-30 15:23:15 +00:00
parent f23db0edb5
commit ddf7e72f86
1 changed files with 27 additions and 4 deletions
@@ -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