From 911821275aa1ab1f7b030050a9878b69de15beec Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Mon, 2 Jun 2014 01:46:25 +0200
Subject: [PATCH] Increase HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET for debug builds.

---
 build/jam/ArchitectureRules | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 0c3200f343..bf5d223cf7 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -275,6 +275,9 @@ rule KernelArchitectureSetup architecture
 	local gccVersion = $(HAIKU_GCC_VERSION_$(architecture)) ;
 	local cpu = $(HAIKU_CPU_$(architecture)) ;
 
+	local debugBootLoader
+		= [ ConfigVar DEBUG : HAIKU_TOP src system boot loader ] ;
+
 	switch $(cpu) {
 		case ppc :
 			HAIKU_BOOT_PLATFORM ?= openfirmware ;
@@ -323,7 +326,11 @@ rule KernelArchitectureSetup architecture
 			HAIKU_BOOT_PLATFORM = bios_ia32 ;
 			HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
 			# offset in floppy image (>= sizeof(haiku_loader))
-			HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
+			if $(debugBootLoader) {
+				HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 350 ; # in kB
+			} else {
+				HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
+			}
 
 			# nasm is required for target arch x86
 			if ! $(HAIKU_NASM) {
@@ -335,7 +342,11 @@ rule KernelArchitectureSetup architecture
 			HAIKU_BOOT_PLATFORM = bios_ia32 ;
 			HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
 			# offset in floppy image (>= sizeof(haiku_loader))
-			HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
+			if $(debugBootLoader) {
+				HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 350 ; # in kB
+			} else {
+				HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
+			}
 
 			# x86_64 kernel source is under arch/x86.
 			HAIKU_KERNEL_ARCH = x86 ;