From 272f01764b67795a3d2b9b316bdeacb5f4ce4c47 Mon Sep 17 00:00:00 2001
From: Travis Geiselbrecht <geist@newos.org>
Date: Thu, 12 Jul 2007 07:21:23 +0000
Subject: [PATCH] get the x86_64 build working again (though it's only actually
 building a piece of the bootloader).

git-svn-id: svn+ssh://newos.org/var/svn/newos/newos@1241 c25cc9d1-44fa-0310-b259-ad778cb1d433
---
 boot/pc/x86_64/bootblock.S | 4 ++--
 lib/libc/hoard/config.h    | 3 ++-
 tools/bootmaker.c          | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/boot/pc/x86_64/bootblock.S b/boot/pc/x86_64/bootblock.S
index fb40914..cd4ad47 100644
--- a/boot/pc/x86_64/bootblock.S
+++ b/boot/pc/x86_64/bootblock.S
@@ -334,7 +334,7 @@ ext_mem_info:
 ext_mem_count:
 	.byte 0
 
-.skip (510 - .)
+.skip (_start + 510 - .)
 	.word	0xaa55             // magic number for boot sector
 
 // second sector of the boot code
@@ -445,4 +445,4 @@ in_vesa:
 vesa_info:
 	.long 0
 
-.skip (1024 - .)
+.skip (_start + 1024 - .)
diff --git a/lib/libc/hoard/config.h b/lib/libc/hoard/config.h
index 633579b..2b788c9 100644
--- a/lib/libc/hoard/config.h
+++ b/lib/libc/hoard/config.h
@@ -80,7 +80,8 @@ enum { SUPERBLOCK_FULLNESS_GROUP = 9 };
 #define CACHE_LINE 64
 #endif
 
-#ifdef __GNUG__
+//#ifdef __GNUG__
+#if 0 // doesn't work in gcc 4.2+
 // Use the max operator, an extension to C++ found in GNU C++.
 #define MAX(a,b) ((a) >? (b))
 #else
diff --git a/tools/bootmaker.c b/tools/bootmaker.c
index ae5d441..c28bd38 100644
--- a/tools/bootmaker.c
+++ b/tools/bootmaker.c
@@ -38,6 +38,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <string.h>
 
 #ifdef sparc
 #define xBIG_ENDIAN 1
-- 
2.11.4.GIT