summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/pcc/cc/Makefile8
-rw-r--r--usr.bin/pcc/ccconfig.h4
-rw-r--r--usr.bin/pcc/ccom/Makefile7
-rw-r--r--usr.bin/pcc/ccom/i386/Makefile (renamed from usr.bin/pcc/ccom/x86/Makefile)2
-rw-r--r--usr.bin/pcc/i386/code.c (renamed from usr.bin/pcc/x86/code.c)2
-rw-r--r--usr.bin/pcc/i386/local.c (renamed from usr.bin/pcc/x86/local.c)2
-rw-r--r--usr.bin/pcc/i386/local2.c (renamed from usr.bin/pcc/x86/local2.c)2
-rw-r--r--usr.bin/pcc/i386/macdefs.h (renamed from usr.bin/pcc/x86/macdefs.h)2
-rw-r--r--usr.bin/pcc/i386/order.c (renamed from usr.bin/pcc/x86/order.c)2
-rw-r--r--usr.bin/pcc/i386/table.c (renamed from usr.bin/pcc/x86/table.c)2
10 files changed, 11 insertions, 22 deletions
diff --git a/usr.bin/pcc/cc/Makefile b/usr.bin/pcc/cc/Makefile
index 62ce0ef2a98..a2e7d4fe0fd 100644
--- a/usr.bin/pcc/cc/Makefile
+++ b/usr.bin/pcc/cc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2007/10/14 20:24:00 otto Exp $
+# $OpenBSD: Makefile,v 1.5 2007/10/22 13:40:08 otto Exp $
#
# Makefile for the cc part of pcc.
#
@@ -7,13 +7,7 @@ PREFIX= /usr/local
BINDIR= ${PREFIX}/bin
MANDIR= ${PREFIX}/man/man
TARGOS= openbsd
-
-.if ${MACHINE_ARCH} == "i386"
-TARGMACH= x86
-.else
TARGMACH= ${MACHINE_ARCH}
-.endif
-
CFLAGS+= -DLIBEXECDIR=\"${PREFIX}/libexec\"
CPPFLAGS+= -I${.CURDIR}/..
diff --git a/usr.bin/pcc/ccconfig.h b/usr.bin/pcc/ccconfig.h
index 0e15a27e4a4..24cbd11f762 100644
--- a/usr.bin/pcc/ccconfig.h
+++ b/usr.bin/pcc/ccconfig.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ccconfig.h,v 1.2 2007/10/15 09:46:30 otto Exp $ */
+/* $OpenBSD: ccconfig.h,v 1.3 2007/10/22 13:40:08 otto Exp $ */
/*
* Copyright (c) 2004 Anders Magnusson (ragge@ludd.luth.se).
@@ -39,7 +39,7 @@
#define ENDFILES { "/usr/lib/crtend.o", NULL }
#define CPPMDADDS { \
- { "x86", { "-D__i386__", "-D__i386", "-D__ELF__", \
+ { "i386", { "-D__i386__", "-D__i386", "-D__ELF__", \
NULL } }, \
{ "alpha", { "-D__alpha", "-D__alpha_ev4__", "-D__alpha__", \
"-D__ELF__", NULL } }, \
diff --git a/usr.bin/pcc/ccom/Makefile b/usr.bin/pcc/ccom/Makefile
index 4367db43b8b..94a98b153ef 100644
--- a/usr.bin/pcc/ccom/Makefile
+++ b/usr.bin/pcc/ccom/Makefile
@@ -1,12 +1,7 @@
-# $OpenBSD: Makefile,v 1.2 2007/10/14 20:29:27 otto Exp $
+# $OpenBSD: Makefile,v 1.3 2007/10/22 13:38:43 otto Exp $
#
# Makefile for the ccom part of pcc.
#
-
-.if ${MACHINE_ARCH} == "i386"
-SUBDIR+= x86
-.else
SUBDIR+= ${MACHINE_ARCH}
-.endif
.include <bsd.subdir.mk>
diff --git a/usr.bin/pcc/ccom/x86/Makefile b/usr.bin/pcc/ccom/i386/Makefile
index 2049d325ec4..71621e34b29 100644
--- a/usr.bin/pcc/ccom/x86/Makefile
+++ b/usr.bin/pcc/ccom/i386/Makefile
@@ -1,3 +1,3 @@
-TARGMACH= x86
+TARGMACH= i386
.include <bsd.prog.mk>
diff --git a/usr.bin/pcc/x86/code.c b/usr.bin/pcc/i386/code.c
index 9c110a3e765..14b4f65a5b1 100644
--- a/usr.bin/pcc/x86/code.c
+++ b/usr.bin/pcc/i386/code.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: code.c,v 1.1 2007/10/07 17:58:52 otto Exp $ */
+/* $OpenBSD: code.c,v 1.1 2007/10/22 13:39:37 otto Exp $ */
/*
* Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
* All rights reserved.
diff --git a/usr.bin/pcc/x86/local.c b/usr.bin/pcc/i386/local.c
index 3168d056693..79fe3285b81 100644
--- a/usr.bin/pcc/x86/local.c
+++ b/usr.bin/pcc/i386/local.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: local.c,v 1.1 2007/10/07 17:58:52 otto Exp $ */
+/* $OpenBSD: local.c,v 1.1 2007/10/22 13:39:37 otto Exp $ */
/*
* Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
* All rights reserved.
diff --git a/usr.bin/pcc/x86/local2.c b/usr.bin/pcc/i386/local2.c
index e5ab696747d..95d654e7f8c 100644
--- a/usr.bin/pcc/x86/local2.c
+++ b/usr.bin/pcc/i386/local2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: local2.c,v 1.2 2007/10/14 19:58:00 stefan Exp $ */
+/* $OpenBSD: local2.c,v 1.1 2007/10/22 13:39:37 otto Exp $ */
/*
* Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
* All rights reserved.
diff --git a/usr.bin/pcc/x86/macdefs.h b/usr.bin/pcc/i386/macdefs.h
index 5fc828b02d3..c7fb900466d 100644
--- a/usr.bin/pcc/x86/macdefs.h
+++ b/usr.bin/pcc/i386/macdefs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: macdefs.h,v 1.2 2007/10/14 19:58:00 stefan Exp $ */
+/* $OpenBSD: macdefs.h,v 1.1 2007/10/22 13:39:37 otto Exp $ */
/*
* Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
* All rights reserved.
diff --git a/usr.bin/pcc/x86/order.c b/usr.bin/pcc/i386/order.c
index 2e6bc559905..5ea82841869 100644
--- a/usr.bin/pcc/x86/order.c
+++ b/usr.bin/pcc/i386/order.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: order.c,v 1.1 2007/10/07 17:58:52 otto Exp $ */
+/* $OpenBSD: order.c,v 1.1 2007/10/22 13:39:37 otto Exp $ */
/*
* Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
* All rights reserved.
diff --git a/usr.bin/pcc/x86/table.c b/usr.bin/pcc/i386/table.c
index fc2adc2df61..1826ebb047c 100644
--- a/usr.bin/pcc/x86/table.c
+++ b/usr.bin/pcc/i386/table.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: table.c,v 1.2 2007/10/14 19:58:00 stefan Exp $ */
+/* $OpenBSD: table.c,v 1.1 2007/10/22 13:39:37 otto Exp $ */
/*
* Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
* All rights reserved.