reorg pcc tree; requested by and ok deraadt@; ok ragge@

92 files changed, 224 insertions, 502 deletions

diff --git a/usr.bin/pcc/Makefile b/usr.bin/pcc/Makefile
index f81ed5ecfb3..305d39fb10c 100644
--- a/usr.bin/pcc/Makefile
+++ b/usr.bin/pcc/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.2 2007/09/15 21:48:06 ray Exp $
+#	$OpenBSD: Makefile,v 1.3 2007/10/07 17:58:50 otto Exp $
 #
 # Makefile.in for top-level of pcc.
 #
-SUBDIR=cc
+SUBDIR=cc cpp ccom
 
 .include <bsd.subdir.mk>
diff --git a/usr.bin/pcc/cc/Makefile b/usr.bin/pcc/cc/Makefile
index dda4affea45..2626ba970ae 100644
--- a/usr.bin/pcc/cc/Makefile
+++ b/usr.bin/pcc/cc/Makefile
@@ -1,7 +1,16 @@
-#	$OpenBSD: Makefile,v 1.2 2007/09/15 21:48:06 ray Exp $
+#	$OpenBSD: Makefile,v 1.3 2007/10/07 17:58:50 otto Exp $
 #
-# Makefile for top-level of pcc/cc.
+# Makefile for the cc part of pcc.
 #
-SUBDIR=cc ccom cpp
+PROG=   	cc
+PREFIX=		/usr/local
+BINDIR=		${PREFIX}/bin
+MANDIR=		${PREFIX}/man/man
+TARGOS=		openbsd
+TARGMACH=	x86
 
-.include <bsd.subdir.mk>
+CFLAGS+=	-DLIBEXECDIR=\"${PREFIX}/libexec\"
+CPPFLAGS+=	-I${.CURDIR}/..
+CPPFLAGS+=	-DDEFMACH=\"${TARGMACH}\"
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/pcc/cc/cc/cc.1 b/usr.bin/pcc/cc/cc.1
index be1d0e88169..e8ec6394f2e 100644
--- a/usr.bin/pcc/cc/cc/cc.1
+++ b/usr.bin/pcc/cc/cc.1
@@ -1,6 +1,6 @@
-.\"	$Id: cc.1,v 1.5 2007/10/03 08:05:03 otto Exp $
+.\"	$Id: cc.1,v 1.1 2007/10/07 17:58:50 otto Exp $
 .\"	$NetBSD$
-.\"	$OpenBSD: cc.1,v 1.5 2007/10/03 08:05:03 otto Exp $
+.\"	$OpenBSD: cc.1,v 1.1 2007/10/07 17:58:50 otto Exp $
 ."\
 .\" Copyright (c) 2007 Jeremy C. Reed <reed@reedmedia.net>
 .\" 
diff --git a/usr.bin/pcc/cc/cc/cc.c b/usr.bin/pcc/cc/cc.c
index 9318b9cb16a..f931b8b9ee8 100644
--- a/usr.bin/pcc/cc/cc/cc.c
+++ b/usr.bin/pcc/cc/cc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cc.c,v 1.18 2007/10/04 07:05:01 gilles Exp $	*/
+/*	$OpenBSD: cc.c,v 1.1 2007/10/07 17:58:50 otto Exp $	*/
 /*
  * Copyright(C) Caldera International Inc. 2001-2002. All rights reserved.
  *
@@ -61,7 +61,7 @@
 #include <libgen.h>
 #include <errno.h>
 
-#include "../../config.h"
+#include "../config.h"
 
 #include "ccconfig.h"
 /* C command */
diff --git a/usr.bin/pcc/cc/cc/Makefile b/usr.bin/pcc/cc/cc/Makefile
deleted file mode 100644
index 5d708a88b80..00000000000
--- a/usr.bin/pcc/cc/cc/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#	$OpenBSD: Makefile,v 1.5 2007/09/19 15:21:07 todd Exp $
-#
-# Makefile for the cc part of pcc.
-#
-PROG=   	cc
-PREFIX=		/usr/local
-BINDIR=		${PREFIX}/bin
-MANDIR=		${PREFIX}/man/man
-TARGOS=		openbsd
-TARGMACH=	x86
-
-CFLAGS+=	-DLIBEXECDIR=\"${PREFIX}/libexec\"
-CPPFLAGS+=	-I${.CURDIR}/../.. -I${.CURDIR}/../../os/${TARGOS}
-CPPFLAGS+=	-DDEFMACH=\"${TARGMACH}\"
-
-.include <bsd.prog.mk>
diff --git a/usr.bin/pcc/cc/cpp/tests/res1 b/usr.bin/pcc/cc/cpp/tests/res1
deleted file mode 100644
index c0bb48019f3..00000000000
--- a/usr.bin/pcc/cc/cpp/tests/res1
+++ /dev/null
@@ -1,7 +0,0 @@
-# 1 "<stdin>"
-
-
-
-
-char p[] = "x ## y";	 
-			 
diff --git a/usr.bin/pcc/cc/cpp/tests/res2 b/usr.bin/pcc/cc/cpp/tests/res2
deleted file mode 100644
index 1eb808aac47..00000000000
--- a/usr.bin/pcc/cc/cpp/tests/res2
+++ /dev/null
@@ -1,26 +0,0 @@
-# 1 "<stdin>"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-f(2 * (y+1)) + f(2 * (f(2 * (z[0])))) % f(2 * (0)) + t (1);
-f(2 * (2+(3,4)-0,1)) | f(2 * (~ 5)) & 
-f(2 * (0,1))^m (0,1);
-int i[] = { 1, 23, 4, 5,  };
-char c[2][6] = { "hello", "" };
-
-
-
-
-
- 
diff --git a/usr.bin/pcc/cc/cpp/tests/res3 b/usr.bin/pcc/cc/cpp/tests/res3
deleted file mode 100644
index 4219319ddff..00000000000
--- a/usr.bin/pcc/cc/cpp/tests/res3
+++ /dev/null
@@ -1,16 +0,0 @@
-# 1 "<stdin>"
-
-
-
-
-
-
-
-
-
-printf("x" "1" "= %d, x" "2" "= %s", 	x1, x2);
-fputs( 
-"strncmp(\"abc\\0d\", \"abc\", '\\4') == 0" ": @\n", s);
-\#include "vers2.h"
-"hello";
-"hello" ", world"
diff --git a/usr.bin/pcc/cc/cpp/tests/res4 b/usr.bin/pcc/cc/cpp/tests/res4
deleted file mode 100644
index d7046a01507..00000000000
--- a/usr.bin/pcc/cc/cpp/tests/res4
+++ /dev/null
@@ -1,5 +0,0 @@
-# 1 "<stdin>"
-
-
-
-(1)
diff --git a/usr.bin/pcc/cc/cpp/tests/res5 b/usr.bin/pcc/cc/cpp/tests/res5
deleted file mode 100644
index 291405dcfee..00000000000
--- a/usr.bin/pcc/cc/cpp/tests/res5
+++ /dev/null
@@ -1,4 +0,0 @@
-# 1 "<stdin>"
-
-int j[] = { 123, 45, 67, 89,
-	10, 11, 12,  };
diff --git a/usr.bin/pcc/cc/cpp/tests/res6 b/usr.bin/pcc/cc/cpp/tests/res6
deleted file mode 100644
index 0bb0f9a1dbf..00000000000
--- a/usr.bin/pcc/cc/cpp/tests/res6
+++ /dev/null
@@ -1,6 +0,0 @@
-# 1 "<stdin>"
-
-
-
-
-foo
diff --git a/usr.bin/pcc/cc/cpp/tests/res7 b/usr.bin/pcc/cc/cpp/tests/res7
deleted file mode 100644
index 18c492bda72..00000000000
--- a/usr.bin/pcc/cc/cpp/tests/res7
+++ /dev/null
@@ -1,5 +0,0 @@
-# 1 "<stdin>"
-
-
-
-a YES
diff --git a/usr.bin/pcc/cc/cpp/tests/res8 b/usr.bin/pcc/cc/cpp/tests/res8
deleted file mode 100644
index e7de0945f47..00000000000
--- a/usr.bin/pcc/cc/cpp/tests/res8
+++ /dev/null
@@ -1,8 +0,0 @@
-# 1 "<stdin>"
- 
-
-
-
- 
-(hej.s_s.s_pos)
-
diff --git a/usr.bin/pcc/cc/cpp/tests/res9 b/usr.bin/pcc/cc/cpp/tests/res9
deleted file mode 100644
index aea239fc9aa..00000000000
--- a/usr.bin/pcc/cc/cpp/tests/res9
+++ /dev/null
@@ -1,5 +0,0 @@
-# 1 "<stdin>"
-
-
-
-ao
diff --git a/usr.bin/pcc/cc/cpp/tests/test1 b/usr.bin/pcc/cc/cpp/tests/test1
deleted file mode 100644
index 79a3c5dc5d4..00000000000
--- a/usr.bin/pcc/cc/cpp/tests/test1
+++ /dev/null
@@ -1,6 +0,0 @@
-#define hash_hash # ## #
-#define mkstr(a) # a
-#define in_between(a) mkstr(a)
-#define join(c, d) in_between(c hash_hash d)
-char p[] = join(x, y);	// equivalent to
-			// char p[] = "x ## y";
diff --git a/usr.bin/pcc/cc/cpp/tests/test2 b/usr.bin/pcc/cc/cpp/tests/test2
deleted file mode 100644
index 283d4fbc1f0..00000000000
--- a/usr.bin/pcc/cc/cpp/tests/test2
+++ /dev/null
@@ -1,25 +0,0 @@
-#define x 3
-#define f(a) f(x * (a))
-#undef x
-#define x 2
-#define g f
-#define z z[0]
-#define h g(~
-#define m(a) a(w)
-#define w 0,1
-#define t(a) a
-#define p() int
-#define q(x) x
-#define r(x,y) x ## y
-#define str(x) # x
-f(y+1) + f(f(z)) % t(t(g)(0) + t)(1);
-g(x+(3,4)-w) | h 5) & m
-(f)^m(m);
-p() i[q()] = { q(1), r(2,3), r(4,), r(,5), r(,) };
-char c[2][6] = { str(hello), str() };
-/*
- * f(2 * (y+1)) + f(2 * (f(2 * (z[0])))) % f(2 * (0)) + t(1);
- * f(2 * (2+(3,4)-0,1)) | f(2 * (~ 5)) & f(2 * (0,1))^m(0,1);
- * int i[] = { 1, 23, 4, 5, };
- * char c[2][6] = { "hello", "" };
- */
diff --git a/usr.bin/pcc/cc/cpp/tests/test3 b/usr.bin/pcc/cc/cpp/tests/test3
deleted file mode 100644
index a659245ecbc..00000000000
--- a/usr.bin/pcc/cc/cpp/tests/test3
+++ /dev/null
@@ -1,15 +0,0 @@
-#define str(s) # s
-#define xstr(s) str(s)
-#define debug(s, t) printf("x" # s "= %d, x" # t "= %s", \
-	x ## s, x ## t)
-#define INCFILE(n) vers ## n
-#define glue(a, b) a ## b
-#define xglue(a, b) glue(a, b)
-#define HIGHLOW "hello"
-#define LOW LOW ", world"
-debug(1, 2);
-fputs(str(strncmp("abc\0d", "abc", '\4') // this goes away
-	== 0) str(: @\n), s);
-\#include xstr(INCFILE(2).h)
-glue(HIGH, LOW);
-xglue(HIGH, LOW)
diff --git a/usr.bin/pcc/cc/cpp/tests/test4 b/usr.bin/pcc/cc/cpp/tests/test4
deleted file mode 100644
index 0068f3751b8..00000000000
--- a/usr.bin/pcc/cc/cpp/tests/test4
+++ /dev/null
@@ -1,4 +0,0 @@
-#define foobar 1
-#define C(x,y) x##y
-#define D(x) (C(x,bar))
-D(foo)
diff --git a/usr.bin/pcc/cc/cpp/tests/test5 b/usr.bin/pcc/cc/cpp/tests/test5
deleted file mode 100644
index 3ca0bb6c9c0..00000000000
--- a/usr.bin/pcc/cc/cpp/tests/test5
+++ /dev/null
@@ -1,3 +0,0 @@
-#define t(x,y,z) x ## y ## z
-int j[] = { t(1,2,3), t(,4,5), t(6,,7), t(8,9,),
-	t(10,,), t(,11,), t(,,12), t(,,) };
diff --git a/usr.bin/pcc/cc/cpp/tests/test6 b/usr.bin/pcc/cc/cpp/tests/test6
deleted file mode 100644
index 28cfddece68..00000000000
--- a/usr.bin/pcc/cc/cpp/tests/test6
+++ /dev/null
@@ -1,5 +0,0 @@
-#define X(a,b, \
-	c,d) \
-	foo
-
-X(1,2,3,4)
diff --git a/usr.bin/pcc/cc/cpp/tests/test7 b/usr.bin/pcc/cc/cpp/tests/test7
deleted file mode 100644
index b22b22bbcc9..00000000000
--- a/usr.bin/pcc/cc/cpp/tests/test7
+++ /dev/null
@@ -1,4 +0,0 @@
-#define a() YES
-#define b() a
-b()
-b()()
diff --git a/usr.bin/pcc/cc/cpp/tests/test8 b/usr.bin/pcc/cc/cpp/tests/test8
deleted file mode 100644
index c5d2f9a1449..00000000000
--- a/usr.bin/pcc/cc/cpp/tests/test8
+++ /dev/null
@@ -1,7 +0,0 @@
-// test macro expansion in arguments
-#define s_pos              s_s.s_pos
-#define foo(x) (x)
-
-//hej.s_pos
-foo(hej.s_pos)
-
diff --git a/usr.bin/pcc/cc/cpp/tests/test9 b/usr.bin/pcc/cc/cpp/tests/test9
deleted file mode 100644
index 4d4368d5663..00000000000
--- a/usr.bin/pcc/cc/cpp/tests/test9
+++ /dev/null
@@ -1,4 +0,0 @@
-#define C(a,b,c) a##b##c
-#define N(x,y) C(x,_,y)
-#define A_O ao
-N(A,O)
diff --git a/usr.bin/pcc/os/openbsd/ccconfig.h b/usr.bin/pcc/ccconfig.h
index cb45c11bfe5..4b86e2185ef 100644
--- a/usr.bin/pcc/os/openbsd/ccconfig.h
+++ b/usr.bin/pcc/ccconfig.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccconfig.h,v 1.3 2007/09/19 15:21:07 todd Exp $	*/
+/*	$OpenBSD: ccconfig.h,v 1.1 2007/10/07 17:58:50 otto Exp $	*/
 
 /*
  * Copyright (c) 2004 Anders Magnusson (ragge@ludd.luth.se).
diff --git a/usr.bin/pcc/cc/ccom/Makefile b/usr.bin/pcc/ccom/Makefile
index d5dd831b8ff..52406f7ac61 100644
--- a/usr.bin/pcc/cc/ccom/Makefile
+++ b/usr.bin/pcc/ccom/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2007/09/19 15:21:07 todd Exp $
+#	$OpenBSD: Makefile,v 1.1 2007/10/07 17:58:51 otto Exp $
 #
 # Makefile for the ccom part of pcc.
 #
diff --git a/usr.bin/pcc/cc/ccom/Makefile.inc b/usr.bin/pcc/ccom/Makefile.inc
index 6d329262345..c08dff221d9 100644
--- a/usr.bin/pcc/cc/ccom/Makefile.inc
+++ b/usr.bin/pcc/ccom/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2007/09/19 15:21:07 todd Exp $
+#	$OpenBSD: Makefile.inc,v 1.1 2007/10/07 17:58:51 otto Exp $
 #
 # Makefile for the ccom part of pcc.
 #
@@ -15,12 +15,12 @@ CLEANFILES=	external.h external.c mkext
 CFLAGS+=	-DPCC_DEBUG -DGCC_COMPAT
 CFLAGS+=	-Wall -Wmissing-prototypes -Wstrict-prototypes -Werror
 CFLAGS+=	-DLIBEXECDIR=\"${PREFIX}/libexec\"
-CPPFLAGS+=	-I. -I${.CURDIR}/.. -I${.CURDIR} -I${.CURDIR}/../../../mip
-CPPFLAGS+=	-I${.CURDIR}/../../../arch/${TARGMACH}
-CPPFLAGS+=	-I${.CURDIR}/../../../os/${TARGOS}
+CPPFLAGS+=	-I. -I${.CURDIR}/.. -I${.CURDIR} -I${.CURDIR}/../../mip
+CPPFLAGS+=	-I${.CURDIR}/../../${TARGMACH}
+CPPFLAGS+=	-I${.CURDIR}/../..
 
-.PATH:	${.CURDIR}/../../../arch/${TARGMACH}
-.PATH:	${.CURDIR}/../../../mip
+.PATH:	${.CURDIR}/../../${TARGMACH}
+.PATH:	${.CURDIR}/../../mip
 .PATH:	${.CURDIR}/..
 
 SRCS=optim.c pftn.c scan.l trees.c cgram.y inline.c symtabs.c \
@@ -34,9 +34,9 @@ cgram.c: cgram.y
 
 mkext: mkext.c table.c common.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) -DMKEXT -o mkext 		\
-		${.CURDIR}/../../../mip/mkext.c			\
-		${.CURDIR}/../../../arch/${TARGMACH}/table.c	\
-		${.CURDIR}/../../../mip/common.c
+		${.CURDIR}/../../mip/mkext.c			\
+		${.CURDIR}/../../${TARGMACH}/table.c		\
+		${.CURDIR}/../../mip/common.c
 
 external.h external.c: mkext
 	./mkext
diff --git a/usr.bin/pcc/cc/ccom/ccom.1 b/usr.bin/pcc/ccom/ccom.1
index ec9a26b63f5..2ad56676fab 100644
--- a/usr.bin/pcc/cc/ccom/ccom.1
+++ b/usr.bin/pcc/ccom/ccom.1
@@ -1,6 +1,6 @@
-.\"	$Id: ccom.1,v 1.4 2007/10/03 08:05:04 otto Exp $
+.\"	$Id: ccom.1,v 1.1 2007/10/07 17:58:51 otto Exp $
 .\"	$NetBSD$
-.\"	$OpenBSD: ccom.1,v 1.4 2007/10/03 08:05:04 otto Exp $
+.\"	$OpenBSD: ccom.1,v 1.1 2007/10/07 17:58:51 otto Exp $
 ."\
 .\" Copyright (c) 2007 Jeremy C. Reed <reed@reedmedia.net>
 .\" Permission to use, copy, modify, and/or distribute this software for any 
diff --git a/usr.bin/pcc/cc/ccom/cgram.y b/usr.bin/pcc/ccom/cgram.y
index afbfe033b07..d77193c2c8e 100644
--- a/usr.bin/pcc/cc/ccom/cgram.y
+++ b/usr.bin/pcc/ccom/cgram.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgram.y,v 1.3 2007/10/01 18:51:57 otto Exp $	*/
+/*	$OpenBSD: cgram.y,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
diff --git a/usr.bin/pcc/cc/ccom/gcc_compat.c b/usr.bin/pcc/ccom/gcc_compat.c
index 29a8cfabdd9..9761d814927 100644
--- a/usr.bin/pcc/cc/ccom/gcc_compat.c
+++ b/usr.bin/pcc/ccom/gcc_compat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gcc_compat.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: gcc_compat.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2004 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/cc/ccom/init.c b/usr.bin/pcc/ccom/init.c
index ec721195479..47331d2c82a 100644
--- a/usr.bin/pcc/cc/ccom/init.c
+++ b/usr.bin/pcc/ccom/init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init.c,v 1.9 2007/10/05 12:48:29 otto Exp $	*/
+/*	$OpenBSD: init.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 
 /*
  * Copyright (c) 2004, 2007 Anders Magnusson (ragge@ludd.ltu.se).
diff --git a/usr.bin/pcc/cc/ccom/inline.c b/usr.bin/pcc/ccom/inline.c
index 9d7b2eebc89..c9d0a829e58 100644
--- a/usr.bin/pcc/cc/ccom/inline.c
+++ b/usr.bin/pcc/ccom/inline.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inline.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: inline.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/cc/ccom/main.c b/usr.bin/pcc/ccom/main.c
index a4ae51d0e9e..fc4de8d774b 100644
--- a/usr.bin/pcc/cc/ccom/main.c
+++ b/usr.bin/pcc/ccom/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.4 2007/09/25 10:52:06 otto Exp $	*/
+/*	$OpenBSD: main.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 
 /*
  * Copyright (c) 2002 Anders Magnusson. All rights reserved.
diff --git a/usr.bin/pcc/cc/ccom/optim.c b/usr.bin/pcc/ccom/optim.c
index c06a5b94671..3acef181c7f 100644
--- a/usr.bin/pcc/cc/ccom/optim.c
+++ b/usr.bin/pcc/ccom/optim.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: optim.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: optim.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright(C) Caldera International Inc. 2001-2002. All rights reserved.
  *
diff --git a/usr.bin/pcc/cc/ccom/pass1.h b/usr.bin/pcc/ccom/pass1.h
index 247fa0e3cec..d93f51dbee0 100644
--- a/usr.bin/pcc/cc/ccom/pass1.h
+++ b/usr.bin/pcc/ccom/pass1.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pass1.h,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: pass1.h,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright(C) Caldera International Inc. 2001-2002. All rights reserved.
  *
diff --git a/usr.bin/pcc/cc/ccom/pftn.c b/usr.bin/pcc/ccom/pftn.c
index cc805df26a3..c8f4dd49e2e 100644
--- a/usr.bin/pcc/cc/ccom/pftn.c
+++ b/usr.bin/pcc/ccom/pftn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pftn.c,v 1.6 2007/10/01 18:51:57 otto Exp $	*/
+/*	$OpenBSD: pftn.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/cc/ccom/scan.l b/usr.bin/pcc/ccom/scan.l
index 45693712a74..93240ae4805 100644
--- a/usr.bin/pcc/cc/ccom/scan.l
+++ b/usr.bin/pcc/ccom/scan.l
@@ -1,5 +1,5 @@
 %{
-/*	$OpenBSD: scan.l,v 1.4 2007/09/20 13:39:39 otto Exp $	*/
+/*	$OpenBSD: scan.l,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 
 /*
  * Copyright (c) 2002 Anders Magnusson. All rights reserved.
diff --git a/usr.bin/pcc/cc/ccom/stabs.c b/usr.bin/pcc/ccom/stabs.c
index 19190bca8ba..58ead7d986a 100644
--- a/usr.bin/pcc/cc/ccom/stabs.c
+++ b/usr.bin/pcc/ccom/stabs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stabs.c,v 1.2 2007/09/15 22:04:39 ray Exp $	*/
+/*	$OpenBSD: stabs.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 
 /*
  * Copyright (c) 2004 Anders Magnusson (ragge@ludd.luth.se).
diff --git a/usr.bin/pcc/cc/ccom/symtabs.c b/usr.bin/pcc/ccom/symtabs.c
index 6ef6bab9999..97dd715375a 100644
--- a/usr.bin/pcc/cc/ccom/symtabs.c
+++ b/usr.bin/pcc/ccom/symtabs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: symtabs.c,v 1.2 2007/09/15 22:04:39 ray Exp $	*/
+/*	$OpenBSD: symtabs.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/cc/ccom/trees.c b/usr.bin/pcc/ccom/trees.c
index 88fd39b4a21..077d4b9d743 100644
--- a/usr.bin/pcc/cc/ccom/trees.c
+++ b/usr.bin/pcc/ccom/trees.c
@@ -1,4 +1,4 @@
-/*	$Id: trees.c,v 1.6 2007/10/06 14:34:45 ragge Exp $	*/
+/*	$Id: trees.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/cc/ccom/vax/Makefile b/usr.bin/pcc/ccom/vax/Makefile
index 5b10f3f479d..5b10f3f479d 100644
--- a/usr.bin/pcc/cc/ccom/vax/Makefile
+++ b/usr.bin/pcc/ccom/vax/Makefile
diff --git a/usr.bin/pcc/cc/ccom/x86/Makefile b/usr.bin/pcc/ccom/x86/Makefile
index 2049d325ec4..2049d325ec4 100644
--- a/usr.bin/pcc/cc/ccom/x86/Makefile
+++ b/usr.bin/pcc/ccom/x86/Makefile
diff --git a/usr.bin/pcc/cc/cpp/Makefile b/usr.bin/pcc/cpp/Makefile
index 467d45f1408..fac8e0fa27b 100644
--- a/usr.bin/pcc/cc/cpp/Makefile
+++ b/usr.bin/pcc/cpp/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2007/09/18 21:06:43 todd Exp $
+#	$OpenBSD: Makefile,v 1.1 2007/10/07 17:58:51 otto Exp $
 #
 # Makefile for the cpp part of pcc.
 #
diff --git a/usr.bin/pcc/cc/cpp/cpp.1 b/usr.bin/pcc/cpp/cpp.1
index 9aae1daef42..31ddb32db51 100644
--- a/usr.bin/pcc/cc/cpp/cpp.1
+++ b/usr.bin/pcc/cpp/cpp.1
@@ -1,6 +1,6 @@
-.\"	$Id: cpp.1,v 1.4 2007/10/03 08:05:04 otto Exp $
+.\"	$Id: cpp.1,v 1.1 2007/10/07 17:58:51 otto Exp $
 .\"	$NetBSD$
-.\"	$OpenBSD: cpp.1,v 1.4 2007/10/03 08:05:04 otto Exp $
+.\"	$OpenBSD: cpp.1,v 1.1 2007/10/07 17:58:51 otto Exp $
 ."\
 .\" Copyright (c) 2007 Jeremy C. Reed <reed@reedmedia.net>
 .\" 
diff --git a/usr.bin/pcc/cc/cpp/cpp.c b/usr.bin/pcc/cpp/cpp.c
index 8c05e3eb502..92fdc6cdd23 100644
--- a/usr.bin/pcc/cc/cpp/cpp.c
+++ b/usr.bin/pcc/cpp/cpp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpp.c,v 1.10 2007/09/26 12:46:47 otto Exp $	*/
+/*	$OpenBSD: cpp.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 
 /*
  * Copyright (c) 2004 Anders Magnusson (ragge@ludd.luth.se).
@@ -66,7 +66,7 @@
  * from V7 cpp, and at last ansi/c99 support.
  */
 
-#include "../../config.h"
+#include "../config.h"
 
 #include <sys/wait.h>
 
diff --git a/usr.bin/pcc/cc/cpp/cpp.h b/usr.bin/pcc/cpp/cpp.h
index 7b5aa6acb25..25eeaccf5c3 100644
--- a/usr.bin/pcc/cc/cpp/cpp.h
+++ b/usr.bin/pcc/cpp/cpp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpp.h,v 1.4 2007/09/18 07:16:01 otto Exp $	*/
+/*	$OpenBSD: cpp.h,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 
 /*
  * Copyright (c) 2004 Anders Magnusson (ragge@ludd.luth.se).
@@ -29,7 +29,7 @@
 
 #include <stdio.h> /* for obuf */
 
-#include "../../config.h"
+#include "../config.h"
 
 typedef unsigned char usch;
 #ifdef YYTEXT_POINTER
diff --git a/usr.bin/pcc/cc/cpp/cpy.y b/usr.bin/pcc/cpp/cpy.y
index 6de8a694a12..cb0345a8eda 100644
--- a/usr.bin/pcc/cc/cpp/cpy.y
+++ b/usr.bin/pcc/cpp/cpy.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpy.y,v 1.2 2007/09/15 22:04:39 ray Exp $	*/
+/*	$OpenBSD: cpy.y,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 
 /*
  * Copyright (c) 2004 Anders Magnusson (ragge@ludd.luth.se).
diff --git a/usr.bin/pcc/cc/cpp/scanner.l b/usr.bin/pcc/cpp/scanner.l
index 94656769f3c..d021d9991e0 100644
--- a/usr.bin/pcc/cc/cpp/scanner.l
+++ b/usr.bin/pcc/cpp/scanner.l
@@ -1,5 +1,5 @@
 %{
-/*	$OpenBSD: scanner.l,v 1.9 2007/10/07 07:58:51 ragge Exp $	*/
+/*	$OpenBSD: scanner.l,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 
 /*
  * Copyright (c) 2004 Anders Magnusson. All rights reserved.
diff --git a/usr.bin/pcc/os/openbsd/f77config.h b/usr.bin/pcc/f77config.h
index 209eb3b63e6..32b794574d8 100644
--- a/usr.bin/pcc/os/openbsd/f77config.h
+++ b/usr.bin/pcc/f77config.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: f77config.h,v 1.2 2007/09/15 22:04:39 ray Exp $	*/
+/*	$OpenBSD: f77config.h,v 1.1 2007/10/07 17:58:50 otto Exp $	*/
 
 /*
  * Copyright (c) 2004 Anders Magnusson (ragge@ludd.luth.se).
diff --git a/usr.bin/pcc/m16c/TODO b/usr.bin/pcc/m16c/TODO
new file mode 100644
index 00000000000..8a8d93606cb
--- /dev/null
+++ b/usr.bin/pcc/m16c/TODO
@@ -0,0 +1,3 @@
+$OpenBSD: TODO,v 1.1 2007/10/07 17:58:51 otto Exp $
+
+* Mul/Div does not work.
diff --git a/usr.bin/pcc/arch/m16c/code.c b/usr.bin/pcc/m16c/code.c
index 05cd0a69a5a..3c832626e49 100644
--- a/usr.bin/pcc/arch/m16c/code.c
+++ b/usr.bin/pcc/m16c/code.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: code.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: code.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/m16c/local.c b/usr.bin/pcc/m16c/local.c
index be0841675bd..d7bb1526894 100644
--- a/usr.bin/pcc/arch/m16c/local.c
+++ b/usr.bin/pcc/m16c/local.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: local.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: local.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/m16c/local2.c b/usr.bin/pcc/m16c/local2.c
index e02944df6b1..b1670affc92 100644
--- a/usr.bin/pcc/arch/m16c/local2.c
+++ b/usr.bin/pcc/m16c/local2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: local2.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: local2.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/m16c/macdefs.h b/usr.bin/pcc/m16c/macdefs.h
index 117ad338891..6018c867261 100644
--- a/usr.bin/pcc/arch/m16c/macdefs.h
+++ b/usr.bin/pcc/m16c/macdefs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macdefs.h,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: macdefs.h,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/m16c/order.c b/usr.bin/pcc/m16c/order.c
index 2f1e72b4a6f..756bf747c07 100644
--- a/usr.bin/pcc/arch/m16c/order.c
+++ b/usr.bin/pcc/m16c/order.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: order.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: order.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/m16c/table.c b/usr.bin/pcc/m16c/table.c
index 5e693301b4c..b9b437e21c0 100644
--- a/usr.bin/pcc/arch/m16c/table.c
+++ b/usr.bin/pcc/m16c/table.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: table.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: table.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 
 #include "pass2.h"
 
diff --git a/usr.bin/pcc/mips/TODO b/usr.bin/pcc/mips/TODO
new file mode 100644
index 00000000000..4b104cf8ee2
--- /dev/null
+++ b/usr.bin/pcc/mips/TODO
@@ -0,0 +1,9 @@
+$OpenBSD: TODO,v 1.1 2007/10/07 17:58:51 otto Exp $
+
+* Look at long long support for the new register allocator.
+
+* Add floating point support.
+
+* Add support for struct/union arguments and return values.
+
+* See if the workaround for the function arguments can be removed/rewritten.
diff --git a/usr.bin/pcc/arch/mips/code.c b/usr.bin/pcc/mips/code.c
index 06b26cb9157..1ada0196529 100644
--- a/usr.bin/pcc/arch/mips/code.c
+++ b/usr.bin/pcc/mips/code.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: code.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: code.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/mips/local.c b/usr.bin/pcc/mips/local.c
index 957d1759e68..554b53190f3 100644
--- a/usr.bin/pcc/arch/mips/local.c
+++ b/usr.bin/pcc/mips/local.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: local.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: local.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/mips/local2.c b/usr.bin/pcc/mips/local2.c
index e40be6d6d05..11d151a7f05 100644
--- a/usr.bin/pcc/arch/mips/local2.c
+++ b/usr.bin/pcc/mips/local2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: local2.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: local2.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/mips/macdefs.h b/usr.bin/pcc/mips/macdefs.h
index 3fb19090a73..71e5b17f955 100644
--- a/usr.bin/pcc/arch/mips/macdefs.h
+++ b/usr.bin/pcc/mips/macdefs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macdefs.h,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: macdefs.h,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/mips/order.c b/usr.bin/pcc/mips/order.c
index 9c7b276665d..9a028f6092c 100644
--- a/usr.bin/pcc/arch/mips/order.c
+++ b/usr.bin/pcc/mips/order.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: order.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: order.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/mips/table.c b/usr.bin/pcc/mips/table.c
index a8449ca0f84..78d0555c28a 100644
--- a/usr.bin/pcc/arch/mips/table.c
+++ b/usr.bin/pcc/mips/table.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: table.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: table.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/nova/README b/usr.bin/pcc/nova/README
new file mode 100644
index 00000000000..d50699be54d
--- /dev/null
+++ b/usr.bin/pcc/nova/README
@@ -0,0 +1,122 @@
+$OpenBSD: README,v 1.1 2007/10/07 17:58:51 otto Exp $
+
+Calling conventions, stack frame and zero page:
+
+The variables that normally are placed on the stack or in registers in C
+are instead allocated in the zero page and saved on a (fictive) stack
+when calling functions.  Some locations have predefined functions though.
+Arrays allocated as automatics are stored on the stack with a pointer
+in zero page to its destination.
+
+0-7	Unused
+10	Stack pointer
+11	Frame pointer
+12-14	Unused
+15	Used by prolog
+16	Prolog address, written in crt0
+17	Epilog address, written in crt0
+20-27	Auto-increment, scratch
+30-37	Auto-decrement, scratch
+40-47	Unused
+50-57	Scratch/Arguments
+60-77	Permanent, save before use.
+100-377	Addresses for subroutines, written by the assembler
+
+The normal registers (AC0-AC3) are all considered scratch registers.
+
+Register classes are assigned as:
+	AC0-AC3: AREGs.
+	AC2-AC3: BREGs.
+	50-77:	 CREGs.
+	...and eventually register pairs as DREGs.
+
+In byte code the low half of a word is the first byte (little-endian).
+This is bit 8-15 in Nova syntax.
+
+The stack is growing towards lower adresses (as opposed to the Eclipse stack).
+Stack layout:
+
+	! arg1	!
+	! arg0	!
+ fp ->	! old pc!
+	! old fp!
+ pc ->	! saved !
+
+A reference to a struct member in assembler, a = b->c; b is in ZP 50
++ is zeropage-addressing
+* is fp-adressing
+
+# offset 0
++	lda 0,@50	# load value from indirect ZP 50 into ac0
+*	lda 2,,3	# load value from (ac3) into ac2
+*	lda 0,,2	# load value from (ac2) into ac0
+
+# offset 12
++	lda 2,50	# load value from ZP 50 into ac2
++	lda 0,12,2	# load value from (ac2+12) into ac0
+*	lda 2,,3	# load value from (ac3) into ac2
+*	lda 0,12,2	# load value from 12(ac2) into ac0
+
+# offset 517
++	lda 2,50	# load value from ZP 50 into ac2
++	lda 0,.L42-.,1	# load offset from .L42 PC-indexed
++	addz 0,2,skp	# add offset to ac2 and skip
++.L42:	.word 517	# offset value
++	lda 0,,2	# load value from (ac2) into ac0
+
+The prolog/epilog implementation; it is implemented as subroutines.
+
+.L42:	.word 13	# number of words to save
+func:
+	sta 3,@40	# save return address on stack
+	lda 2,.L42-.,1	# get save word count
+	jsr @45		# go to prolog
+	...
+	lda 2,.L42-.,1	# get restore word count
+	jmp @46		# jump to epilog
+
+# words to save in 2, return address in 3
+prolog:
+	sta 2,45	# save # of words to move at scratch
+	lda 0,41	# get old fp
+	lda 1,40	# get sp
+	sta 1,41	# save new fp
+	dsz 40		# decrement stack, will never be 0
+	sta 0,@40	# save old fp
+	dsz 40
+
+	lda 0,off57	# fetch address of regs to save - 1
+	sta 0,20	# store address at autoincr
+1:	lda 0,@20	# get word to copy
+	sta 0,@40	# push on stack
+	dsz 40		# manually decrement sp
+	dsz 45		# copied all words?
+	jmp 1b,1	# no, continue
+	jmp 0,3		# return
+
+epilog:
+	sta 2,45	# save # of words to move at scratch
+
+	lda 3,off57	# fetch address of regs to save
+	sta 3,20	# store at autoincr
+	lda 3,41	# fetch fp
+	sta 3,30	# store at autodecr
+	lda 3,@30	# get old fp
+
+1:	lda 2,@30	# fetch word from stack
+	sta 2,@20	# store at orig place
+	dsz 45		# enough?
+	jmp 1b,1	# no, continue
+
+	lda 2,41	# get new fp
+	sta 2,40	# restore stack
+	sta 3,41	# restore old fp
+	jmp @40		# Return
+
+Assembler syntax and functions.
+
+The assembler syntax mimics the DG assembler.
+Load and store to addresses is written "lda 0,foo" to load from address foo.
+If foo is not in zero page then the assembler will put the lda in the
+text area close to the instruction and do an indirect pc-relative load.
+
diff --git a/usr.bin/pcc/arch/nova/code.c b/usr.bin/pcc/nova/code.c
index 8a8faa50ada..4ea0ed79ed5 100644
--- a/usr.bin/pcc/arch/nova/code.c
+++ b/usr.bin/pcc/nova/code.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: code.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: code.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2006 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/nova/local.c b/usr.bin/pcc/nova/local.c
index 8b8611ac673..cc820543051 100644
--- a/usr.bin/pcc/arch/nova/local.c
+++ b/usr.bin/pcc/nova/local.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: local.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: local.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/nova/local2.c b/usr.bin/pcc/nova/local2.c
index be5eeb22a64..00b90e878f9 100644
--- a/usr.bin/pcc/arch/nova/local2.c
+++ b/usr.bin/pcc/nova/local2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: local2.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: local2.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2006 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/nova/macdefs.h b/usr.bin/pcc/nova/macdefs.h
index 5ae7d678c07..75c41f908d8 100644
--- a/usr.bin/pcc/arch/nova/macdefs.h
+++ b/usr.bin/pcc/nova/macdefs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macdefs.h,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: macdefs.h,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2006 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/nova/order.c b/usr.bin/pcc/nova/order.c
index 510254bbb83..b9d9e58e8d7 100644
--- a/usr.bin/pcc/arch/nova/order.c
+++ b/usr.bin/pcc/nova/order.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: order.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: order.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2006 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/nova/table.c b/usr.bin/pcc/nova/table.c
index 3aab54eda18..decdceba8ef 100644
--- a/usr.bin/pcc/arch/nova/table.c
+++ b/usr.bin/pcc/nova/table.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: table.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: table.c,v 1.1 2007/10/07 17:58:51 otto Exp $	*/
 /*
  * Copyright (c) 2006 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/os/dragonfly/ccconfig.h b/usr.bin/pcc/os/dragonfly/ccconfig.h
deleted file mode 100644
index 317a4f5e903..00000000000
--- a/usr.bin/pcc/os/dragonfly/ccconfig.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$OpenBSD: ccconfig.h,v 1.3 2007/09/19 15:21:07 todd Exp $	*/
-
-/*
- * Copyright (c) 2004 Anders Magnusson (ragge@ludd.luth.se).
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Various settings that controls how the C compiler works.
- */
-
-/* common cpp predefines */
-#define	CPPADD	{ "-D__DragonFly__", "-D__ELF__", NULL, }
-#define	DYNLINKER { "-dynamic-linker", "/usr/libexec/ld.elf_so.2", NULL }
-#define CRT0FILE "/usr/lib/crt1.o"
-#define STARTFILES { "/usr/lib/crti.o", "/usr/lib/crtbegin.o", NULL }
-#define	ENDFILES { "/usr/lib/crtend.o", "/usr/lib/crtn.o", NULL }
-
-#define CPPMDADDS { \
-	{ "x86", { "_D__i386__", NULL, } }, \
-	{ NULL }, \
-}
-
-#define MAXCPPMDARGS 2
-
-#define	STABS
diff --git a/usr.bin/pcc/os/linux/ccconfig.h b/usr.bin/pcc/os/linux/ccconfig.h
deleted file mode 100644
index d055342da35..00000000000
--- a/usr.bin/pcc/os/linux/ccconfig.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$OpenBSD: ccconfig.h,v 1.3 2007/09/19 15:21:07 todd Exp $	*/
-
-/*
- * Copyright (c) 2004 Anders Magnusson (ragge@ludd.luth.se).
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Various settings that controls how the C compiler works.
- */
-
-/* common cpp predefines */
-#define	CPPADD	{ "-D__linux__", "-D__ELF__", "-I" INCLUDEDIR "/pcc", NULL, }
-#define	DYNLINKER { "-dynamic-linker", "/lib/ld-linux.so.2", NULL }
-#define CRT0FILE "/usr/lib/crt1.o"
-#define STARTFILES { "/usr/lib/crti.o", "/usr/lib/gcc/i586-suse-linux/4.1.0/crtbegin.o", NULL }
-#define	LIBCLIBS { "-lc", "-lgcc_s", NULL }
-#define	ENDFILES { "/usr/lib/gcc/i586-suse-linux/4.1.0/crtend.o", "/usr/lib/crtn.o", NULL }
-#define STARTLABEL "_start"
-
-#define CPPMDADDS { \
-	{ "x86", { "-D__i386__", NULL, } }, \
-	{ NULL }, \
-}
-
-#define MAXCPPMDARGS 2
-
-#define	STABS
diff --git a/usr.bin/pcc/os/netbsd/ccconfig.h b/usr.bin/pcc/os/netbsd/ccconfig.h
deleted file mode 100644
index d60af1e31a0..00000000000
--- a/usr.bin/pcc/os/netbsd/ccconfig.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$OpenBSD: ccconfig.h,v 1.3 2007/09/19 15:21:07 todd Exp $	*/
-
-/*
- * Copyright (c) 2004 Anders Magnusson (ragge@ludd.luth.se).
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Various settings that controls how the C compiler works.
- */
-
-/* common cpp predefines */
-#define	CPPADD	{ "-D__NetBSD__", "-D__ELF__", NULL, }
-#define	DYNLINKER { "-dynamic-linker", "/usr/libexec/ld.elf_so", NULL }
-#define CRT0FILE "/usr/lib/crt0.o"
-#define STARTFILES { "/usr/lib/crti.o", "/usr/lib/crtbegin.o", NULL }
-#define	ENDFILES { "/usr/lib/crtend.o", "/usr/lib/crtn.o", NULL }
-
-#define CPPMDADDS { \
-	{ "x86", { "-D__i386__", NULL, } }, \
-	{ NULL }, \
-}
-
-#define	STABS
diff --git a/usr.bin/pcc/os/netbsd/f77config.h b/usr.bin/pcc/os/netbsd/f77config.h
deleted file mode 100644
index fe642dcab16..00000000000
--- a/usr.bin/pcc/os/netbsd/f77config.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$OpenBSD: f77config.h,v 1.2 2007/09/15 22:04:39 ray Exp $	*/
-
-/*
- * Copyright (c) 2004 Anders Magnusson (ragge@ludd.luth.se).
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Various settings that controls how the f77 compiler works.
- */
-
-#if 0
-/* common cpp predefines */
-#define CPPADD	{ "-D__NetBSD__", "-D__ELF__", NULL, }
-#define DYNLINKER { "-dynamic-linker", "/usr/libexec/ld.elf_so", NULL }
-#define CRT0FILE "/usr/lib/crt0.o"
-#define STARTFILES { "/usr/lib/crti.o", "/usr/lib/crtbegin.o", NULL }
-#define ENDFILES { "/usr/lib/crtend.o", "/usr/lib/crtn.o", NULL }
-#endif
-#define PASS1NAME	"/usr/lib/f77pass1"
-#define PASS2NAME	"/lib/f1"
-#define PASS2OPT	"/lib/c2"
-#define NOFLPASS2	"/lib/fc1"
-
-#define ASMNAME		"/usr/bin/as"
-#define LDNAME		"/usr/bin/ld"
-#define FOOTNAME	"/usr/lib/crt0.o"
-#define PROFFOOT	"/usr/lib/mcrt0.o"
-#define NOFLFOOT	"/usr/lib/fcrt0.o"
-#define NOFLPROFFOOT	"/usr/lib/fmcrt0.o"
-#define LIBLIST		{ "-lF77", "-lI77", "-lm", "-lc", "-l", NULL };
-
diff --git a/usr.bin/pcc/os/none/ccconfig.h b/usr.bin/pcc/os/none/ccconfig.h
deleted file mode 100644
index 8db552d5c03..00000000000
--- a/usr.bin/pcc/os/none/ccconfig.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$OpenBSD: ccconfig.h,v 1.3 2007/09/19 15:21:07 todd Exp $	*/
-
-/*
- * Copyright (c) 2004 Anders Magnusson (ragge@ludd.luth.se).
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Various settings that controls how the C compiler works.
- */
-
-/*
- * This file is for targets where there is no OS
- */
-
-/* common cpp predefines */
-#define	CPPADD	{ NULL, }
-#define	DYNLINKER { NULL }
-#define CRT0FILE ""
-#define STARTFILES { NULL }
-#define	ENDFILES { NULL }
-
-
-#define CPPMDADDS { \
-	{ "m16c", { "-D__m16c__", NULL, } }, \
-	{ "nova", { "-D__nova__", NULL, } }, \
-	{ NULL },
-}
-
-#define MAXCPPMDARGS 2
diff --git a/usr.bin/pcc/arch/pdp10/code.c b/usr.bin/pcc/pdp10/code.c
index e0e52c0898a..6848ba60c50 100644
--- a/usr.bin/pcc/arch/pdp10/code.c
+++ b/usr.bin/pcc/pdp10/code.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: code.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: code.c,v 1.1 2007/10/07 17:58:52 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/pdp10/local.c b/usr.bin/pcc/pdp10/local.c
index 13d80ad4bdf..67a720a7251 100644
--- a/usr.bin/pcc/arch/pdp10/local.c
+++ b/usr.bin/pcc/pdp10/local.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: local.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: local.c,v 1.1 2007/10/07 17:58:52 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/pdp10/local2.c b/usr.bin/pcc/pdp10/local2.c
index 362a9af2b70..2fd7d89f6a0 100644
--- a/usr.bin/pcc/arch/pdp10/local2.c
+++ b/usr.bin/pcc/pdp10/local2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: local2.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: local2.c,v 1.1 2007/10/07 17:58:52 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/pdp10/macdefs.h b/usr.bin/pcc/pdp10/macdefs.h
index d57a46902ab..356c94dcd53 100644
--- a/usr.bin/pcc/arch/pdp10/macdefs.h
+++ b/usr.bin/pcc/pdp10/macdefs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macdefs.h,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: macdefs.h,v 1.1 2007/10/07 17:58:52 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/pdp10/order.c b/usr.bin/pcc/pdp10/order.c
index 1919b285243..fc0909cb6cb 100644
--- a/usr.bin/pcc/arch/pdp10/order.c
+++ b/usr.bin/pcc/pdp10/order.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: order.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: order.c,v 1.1 2007/10/07 17:58:52 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/pdp10/table.c b/usr.bin/pcc/pdp10/table.c
index d55d826cf3b..4cd6ee44061 100644
--- a/usr.bin/pcc/arch/pdp10/table.c
+++ b/usr.bin/pcc/pdp10/table.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: table.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: table.c,v 1.1 2007/10/07 17:58:52 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/vax/code.c b/usr.bin/pcc/vax/code.c
index 79b5d12bc2c..341129a307a 100644
--- a/usr.bin/pcc/arch/vax/code.c
+++ b/usr.bin/pcc/vax/code.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: code.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: code.c,v 1.1 2007/10/07 17:58:52 otto Exp $	*/
 /*
  * Copyright(C) Caldera International Inc. 2001-2002. All rights reserved.
  *
diff --git a/usr.bin/pcc/arch/vax/local.c b/usr.bin/pcc/vax/local.c
index 8e5cfe8ab0a..dfdfbcd1458 100644
--- a/usr.bin/pcc/arch/vax/local.c
+++ b/usr.bin/pcc/vax/local.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: local.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: local.c,v 1.1 2007/10/07 17:58:52 otto Exp $	*/
 /*
  * Copyright(C) Caldera International Inc. 2001-2002. All rights reserved.
  *
diff --git a/usr.bin/pcc/arch/vax/local2.c b/usr.bin/pcc/vax/local2.c
index 29472019902..ecc75bb11df 100644
--- a/usr.bin/pcc/arch/vax/local2.c
+++ b/usr.bin/pcc/vax/local2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: local2.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: local2.c,v 1.1 2007/10/07 17:58:52 otto Exp $	*/
 /*
  * Copyright(C) Caldera International Inc. 2001-2002. All rights reserved.
  *
diff --git a/usr.bin/pcc/arch/vax/macdefs.h b/usr.bin/pcc/vax/macdefs.h
index c1ec962b50c..cb0a1116e79 100644
--- a/usr.bin/pcc/arch/vax/macdefs.h
+++ b/usr.bin/pcc/vax/macdefs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macdefs.h,v 1.3 2007/09/19 12:12:43 todd Exp $	*/
+/*	$OpenBSD: macdefs.h,v 1.1 2007/10/07 17:58:52 otto Exp $	*/
 /*
  * Copyright(C) Caldera International Inc. 2001-2002. All rights reserved.
  *
diff --git a/usr.bin/pcc/arch/vax/order.c b/usr.bin/pcc/vax/order.c
index 3b6cdfd97b0..ace2babe5ee 100644
--- a/usr.bin/pcc/arch/vax/order.c
+++ b/usr.bin/pcc/vax/order.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: order.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: order.c,v 1.1 2007/10/07 17:58:52 otto Exp $	*/
 /*
  * Copyright(C) Caldera International Inc. 2001-2002. All rights reserved.
  *
diff --git a/usr.bin/pcc/arch/vax/table.c b/usr.bin/pcc/vax/table.c
index c727361fe3c..bc4083a373d 100644
--- a/usr.bin/pcc/arch/vax/table.c
+++ b/usr.bin/pcc/vax/table.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: table.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: table.c,v 1.1 2007/10/07 17:58:52 otto Exp $	*/
 /*
  * Copyright(C) Caldera International Inc. 2001-2002. All rights reserved.
  *
diff --git a/usr.bin/pcc/arch/x86/code.c b/usr.bin/pcc/x86/code.c
index 9f2e9524d2d..9c110a3e765 100644
--- a/usr.bin/pcc/arch/x86/code.c
+++ b/usr.bin/pcc/x86/code.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: code.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: code.c,v 1.1 2007/10/07 17:58:52 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/x86/local.c b/usr.bin/pcc/x86/local.c
index 62688c2b423..3168d056693 100644
--- a/usr.bin/pcc/arch/x86/local.c
+++ b/usr.bin/pcc/x86/local.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: local.c,v 1.6 2007/10/06 13:31:55 ragge Exp $	*/
+/*	$OpenBSD: local.c,v 1.1 2007/10/07 17:58:52 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/x86/local2.c b/usr.bin/pcc/x86/local2.c
index a5d172aea06..117263171be 100644
--- a/usr.bin/pcc/arch/x86/local2.c
+++ b/usr.bin/pcc/x86/local2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: local2.c,v 1.4 2007/09/17 11:21:54 otto Exp $	*/
+/*	$OpenBSD: local2.c,v 1.1 2007/10/07 17:58:52 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/x86/macdefs.h b/usr.bin/pcc/x86/macdefs.h
index 6b17ec0404c..c50b1e3e738 100644
--- a/usr.bin/pcc/arch/x86/macdefs.h
+++ b/usr.bin/pcc/x86/macdefs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macdefs.h,v 1.3 2007/10/05 15:58:23 ragge Exp $	*/
+/*	$OpenBSD: macdefs.h,v 1.1 2007/10/07 17:58:52 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/x86/order.c b/usr.bin/pcc/x86/order.c
index d0a81788b47..2e6bc559905 100644
--- a/usr.bin/pcc/arch/x86/order.c
+++ b/usr.bin/pcc/x86/order.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: order.c,v 1.2 2007/09/15 22:04:38 ray Exp $	*/
+/*	$OpenBSD: order.c,v 1.1 2007/10/07 17:58:52 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
diff --git a/usr.bin/pcc/arch/x86/table.c b/usr.bin/pcc/x86/table.c
index e5dfdd964a8..71d88e53499 100644
--- a/usr.bin/pcc/arch/x86/table.c
+++ b/usr.bin/pcc/x86/table.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: table.c,v 1.3 2007/09/20 19:29:29 otto Exp $	*/
+/*	$OpenBSD: table.c,v 1.1 2007/10/07 17:58:52 otto Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.