[Midnightbsd-cvs] src: pcc/cc: Since I'm having trouble sleeping, I might as well commit
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu May 15 00:53:35 EDT 2008
Log Message:
-----------
Since I'm having trouble sleeping, I might as well commit my progress on pcc.
This is now compiling on i386 on my laptop. It relies on two changes in bsd.sys.mk and sys.mk that I've not yet committed. (yacc and lex handling)
It's installed to /usr/local with a link to the manpage for pcc(1). (This will conflict with the port)
Modified Files:
--------------
src/usr.bin/pcc/cc:
Makefile (r1.2 -> r1.3)
src/usr.bin/pcc/ccom:
Makefile.inc (r1.1 -> r1.2)
src/usr.bin/pcc/ccom/i386:
Makefile (r1.1 -> r1.2)
src/usr.bin/pcc/ccom/sparc64:
Makefile (r1.1 -> r1.2)
src/usr.bin/pcc/cpp:
Makefile (r1.1 -> r1.2)
cpp.c (r1.1 -> r1.2)
cpp.h (r1.1 -> r1.2)
-------------- next part --------------
Index: Makefile.inc
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/ccom/Makefile.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -L usr.bin/pcc/ccom/Makefile.inc -L usr.bin/pcc/ccom/Makefile.inc -u -r1.1 -r1.2
--- usr.bin/pcc/ccom/Makefile.inc
+++ usr.bin/pcc/ccom/Makefile.inc
@@ -10,21 +10,21 @@
PREFIX= /usr/local
BINDIR= ${PREFIX}/libexec
MANDIR= ${PREFIX}/man/man
-TARGOS= openbsd
+TARGOS= midnightbsd
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}/../../${TARGMACH}
-CPPFLAGS+= -I${.CURDIR}/../..
+CFLAGS+= -I. -I${.CURDIR}/.. -I${.CURDIR} -I${.CURDIR}/../../mip
+CFLAGS+= -I${.CURDIR}/../../${TARGMACH}
+CFLAGS+= -I${.CURDIR}/../..
.PATH: ${.CURDIR}/../../${TARGMACH}
.PATH: ${.CURDIR}/../../mip
.PATH: ${.CURDIR}/..
-SRCS=optim.c pftn.c scan.l trees.c cgram.y inline.c symtabs.c \
+SRCS=optim.c pftn.c scan.l pass2.h trees.c cgram.y inline.c symtabs.c \
gcc_compat.c init.c local.c code.c stabs.c match.c reader.c optim2.c \
regs.c local2.c order.c table.c common.c main.c external.c
@@ -33,12 +33,14 @@
mv y.tab.c cgram.c
mv y.tab.h cgram.h
-mkext: mkext.c table.c common.c
+pass2.h: external.h
+
+optim2.o reader.o: external.h
+
+external.h external.c: mkext.c table.c common.c
$(CC) $(CPPFLAGS) $(CFLAGS) -DMKEXT -o mkext \
${.CURDIR}/../../mip/mkext.c ${.CURDIR}/../../${TARGMACH}/table.c \
${.CURDIR}/../../mip/common.c
-
-external.h external.c: mkext
./mkext
pftn.o: cgram.c
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/ccom/i386/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L usr.bin/pcc/ccom/i386/Makefile -L usr.bin/pcc/ccom/i386/Makefile -u -r1.1 -r1.2
--- usr.bin/pcc/ccom/i386/Makefile
+++ usr.bin/pcc/ccom/i386/Makefile
@@ -1,3 +1,7 @@
+# $MidnightBSD$
+
TARGMACH= i386
+CFLAGS+= -Dmach_${TARGMACH}
+
.include <bsd.prog.mk>
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/ccom/sparc64/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L usr.bin/pcc/ccom/sparc64/Makefile -L usr.bin/pcc/ccom/sparc64/Makefile -u -r1.1 -r1.2
--- usr.bin/pcc/ccom/sparc64/Makefile
+++ usr.bin/pcc/ccom/sparc64/Makefile
@@ -1,3 +1,5 @@
+# $MidnightBSD$
+
TARGMACH= sparc64
.include <bsd.prog.mk>
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/cc/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L usr.bin/pcc/cc/Makefile -L usr.bin/pcc/cc/Makefile -u -r1.2 -r1.3
--- usr.bin/pcc/cc/Makefile
+++ usr.bin/pcc/cc/Makefile
@@ -3,7 +3,7 @@
PROG= cc
PREFIX= /usr/local
BINDIR= ${PREFIX}/bin
-MANDIR= ${PREFIX}/man
+MANDIR= ${PREFIX}/man/man
TARGOS= midnightbsd
TARGMACH= ${MACHINE_ARCH}
@@ -11,4 +11,6 @@
CFLAGS+= -I${.CURDIR}/..
CFLAGS+= -Dmach_${TARGMACH} -Dos_${TARGOS}
+MLINKS+= cc.1 pcc.1
+
.include <bsd.prog.mk>
Index: cpp.c
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/cpp/cpp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L usr.bin/pcc/cpp/cpp.c -L usr.bin/pcc/cpp/cpp.c -u -r1.1 -r1.2
--- usr.bin/pcc/cpp/cpp.c
+++ usr.bin/pcc/cpp/cpp.c
@@ -66,7 +66,7 @@
* from V7 cpp, and at last ansi/c99 support.
*/
-#include "../../config.h"
+#include "../config.h"
#include <sys/wait.h>
Index: cpp.h
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/cpp/cpp.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -L usr.bin/pcc/cpp/cpp.h -L usr.bin/pcc/cpp/cpp.h -u -r1.1 -r1.2
--- usr.bin/pcc/cpp/cpp.h
+++ usr.bin/pcc/cpp/cpp.h
@@ -29,7 +29,7 @@
#include <stdio.h> /* for obuf */
-#include "../../config.h"
+#include "../config.h"
typedef unsigned char usch;
#ifdef YYTEXT_POINTER
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/cpp/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L usr.bin/pcc/cpp/Makefile -L usr.bin/pcc/cpp/Makefile -u -r1.1 -r1.2
--- usr.bin/pcc/cpp/Makefile
+++ usr.bin/pcc/cpp/Makefile
@@ -3,13 +3,13 @@
PROG= cpp
PREFIX= /usr/local
BINDIR= ${PREFIX}/libexec
-MANDIR= ${PREFIX}/man
+MANDIR= ${PREFIX}/man/man
TARGOS= midnightbsd
CFLAGS+= -DCPP_DEBUG -Wall -Wmissing-prototypes -Wstrict-prototypes -Werror
CFLAGS+= -DLIBEXECDIR=\"${PREFIX}/libexec\"
-CPPFLAGS+= -I. -I${.CURDIR}
-
+CFLAGS+= -I. -I${.CURDIR}
+YFLAGS= -d
SRCS= cpy.y scanner.l cpp.c
.include <bsd.prog.mk>
More information about the Midnightbsd-cvs
mailing list