From dd37f28b234eee7c3a67b4f72fe42618529312a2 Mon Sep 17 00:00:00 2001
From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Thu, 3 Feb 2005 11:20:31 +0000
Subject: [PATCH] GCC 1.x is dead.

---
 sys/cpu/i386/include/cpufunc.h | 11 +----------
 sys/cpu/i386/include/varargs.h |  6 ++----
 sys/i386/include/cpufunc.h     | 11 +----------
 sys/i386/include/varargs.h     |  6 ++----
 4 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/sys/cpu/i386/include/cpufunc.h b/sys/cpu/i386/include/cpufunc.h
index d1937b5364..58a4aea5d8 100644
--- a/sys/cpu/i386/include/cpufunc.h
+++ b/sys/cpu/i386/include/cpufunc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.96.2.3 2002/04/28 22:50:54 dwmalone Exp $
- * $DragonFly: src/sys/cpu/i386/include/cpufunc.h,v 1.8 2004/02/17 19:38:53 dillon Exp $
+ * $DragonFly: src/sys/cpu/i386/include/cpufunc.h,v 1.9 2005/02/03 11:20:31 joerg Exp $
  */
 
 /*
@@ -176,13 +176,6 @@ fls(int mask)
 	return (mask == 0 ? mask : bsrl((u_int)mask) + 1);
 }
 
-#if __GNUC__ < 2
-
-#define	inb(port)		inbv(port)
-#define	outb(port, data)	outbv(port, data)
-
-#else /* __GNUC >= 2 */
-
 /*
  * The following complications are to get around gcc not having a
  * constraint letter for the range 0..255.  We still put "d" in the
@@ -228,8 +221,6 @@ outbc(u_int port, u_char data)
 	__asm __volatile("outb %0,%1" : : "a" (data), "id" ((u_short)(port)));
 }
 
-#endif /* __GNUC <= 2 */
-
 static __inline u_char
 inbv(u_int port)
 {
diff --git a/sys/cpu/i386/include/varargs.h b/sys/cpu/i386/include/varargs.h
index 25d53b3b54..7580243b48 100644
--- a/sys/cpu/i386/include/varargs.h
+++ b/sys/cpu/i386/include/varargs.h
@@ -37,7 +37,7 @@
  *
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
  * $FreeBSD: src/sys/i386/include/varargs.h,v 1.8 1999/08/28 00:44:27 peter Exp $
- * $DragonFly: src/sys/cpu/i386/include/varargs.h,v 1.2 2003/06/17 04:28:36 dillon Exp $
+ * $DragonFly: src/sys/cpu/i386/include/varargs.h,v 1.3 2005/02/03 11:20:31 joerg Exp $
  */
 
 #ifndef _VARARGS_H_
@@ -50,11 +50,9 @@ typedef char *va_list;
 
 #ifdef __GNUC__
 #define	va_alist	__builtin_va_alist
-#endif
-#if __GNUC__ > 1
 #define	va_dcl	int va_alist; ...
 #else
-#define	va_dcl	int va_alist; 
+#define	va_dcl	int va_alist;
 #endif
 
 #define	va_start(ap) \
diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h
index bbf2a2fc46..59ccea62eb 100644
--- a/sys/i386/include/cpufunc.h
+++ b/sys/i386/include/cpufunc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.96.2.3 2002/04/28 22:50:54 dwmalone Exp $
- * $DragonFly: src/sys/i386/include/Attic/cpufunc.h,v 1.8 2004/02/17 19:38:53 dillon Exp $
+ * $DragonFly: src/sys/i386/include/Attic/cpufunc.h,v 1.9 2005/02/03 11:20:31 joerg Exp $
  */
 
 /*
@@ -176,13 +176,6 @@ fls(int mask)
 	return (mask == 0 ? mask : bsrl((u_int)mask) + 1);
 }
 
-#if __GNUC__ < 2
-
-#define	inb(port)		inbv(port)
-#define	outb(port, data)	outbv(port, data)
-
-#else /* __GNUC >= 2 */
-
 /*
  * The following complications are to get around gcc not having a
  * constraint letter for the range 0..255.  We still put "d" in the
@@ -228,8 +221,6 @@ outbc(u_int port, u_char data)
 	__asm __volatile("outb %0,%1" : : "a" (data), "id" ((u_short)(port)));
 }
 
-#endif /* __GNUC <= 2 */
-
 static __inline u_char
 inbv(u_int port)
 {
diff --git a/sys/i386/include/varargs.h b/sys/i386/include/varargs.h
index 04ac327937..a6272af0cb 100644
--- a/sys/i386/include/varargs.h
+++ b/sys/i386/include/varargs.h
@@ -37,7 +37,7 @@
  *
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
  * $FreeBSD: src/sys/i386/include/varargs.h,v 1.8 1999/08/28 00:44:27 peter Exp $
- * $DragonFly: src/sys/i386/include/Attic/varargs.h,v 1.2 2003/06/17 04:28:36 dillon Exp $
+ * $DragonFly: src/sys/i386/include/Attic/varargs.h,v 1.3 2005/02/03 11:20:31 joerg Exp $
  */
 
 #ifndef _VARARGS_H_
@@ -50,11 +50,9 @@ typedef char *va_list;
 
 #ifdef __GNUC__
 #define	va_alist	__builtin_va_alist
-#endif
-#if __GNUC__ > 1
 #define	va_dcl	int va_alist; ...
 #else
-#define	va_dcl	int va_alist; 
+#define	va_dcl	int va_alist;
 #endif
 
 #define	va_start(ap) \
-- 
2.41.0