Nuke commons with libsa and add --warn-common to the ld command lines.

No functional change.

7 files changed, 14 insertions, 12 deletions

diff --git a/sys/arch/mvme88k/stand/bootsd/Makefile b/sys/arch/mvme88k/stand/bootsd/Makefile
index a65afde4121..243d4e1622b 100644
--- a/sys/arch/mvme88k/stand/bootsd/Makefile
+++ b/sys/arch/mvme88k/stand/bootsd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.17 2013/01/05 11:20:56 miod Exp $
+#	$OpenBSD: Makefile,v 1.18 2013/01/16 20:45:09 miod Exp $
 
 S=	${.CURDIR}/../../../..
 DEFS=
@@ -7,6 +7,7 @@ INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 	-I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
 CFLAGS+=${INCPATH} ${DEFS} ${COPTS}
 LDFLAGS=-N -T ${S}/arch/mvme88k/stand/ld.script -Ttext ${STAGE2_RELOC}
+LDFLAGS+= -warn-common
 NOPIE=
 CLEANFILES+=bootsd
 
diff --git a/sys/arch/mvme88k/stand/bootst/Makefile b/sys/arch/mvme88k/stand/bootst/Makefile
index 3b99843f28a..add72dfd501 100644
--- a/sys/arch/mvme88k/stand/bootst/Makefile
+++ b/sys/arch/mvme88k/stand/bootst/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.16 2013/01/05 11:20:56 miod Exp $
+#	$OpenBSD: Makefile,v 1.17 2013/01/16 20:45:09 miod Exp $
 
 SIZE?=	size
 
@@ -9,6 +9,7 @@ INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 	-I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
 CFLAGS+=${INCPATH} ${DEFS} ${COPTS}
 LDFLAGS=-N -T ${S}/arch/mvme88k/stand/ld.script -Ttext ${STAGE2_RELOC}
+LDFLAGS+= -warn-common
 NOPIE=
 CLEANFILES+=stboot bootst bootst.bug
 
diff --git a/sys/arch/mvme88k/stand/bootxx/Makefile b/sys/arch/mvme88k/stand/bootxx/Makefile
index 1552f50b0a2..8e753d40557 100644
--- a/sys/arch/mvme88k/stand/bootxx/Makefile
+++ b/sys/arch/mvme88k/stand/bootxx/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.16 2013/01/05 11:20:56 miod Exp $
+#	$OpenBSD: Makefile,v 1.17 2013/01/16 20:45:09 miod Exp $
 
 S=	${.CURDIR}/../../../..
 DEFS=-DSTAGE2_RELOC=${STAGE2_RELOC}
@@ -7,6 +7,7 @@ INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 	-I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
 CFLAGS+=${INCPATH} ${DEFS} ${COPTS}
 LDFLAGS=-S -N -T ${S}/arch/mvme88k/stand/ld.script -Ttext ${STAGE1_RELOC}
+LDFLAGS+= -warn-common
 NOPIE=
 CLEANFILES+=bootxx
 
diff --git a/sys/arch/mvme88k/stand/libsa/bugdev.c b/sys/arch/mvme88k/stand/libsa/bugdev.c
index fcff1c6d829..f0d5513543e 100644
--- a/sys/arch/mvme88k/stand/libsa/bugdev.c
+++ b/sys/arch/mvme88k/stand/libsa/bugdev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bugdev.c,v 1.7 2011/03/13 00:13:53 deraadt Exp $ */
+/*	$OpenBSD: bugdev.c,v 1.8 2013/01/16 20:45:09 miod Exp $ */
 
 /*
  * Copyright (c) 1993 Paul Kranenburg
@@ -39,8 +39,6 @@
 
 void cputobsdlabel(struct disklabel *lp, struct mvmedisklabel *clp);
 
-int errno;
-
 struct bugsc_softc {
 	int	fd;	/* Prom file descriptor */
 	int	poff;	/* Partition offset */
diff --git a/sys/arch/mvme88k/stand/netboot/Makefile b/sys/arch/mvme88k/stand/netboot/Makefile
index 210a70ae48b..49ac0a5a259 100644
--- a/sys/arch/mvme88k/stand/netboot/Makefile
+++ b/sys/arch/mvme88k/stand/netboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.18 2013/01/05 11:20:56 miod Exp $
+#	$OpenBSD: Makefile,v 1.19 2013/01/16 20:45:09 miod Exp $
 
 SIZE?=	size
 STRIP?= strip
@@ -22,6 +22,7 @@ SRCS+=	if_ie.c
 OBJS=  ${SRCS:S/.c/.o/g}
 LIBS= ${LIBSA} ${LIBBUG} ${LIBZ}
 LDFLAGS=-N -T ${S}/arch/mvme88k/stand/ld.script -Ttext ${STAGE2_RELOC}
+LDFLAGS+= -warn-common
 NOPIE=
 
 all:	netboot.bin
diff --git a/sys/arch/mvme88k/stand/netboot/dev_net.c b/sys/arch/mvme88k/stand/netboot/dev_net.c
index fc2922a293b..8f4958d46ad 100644
--- a/sys/arch/mvme88k/stand/netboot/dev_net.c
+++ b/sys/arch/mvme88k/stand/netboot/dev_net.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev_net.c,v 1.4 2006/05/16 22:52:09 miod Exp $ */
+/*	$OpenBSD: dev_net.c,v 1.5 2013/01/16 20:45:09 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -67,9 +67,6 @@
 
 extern int nfs_root_node[];	/* XXX - get from nfs_mount() */
 
-struct in_addr myip, rootip, gateip, mask;
-char rootpath[FNAME_SIZE];
-
 int netdev_sock = -1;
 static int open_count;
 
@@ -168,8 +165,10 @@ net_mountroot(f, devname)
 	printf("myip: %s (%s)", hostname, intoa(myip));
 	if (gateip)
 		printf(", gateip: %s", intoa(gateip));
+#if 0
 	if (mask)
 		printf(", mask: %s", intoa(mask));
+#endif
 	printf("\n");
 
 #endif
diff --git a/sys/arch/mvme88k/stand/tftpboot/Makefile b/sys/arch/mvme88k/stand/tftpboot/Makefile
index 1ddfcebd7b2..f4b11d2b815 100644
--- a/sys/arch/mvme88k/stand/tftpboot/Makefile
+++ b/sys/arch/mvme88k/stand/tftpboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2013/01/05 11:20:56 miod Exp $
+#	$OpenBSD: Makefile,v 1.8 2013/01/16 20:45:09 miod Exp $
 
 SIZE?=	size
 STRIP?= strip
@@ -20,6 +20,7 @@ SRCS=   boot.c conf.c version.c tftpfs.c netdev.c
 OBJS=  ${SRCS:S/.c/.o/g}
 LIBS= ${LIBSA} ${LIBBUG} ${LIBZ}
 LDFLAGS=-N -T ${S}/arch/mvme88k/stand/ld.script -Ttext ${STAGE2_RELOC}
+LDFLAGS+= -warn-common
 NOPIE=
 
 all:	tftpboot.bin