Build after compiler changed to hardfloat, and link against libgcc. ok miod@

2 files changed, 11 insertions, 3 deletions

diff --git a/sys/arch/landisk/stand/boot/Makefile b/sys/arch/landisk/stand/boot/Makefile
index 1e2e5f5c85b..ff3be151e30 100644
--- a/sys/arch/landisk/stand/boot/Makefile
+++ b/sys/arch/landisk/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2006/10/10 05:26:54 miod Exp $
+#	$OpenBSD: Makefile,v 1.3 2006/10/11 17:19:06 drahn Exp $
 
 PROG=	boot
 SRCS=	srt0.S conf.c devs.c getsecs.c scifcons.c delay.c
@@ -11,6 +11,7 @@ CPPFLAGS+=-D_STANDALONE
 CPPFLAGS+=-DSH4
 CPPFLAGS+=-nostdinc -I${.OBJDIR} -I${.CURDIR} -I${.CURDIR}/.. -I${S}
 CPPFLAGS+=-DLOADADDRESS=0x8ff00000
+CFLAGS+=-m4-nofpu
 
 .PATH:  ${S}/stand/boot
 SRCS+=	boot.c cmd.c vars.c bootarg.c
@@ -34,6 +35,9 @@ Z_AS?=	library
 DPADD+= $(ZLIB)
 LDADD+= $(ZLIB)
 
+LIBGCC!=${CC} -print-libgcc-file-name
+LDADD+= $(LIBGCC)
+
 ${PROG}: ${OBJS} ${DPADD}
 	${LD} -o ${PROG}.sym ${LDFLAGS} \
 		-Map ${PROG}.map -cref ${OBJS} ${LDADD}
diff --git a/sys/arch/landisk/stand/bootxx/Makefile b/sys/arch/landisk/stand/bootxx/Makefile
index af0e6029ea2..887e3fe72ee 100644
--- a/sys/arch/landisk/stand/bootxx/Makefile
+++ b/sys/arch/landisk/stand/bootxx/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2006/10/06 22:06:46 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 2006/10/11 17:19:06 drahn Exp $
 
 MAN=	bootxx.8
 
@@ -12,9 +12,10 @@ INSTALL_STRIP=
 BOOTXX_SECTORS?= 15
 BOOTXX_MAXSIZE?= (( ${BOOTXX_SECTORS} * 512 ))
 
-CPPFLAGS+=-D_STANDALONE -DNO_READDIR
+CPPFLAGS+=-D_STANDALONE
 CPPFLAGS+=-nostdinc -I${.OBJDIR} -I${.CURDIR}/.. -I${.CURDIR}/../../../..
 CPPFLAGS+=-DLOADADDRESS=0x8ff00000 -DBOOTXX_SECTORS=${BOOTXX_SECTORS}
+CFLAGS+=-m4-nofpu
 
 S=	${.CURDIR}/../../../..
 SAREL=
@@ -27,6 +28,9 @@ KERN_AS?=	library
 DPADD+= $(KERNLIB)
 LDADD+= $(KERNLIB)
 
+LIBGCC!=${CC} -print-libgcc-file-name
+LDADD+= $(LIBGCC)
+
 ${PROG}: ${OBJS} ${DPADD}
 	${LD} -o ${PROG}.sym ${LDFLAGS} \
 		-Map ${PROG}.map -cref ${OBJS} ${LDADD}