Nuke all commons but one, and enable --warn-common in LINKFLAGS.

7 files changed, 12 insertions, 14 deletions

diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index f43ca12101b..6f61d92eaa4 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.i386,v 1.44 2006/07/27 05:58:11 miod Exp $
+#	$OpenBSD: Makefile.i386,v 1.45 2006/11/29 22:40:11 miod Exp $
 
 # Makefile for OpenBSD
 #
@@ -52,7 +52,7 @@ CMACHFLAGS+=	-fno-builtin-printf -fno-builtin-log
 COPTS?=		-O2
 CFLAGS=		${DEBUG} ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE}
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
-LINKFLAGS=	-Ttext 0xD0200120 -e start -N
+LINKFLAGS=	-Ttext 0xD0200120 -e start -N --warn-common
 STRIPFLAGS=	-g -X -x
 
 HOSTCC= ${CC}
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c
index d46ef4f0e33..59b314022b5 100644
--- a/sys/arch/i386/i386/autoconf.c
+++ b/sys/arch/i386/i386/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.68 2006/11/29 19:31:37 kettenis Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.69 2006/11/29 22:40:13 miod Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $	*/
 
 /*-
@@ -240,7 +240,6 @@ findblkname(int maj)
 
 dev_t	argdev = NODEV;
 int	nswap;
-long	dumplo;
 
 /*
  * Attempt to find the device from which we were booted.
diff --git a/sys/arch/i386/i386/db_interface.c b/sys/arch/i386/i386/db_interface.c
index 23e175a6ca2..4119ff4a0b4 100644
--- a/sys/arch/i386/i386/db_interface.c
+++ b/sys/arch/i386/i386/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.22 2006/10/24 19:03:10 marco Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.23 2006/11/29 22:40:13 miod Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.22 1996/05/03 19:42:00 christos Exp $	*/
 
 /*
@@ -67,6 +67,7 @@ boolean_t	 db_switch_cpu;
 long		 db_switch_to_cpu;
 #endif
 
+db_regs_t	ddb_regs;
 int	db_active = 0;
 
 void kdbprinttrap(int, int);
diff --git a/sys/arch/i386/i386/pmapae.c b/sys/arch/i386/i386/pmapae.c
index 7e5bbb0bf41..5e0b97f241c 100644
--- a/sys/arch/i386/i386/pmapae.c
+++ b/sys/arch/i386/i386/pmapae.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmapae.c,v 1.5 2006/08/25 13:04:16 mickey Exp $	*/
+/*	$OpenBSD: pmapae.c,v 1.6 2006/11/29 22:40:13 miod Exp $	*/
 
 /*
  * Copyright (c) 2006 Michael Shalayeff
@@ -440,9 +440,6 @@
  * locking data structures
  */
 
-struct simplelock pvalloc_lock;
-struct simplelock pmaps_lock;
-
 #if defined(MULTIPROCESSOR) && 0
 
 extern struct lock pmap_main_lock;
diff --git a/sys/arch/i386/include/db_machdep.h b/sys/arch/i386/include/db_machdep.h
index 72aa400bd90..26679bb1493 100644
--- a/sys/arch/i386/include/db_machdep.h
+++ b/sys/arch/i386/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.16 2006/03/15 15:50:41 mickey Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.17 2006/11/29 22:40:13 miod Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.9 1996/05/03 19:23:59 christos Exp $	*/
 
 /* 
@@ -42,7 +42,7 @@ typedef	vaddr_t		db_addr_t;	/* address - unsigned */
 typedef	long		db_expr_t;	/* expression - signed */
 
 typedef struct trapframe db_regs_t;
-db_regs_t	ddb_regs;	/* register state */
+extern db_regs_t	ddb_regs;	/* register state */
 #define	DDB_REGS	(&ddb_regs)
 
 #define	PC_REGS(regs)	((db_addr_t)(regs)->tf_eip)
diff --git a/sys/arch/i386/pci/pcibios.c b/sys/arch/i386/pci/pcibios.c
index 438d3338d45..d58c361e319 100644
--- a/sys/arch/i386/pci/pcibios.c
+++ b/sys/arch/i386/pci/pcibios.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcibios.c,v 1.34 2006/09/19 11:06:34 jsg Exp $	*/
+/*	$OpenBSD: pcibios.c,v 1.35 2006/11/29 22:40:13 miod Exp $	*/
 /*	$NetBSD: pcibios.c,v 1.5 2000/08/01 05:23:59 uch Exp $	*/
 
 /*
@@ -107,6 +107,7 @@
 
 #include <machine/biosvar.h>
 
+int pcibios_flags;
 int pcibios_present;
 
 struct pcibios_pir_header pcibios_pir_header;
diff --git a/sys/arch/i386/pci/pcibiosvar.h b/sys/arch/i386/pci/pcibiosvar.h
index e0ec0d7bfee..10d5ef28454 100644
--- a/sys/arch/i386/pci/pcibiosvar.h
+++ b/sys/arch/i386/pci/pcibiosvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcibiosvar.h,v 1.15 2005/11/23 09:24:57 mickey Exp $	*/
+/*	$OpenBSD: pcibiosvar.h,v 1.16 2006/11/29 22:40:13 miod Exp $	*/
 /*	$NetBSD: pcibios.h,v 1.2 2000/04/28 17:15:16 uch Exp $	*/
 
 /*
@@ -111,7 +111,7 @@ extern struct pcibios_pir_header pcibios_pir_header;
 extern struct pcibios_intr_routing *pcibios_pir_table;
 extern int pcibios_pir_table_nentries;
 
-int pcibios_flags;
+extern int pcibios_flags;
 
 typedef void *pciintr_icu_handle_t;