Merge cc_drv into cc_int. Merge more shared files into cc_int.

9 files changed, 20 insertions, 24 deletions

diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index 7b25081ec26c..ed17ea1c3b9e 100644
--- a/gnu/usr.bin/cc/Makefile
+++ b/gnu/usr.bin/cc/Makefile
@@ -3,7 +3,7 @@
 # The order of some of these are rather important.  Some depend on previous
 # subdirs.
 
-SUBDIR= cc_fbsd cc_tools cc_int cc_drv cccp cpp cc1 cc cc1plus c++ c++filt doc
+SUBDIR= cc_fbsd cc_tools cc_int cccp cpp cc1 cc cc1plus c++ c++filt doc
 
 .if !defined(NO_OBJC)
 SUBDIR+= cc1obj
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index e9966864e205..fce44213620c 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -51,12 +51,6 @@ CFLAGS+=	-I${.CURDIR}/../cc_tools
 # correctly.
 CFLAGS+=	-I${GCCDIR} -I${GCCDIR}/config
 
-.if exists(${.OBJDIR}/../cc_drv)
-LIBCC_DRV=	${.OBJDIR}/../cc_drv/libcc_drv.a
-.else
-LIBCC_DRV=	${.CURDIR}/../cc_drv/libcc_drv.a
-.endif
-
 .if exists(${.OBJDIR}/../cc_fbsd)
 LIBCC_FBSD=	${.OBJDIR}/../cc_fbsd/libcc_fbsd.a
 .else
diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile
index f77aca73c7fe..4c25003d87b7 100644
--- a/gnu/usr.bin/cc/c++/Makefile
+++ b/gnu/usr.bin/cc/c++/Makefile
@@ -10,7 +10,7 @@ LINKS=	${BINDIR}/c++ ${BINDIR}/g++
 LINKS+=	${BINDIR}/c++ ${BINDIR}/CC
 NOMAN=	1
 
-DPADD+=	${LIBCC_DRV} ${LIBCC_FBSD}
-LDADD+=	${LIBCC_DRV} ${LIBCC_FBSD}
+DPADD+=	${LIBCC_INT} ${LIBCC_FBSD}
+LDADD+=	${LIBCC_INT} ${LIBCC_FBSD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index 6a5e6be088b4..926c57e547a5 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -11,7 +11,7 @@ SRCS=	gcc.c gccspec.c
 LINKS=	${BINDIR}/cc ${BINDIR}/gcc
 MLINKS=	gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1
 
-DPADD+=	${LIBCC_DRV} ${LIBCC_FBSD}
-LDADD+=	${LIBCC_DRV} ${LIBCC_FBSD}
+DPADD+=	${LIBCC_INT} ${LIBCC_FBSD}
+LDADD+=	${LIBCC_INT} ${LIBCC_FBSD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index 1a4e72fe16c5..3b2a63de937a 100644
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -5,9 +5,8 @@
 .PATH: ../cc_tools ${GCCDIR}
  
 PROG=	cc1
-SRCS=	c-parse.c c-parse.h \
-	c-aux-info.c c-common.c c-convert.c c-decl.c c-iterate.c c-lang.c \
-	c-lex.c c-pragma.c c-typeck.c
+SRCS=	c-parse.c c-parse.h c-lang.c
+SRCS+=	c-lex.c
 BINDIR=	/usr/libexec
 NOMAN=	1
 NOSHARED=yes
diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile
index f88f9f26c6e5..7bd4984fdf46 100644
--- a/gnu/usr.bin/cc/cc1obj/Makefile
+++ b/gnu/usr.bin/cc/cc1obj/Makefile
@@ -5,10 +5,9 @@
 .PATH: ../cc_tools ${GCCDIR}/objc ${GCCDIR}
 
 PROG=	cc1obj
-SRCS=	objc-parse.c objc-parse.h objc-act.c
+SRCS=	objc-parse.c objc-parse.h objc-parse.h objc-act.c
 # Ugh, compiled twice...
-SRCS+=	c-aux-info.c c-common.c c-convert.c c-decl.c c-iterate.c c-lex.c \
-	c-pragma.c c-typeck.c
+SRCS+=	c-lex.c
 BINDIR=	/usr/libexec
 NOMAN=	1
 NOSHARED=yes
diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile
index 511b09efba95..afb37867cc99 100644
--- a/gnu/usr.bin/cc/cc_int/Makefile
+++ b/gnu/usr.bin/cc/cc_int/Makefile
@@ -8,7 +8,8 @@ LIB=		cc_int
 NOPROFILE=	YES
 NOPIC=		YES
 
-SRCS=	c-common.c c-pragma.c \
+SRCS=	c-aux-info.c c-common.c c-convert.c c-decl.c c-iterate.c \
+	c-pragma.c c-typeck.c \
 	caller-save.c calls.c combine.c convert.c cse.c \
 	dbxout.c dwarfout.c emit-rtl.c explow.c expmed.c expr.c \
 	final.c flow.c fold-const.c function.c getpwd.c global.c graph.c \
@@ -28,10 +29,13 @@ SRCS+=	haifa-sched.c
 SRCS+=	sched.c
 .endif
 
+#	shared between the drivers
+SRCS+=	multilib.h choose-temp.c obstack.c prefix.c pexecute.c version.c
+
 #	stuff that makes libiberty now required (2.95) and shouldn't be...
 SRCS+=	obstack.c splay-tree.c
 
-CFLAGS+=	-DTARGET_NAME=\"${target}\"
+CFLAGS+=	-DTARGET_NAME=\"${target}\" -DIN_GCC
 
 install:
 	@true
diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile
index 094279949705..b5661d3658a7 100644
--- a/gnu/usr.bin/cc/cpp/Makefile
+++ b/gnu/usr.bin/cc/cpp/Makefile
@@ -5,10 +5,10 @@
 .PATH: ${GCCDIR}
 
 PROG=	cpp
-SRCS=	gcc.c cppspec.c # version.c
+SRCS=	gcc.c cppspec.c
 NOMAN=	1
 
-DPADD+=	${LIBCC_DRV} ${LIBCC_FBSD}
-LDADD+=	${LIBCC_DRV} ${LIBCC_FBSD}
+DPADD+=	${LIBCC_INT} ${LIBCC_FBSD}
+LDADD+=	${LIBCC_INT} ${LIBCC_FBSD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/f77/Makefile b/gnu/usr.bin/cc/f77/Makefile
index 9dd6e63d67ce..72d7932b24bb 100644
--- a/gnu/usr.bin/cc/f77/Makefile
+++ b/gnu/usr.bin/cc/f77/Makefile
@@ -7,8 +7,8 @@
 PROG=	f77
 SRCS=	gcc.c g77spec.c version.c
 
-DPADD+=	${LIBCC_DRV} ${LIBCC_FBSD}
-LDADD+=	${LIBCC_DRV} ${LIBCC_FBSD}
+DPADD+=	${LIBCC_INT} ${LIBCC_FBSD}
+LDADD+=	${LIBCC_INT} ${LIBCC_FBSD}
 
 f77.1: g77.1
 	ln -sf ${.ALLSRC} ${.TARGET}