Add libcc_fbsd.a that contains libc and libiberty routines needed in

bootstraping on FreeBSD specifically.

3.2 upgrade path tested by:	marcel

6 files changed, 30 insertions, 13 deletions

diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index 3c28c5b..afe0a3c 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_tools cc_int cc_drv cpp cc1 cc cc1plus c++ c++filt doc
+SUBDIR= cc_fbsd cc_tools cc_int cc_drv 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 093b8ff..df074ba 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -4,7 +4,8 @@
 
 # Sometimes this is .include'd several times...
 .if !defined(GCCDIR)
-GCCDIR=		${.CURDIR}/../../../../contrib/gcc
+#GCCDIR=		${.CURDIR}/../../../../contrib/gcc
+GCCDIR=		/usr/src/contrib/gcc
 
 .if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb"
 GCC_ARCH=mips
@@ -49,13 +50,13 @@ CFLAGS+=	-I${.CURDIR}/../cc_tools
 CFLAGS+=	-I${GCCDIR} -I${GCCDIR}/config
 
 .if exists(${.OBJDIR}/../cc_int)
-LIBDESTDIR=	${.OBJDIR}/../cc_int
-LIBCC_DRV=	${.OBJDIR}/../cc_drv/libcc_drv.a
+LIBDESTDIR=	${.OBJDIR}/..
 .else
-LIBDESTDIR=	${.CURDIR}/../cc_int
-LIBCC_DRV=	${.CURDIR}/../cc_drv/libcc_drv.a
+LIBDESTDIR=	${.CURDIR}/..
 .endif
 
-LIBCC_INT=	${LIBDESTDIR}/libcc_int.a
+LIBCC_INT=	${LIBDESTDIR}/cc_int/libcc_int.a
+LIBCC_DRV=	${LIBDESTDIR}/cc_drv/libcc_drv.a
+LIBCC_FBSD=	${LIBDESTDIR}/cc_fbsd/libcc_fbsd.a
 
 .endif # !GCCDIR
diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile
index f4e58c3..f77aca7 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} 
-LDADD+=	${LIBCC_DRV}
+DPADD+=	${LIBCC_DRV} ${LIBCC_FBSD}
+LDADD+=	${LIBCC_DRV} ${LIBCC_FBSD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index a796e9e..6a5e6be 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} 
-LDADD+=	${LIBCC_DRV}
+DPADD+=	${LIBCC_DRV} ${LIBCC_FBSD}
+LDADD+=	${LIBCC_DRV} ${LIBCC_FBSD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc_fbsd/Makefile b/gnu/usr.bin/cc/cc_fbsd/Makefile
new file mode 100644
index 0000000..0d5c5d4
--- /dev/null
+++ b/gnu/usr.bin/cc/cc_fbsd/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+LIBCDIR=	${.CURDIR}/../../../../lib/libc
+
+.PATH: ${LIBCDIR}/gen ${LIBCDIR}/stdio
+
+LIB=		cc_fbsd
+NOPROFILE=	YES
+NOPIC=		YES
+
+SRCS=	getobjformat.c mktemp.c
+	
+install:
+	@true
+
+.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/cc/f77/Makefile b/gnu/usr.bin/cc/f77/Makefile
index 47ef410..9dd6e63 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} 
-LDADD=	${LIBCC_DRV}
+DPADD+=	${LIBCC_DRV} ${LIBCC_FBSD}
+LDADD+=	${LIBCC_DRV} ${LIBCC_FBSD}
 
 f77.1: g77.1
 	ln -sf ${.ALLSRC} ${.TARGET}