From a140acf82e7d4ff91b7de112a187eecf70a556df Mon Sep 17 00:00:00 2001
From: Tom Cosgrove <tom@cvs.openbsd.org>
Date: Sun, 27 May 2007 18:38:34 +0000
Subject: Unbreak cdboot and pxeboot machine memory +/-; bad mpf@.

ok deraadt@
---
 sys/arch/amd64/stand/cdboot/Makefile  | 6 +++---
 sys/arch/amd64/stand/cdboot/conf.c    | 4 ++--
 sys/arch/amd64/stand/pxeboot/Makefile | 6 +++---
 sys/arch/amd64/stand/pxeboot/conf.c   | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'sys/arch/amd64')

diff --git a/sys/arch/amd64/stand/cdboot/Makefile b/sys/arch/amd64/stand/cdboot/Makefile
index c12d102e633..205ed7c50e7 100644
--- a/sys/arch/amd64/stand/cdboot/Makefile
+++ b/sys/arch/amd64/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2005/08/01 13:20:23 mickey Exp $
+#	$OpenBSD: Makefile,v 1.7 2007/05/27 18:38:33 tom Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -31,7 +31,7 @@ SRCS+=	cmd.c vars.c bootarg.c
 # not required: getfile.c gets.c globals.c strlcat.c
 SRCS+=	alloc.c exit.c strcmp.c strlen.c \
 	strncmp.c memcmp.c memcpy.c memset.c printf.c snprintf.c \
-	strerror.c strncpy.c strtol.c ctime.c strlcpy.c
+	strerror.c strncpy.c strtol.c strtoll.c ctime.c strlcpy.c
 # io routines
 # not required: ioctl.c write.c
 SRCS+=	close.c closeall.c dev.c disklabel.c dkcksum.c fstat.c lseek.c \
@@ -39,7 +39,7 @@ SRCS+=	close.c closeall.c dev.c disklabel.c dkcksum.c fstat.c lseek.c \
 # boot filesystems
 SRCS+=	ufs.c cd9660.c
 # gcc support
-SRCS+=	moddi3.c qdivrem.c
+SRCS+=	divdi3.c moddi3.c qdivrem.c
 
 .PATH:	${S}/lib/libz
 SRCS+=	adler32.c crc32.c inflate.c inftrees.c
diff --git a/sys/arch/amd64/stand/cdboot/conf.c b/sys/arch/amd64/stand/cdboot/conf.c
index beec5f73b07..0bddf2cb83e 100644
--- a/sys/arch/amd64/stand/cdboot/conf.c
+++ b/sys/arch/amd64/stand/cdboot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.10 2007/04/28 19:23:10 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.11 2007/05/27 18:38:33 tom Exp $	*/
 
 /*
  * Copyright (c) 2004 Tom Cosgrove
@@ -42,7 +42,7 @@
 #include <biosdev.h>
 #include <dev/cons.h>
 
-const char version[] = "1.09";
+const char version[] = "1.10";
 int	debug = 1;
 
 
diff --git a/sys/arch/amd64/stand/pxeboot/Makefile b/sys/arch/amd64/stand/pxeboot/Makefile
index 6b2d0890404..e200e1b2138 100644
--- a/sys/arch/amd64/stand/pxeboot/Makefile
+++ b/sys/arch/amd64/stand/pxeboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2005/07/30 14:37:39 millert Exp $
+#	$OpenBSD: Makefile,v 1.6 2007/05/27 18:38:33 tom Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -31,7 +31,7 @@ SRCS+=	boot.c cmd.c vars.c bootarg.c
 # stand routines
 SRCS+=	alloc.c exit.c getfile.c gets.c globals.c strcmp.c strlen.c \
 	strncmp.c memcmp.c memcpy.c memset.c printf.c snprintf.c \
-	strerror.c strncpy.c strtol.c ctime.c strlcpy.c strlcat.c
+	strerror.c strncpy.c strtol.c strtoll.c ctime.c strlcpy.c strlcat.c
 # io routines
 SRCS+=	close.c closeall.c dev.c disklabel.c dkcksum.c fstat.c ioctl.c lseek.c \
 	read.c stat.c write.c cread.c readdir.c cons.c loadfile.c
@@ -42,7 +42,7 @@ SRCS+=	bootp.c bootparam.c
 # boot filesystems
 SRCS+=	ufs.c nfs.c tftp.c
 # gcc support
-SRCS+=	moddi3.c qdivrem.c
+SRCS+=	divdi3.c moddi3.c qdivrem.c
 
 .PATH:	${S}/lib/libz
 SRCS+=	adler32.c crc32.c inflate.c inftrees.c
diff --git a/sys/arch/amd64/stand/pxeboot/conf.c b/sys/arch/amd64/stand/pxeboot/conf.c
index 0c17e412690..5ef3af4a59e 100644
--- a/sys/arch/amd64/stand/pxeboot/conf.c
+++ b/sys/arch/amd64/stand/pxeboot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.13 2007/04/28 19:23:10 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.14 2007/05/27 18:38:33 tom Exp $	*/
 
 /*
  * Copyright (c) 2004 Tom Cosgrove
@@ -45,7 +45,7 @@
 #include "pxeboot.h"
 #include "pxe_net.h"
 
-const char version[] = "1.12";
+const char version[] = "1.13";
 int	debug = 0;
 
 #undef _TEST
-- 
cgit v1.2.3