Anonymous avatar Anonymous committed 92354e9

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

Comments (0)

Files changed (7)

sys/arch/mvme88k/stand/bootsd/Makefile

 #	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=
 	-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
 

sys/arch/mvme88k/stand/bootst/Makefile

 #	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
 
 	-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
 

sys/arch/mvme88k/stand/bootxx/Makefile

 #	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}
 	-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
 

sys/arch/mvme88k/stand/libsa/bugdev.c

-/*	$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
 
 void cputobsdlabel(struct disklabel *lp, struct mvmedisklabel *clp);
 
-int errno;
-
 struct bugsc_softc {
 	int	fd;	/* Prom file descriptor */
 	int	poff;	/* Partition offset */

sys/arch/mvme88k/stand/netboot/Makefile

-#	$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
 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

sys/arch/mvme88k/stand/netboot/dev_net.c

-/*	$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
 
 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;
 
 	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

sys/arch/mvme88k/stand/tftpboot/Makefile

-#	$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
 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
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.