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