From 804b63110cf89e0a05ebdc071b20eb007a407fb6 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Mon, 16 Feb 2004 20:48:35 +0000
Subject: [PATCH] Remove duplicate declarations for -fno-common

---
 sys/conf/files.i386           | 9 +++++----
 sys/emulation/svr4/Makefile   | 4 ++--
 sys/net/i4b/layer3/i4b_q931.c | 3 +--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index eced46313f..d7de0f8cda 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -2,21 +2,21 @@
 # files marked standard are always included.
 #
 # $FreeBSD: src/sys/conf/files.i386,v 1.307.2.38 2003/01/02 20:41:33 kan Exp $
-# $DragonFly: src/sys/conf/Attic/files.i386,v 1.14 2004/02/16 19:57:39 dillon Exp $
+# $DragonFly: src/sys/conf/Attic/files.i386,v 1.15 2004/02/16 20:48:34 dillon Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
 # dependency lines other than the first are silently ignored.
 #
 linux_genassym.o		optional	compat_linux		   \
-	dependency 	"$S/emulation/linux/i386/linux_genassym.c"		   \
+	dependency 	"$S/emulation/linux/i386/linux_genassym.c"	   \
 	compile-with	"${CC} ${CFLAGS:N-fno-common} -c ${.IMPSRC}"	   \
 	no-obj no-implicit-rule						   \
 	clean		"linux_genassym.o"
 #
 svr4_genassym.o			optional	compat_svr4		   \
-	dependency 	"$S/emulation/svr4/i386/svr4_genassym.c"			   \
-	compile-with	"${CC} ${CFLAGS:N-fno-commmon} -c ${.IMPSRC}"	   \
+	dependency 	"$S/emulation/svr4/i386/svr4_genassym.c"	   \
+	compile-with	"${CC} ${CFLAGS:N-fno-common} -c ${.IMPSRC}"	   \
 	no-obj no-implicit-rule						   \
 	clean		"svr4_genassym.o"
 #
@@ -213,6 +213,7 @@ i386/i386/nexus.c		standard
 i386/i386/perfmon.c		optional	perfmon
 i386/i386/perfmon.c		optional	perfmon	profiling-routine
 i386/i386/pmap.c		standard
+i386/i386/pmap_inval.c		standard
 i386/i386/procfs_machdep.c	standard
 i386/i386/spinlock.s		standard
 i386/i386/support.s		standard
diff --git a/sys/emulation/svr4/Makefile b/sys/emulation/svr4/Makefile
index 63573423d9..2cb7320455 100644
--- a/sys/emulation/svr4/Makefile
+++ b/sys/emulation/svr4/Makefile
@@ -1,7 +1,7 @@
 # Makefile for syscall tables
 #
 # $FreeBSD: src/sys/svr4/Makefile,v 1.3 1999/09/01 00:32:18 newton Exp $
-# $DragonFly: src/sys/emulation/svr4/Attic/Makefile,v 1.7 2003/08/22 17:36:34 dillon Exp $
+# $DragonFly: src/sys/emulation/svr4/Attic/Makefile,v 1.8 2004/02/16 20:48:35 dillon Exp $
 
 # This builds the module
 #
@@ -42,7 +42,7 @@ svr4_locore.o:	svr4_locore.s svr4_assym.h
 		${.IMPSRC} -o ${.TARGET}
 
 svr4_genassym.o:	svr4_genassym.c svr4.h @ machine ${ARCH}
-	${CC} -c ${CFLAGS} ${.IMPSRC}
+	${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC}
 
 afterinstall:
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/sys/net/i4b/layer3/i4b_q931.c b/sys/net/i4b/layer3/i4b_q931.c
index 4ce3114cea..4002d3264f 100644
--- a/sys/net/i4b/layer3/i4b_q931.c
+++ b/sys/net/i4b/layer3/i4b_q931.c
@@ -30,7 +30,7 @@
  *	$Id: i4b_q931.c,v 1.32 2000/08/24 11:48:58 hm Exp $ 
  *
  * $FreeBSD: src/sys/i4b/layer3/i4b_q931.c,v 1.6.2.1 2001/08/10 14:08:42 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer3/i4b_q931.c,v 1.4 2004/02/13 17:45:50 joerg Exp $
+ * $DragonFly: src/sys/net/i4b/layer3/i4b_q931.c,v 1.5 2004/02/16 20:48:33 dillon Exp $
  *
  *      last edit-date: [Mon May 29 16:56:52 2000]
  *
@@ -78,7 +78,6 @@
 
 unsigned int i4b_l3_debug = L3_DEBUG_DEFAULT;
 
-call_desc_t call_desc[N_CALL_DESC];	/* call descriptor array */
 ctrl_desc_t ctrl_desc[MAX_CONTROLLERS];	/* controller description array */
 int utoc_tab[MAX_CONTROLLERS];		/* unit to controller conversion */
 
-- 
2.41.0