stand: Make pc98 build

This is a direct commit to stable/11 due to pc98 removal from head.

Several improvements in head that were MFC'd left the pc98 build broken in
stable/11. Massage the pc98 bits to get it to at least build.

1 files changed, 10 insertions, 14 deletions

diff --git a/stand/pc98/Makefile.inc b/stand/pc98/Makefile.inc
index d766303..b492ef7 100644
--- a/stand/pc98/Makefile.inc
+++ b/stand/pc98/Makefile.inc
@@ -2,28 +2,24 @@
 #
 # $FreeBSD$
 
-BINDIR?=	/boot
-
 LOADER_ADDRESS?=0x200000
-CFLAGS+=	-march=i386 -ffreestanding
-CFLAGS.gcc+=	-mpreferred-stack-boundary=2
-CFLAGS+=	${CFLAGS_NO_SIMD} -msoft-float
-CFLAGS+=	-Os -DPC98
 LDFLAGS+=	-nostdlib
 
 # BTX components
-.if exists(${.OBJDIR}/../btx)
-BTXDIR=		${.OBJDIR}/../btx
-.else
-BTXDIR=		${.CURDIR}/../btx
-.endif
+BTXDIR=		${BOOTOBJ}/pc98/btx
 BTXLDR=		${BTXDIR}/btxldr/btxldr
 BTXKERN=	${BTXDIR}/btx/btx
+
+BTXSRC=		${BOOTSRC}/pc98/btx
 BTXCRT=		${BTXDIR}/lib/crt0.o
 
 # compact binary with no padding between text, data, bss
-LDSCRIPT=	${SRCTOP}/stand/i386/boot.ldscript
-LDFLAGS_BIN=-e start -Ttext ${ORG} -Wl,-T,${LDSCRIPT},-S,--oformat,binary
-LD_FLAGS_BIN=-static -T ${LDSCRIPT} --gc-sections
+LDSCRIPT=	${BOOTSRC}/i386/boot.ldscript
+#LDFLAGS_BIN=-e start -Ttext ${ORG} -Wl,-T,${LDSCRIPT},-S,--oformat,binary
+LDFLAGS_BIN=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary
+#LD_FLAGS_BIN=-static -T ${LDSCRIPT} --gc-sections
+LD_FLAGS_BIN=-static -N --gc-sections
+
+WARNS?=		0
 
 .include "../Makefile.inc"