From fc9f3c4a379c0d31e5386b98930fe8f4395b9bfc Mon Sep 17 00:00:00 2001
From: miod <miod@openbsd.org>
Date: Sun, 14 Jun 2015 19:08:59 +0000
Subject: [PATCH] Build required bits from libkern rather than importing them
 from libgcc.

---
 sys/arch/landisk/stand/boot/Makefile   | 6 ++----
 sys/arch/landisk/stand/xxboot/Makefile | 7 +++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/sys/arch/landisk/stand/boot/Makefile b/sys/arch/landisk/stand/boot/Makefile
index f58688df89f..11617b7a474 100644
--- a/sys/arch/landisk/stand/boot/Makefile
+++ b/sys/arch/landisk/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.10 2014/07/13 09:26:08 jasper Exp $
+#	$OpenBSD: Makefile,v 1.11 2015/06/14 19:08:59 miod Exp $
 
 MAN=	boot.8
 MLINKS=	boot.8 boot.conf.5
@@ -24,6 +24,7 @@ SRCS+=	boot.c cmd.c vars.c bootarg.c
 
 .PATH:	${S}/lib/libkern/arch/sh ${S}/lib/libkern
 SRCS+=	getchar.c putchar.c strlen.c strlcpy.c
+SRCS+=	ashrdi3.c moddi3.c sdivsi3.S udivsi3.S
 
 SAREL=
 SA_ZLIB=
@@ -39,9 +40,6 @@ 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/xxboot/Makefile b/sys/arch/landisk/stand/xxboot/Makefile
index b5ec85080c4..44da161da5f 100644
--- a/sys/arch/landisk/stand/xxboot/Makefile
+++ b/sys/arch/landisk/stand/xxboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2014/07/13 21:18:44 jasper Exp $
+#	$OpenBSD: Makefile,v 1.8 2015/06/14 19:08:59 miod Exp $
 
 MAN=	xxboot.8
 
@@ -18,6 +18,7 @@ CPPFLAGS+=-D_STANDALONE
 CPPFLAGS+=-nostdinc -I${.OBJDIR} -I${.CURDIR}/.. -I${.CURDIR}/../../../..
 CPPFLAGS+=-DLOADADDRESS=0x8ff00000 -DXXBOOT_SECTORS=${XXBOOT_SECTORS}
 CFLAGS+=-m4-nofpu -fno-pie
+AFLAGS+= -fno-pie
 
 OBJCOPY?=objcopy
 
@@ -29,9 +30,7 @@ LDADD+= $(SALIB)
 
 .PATH:	${S}/lib/libkern/arch/sh ${S}/lib/libkern
 SRCS+=	strlen.c
-
-LIBGCC!=${CC} -print-libgcc-file-name
-LDADD+= $(LIBGCC)
+SRCS+=	ashrdi3.c sdivsi3.S udivsi3.S
 
 ${PROG}: ${OBJS} ${DPADD}
 	${LD} -o ${PROG}.sym ${LDFLAGS} \
-- 
2.20.1