7 files changed, 9 insertions, 29 deletions

diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index 30ec1194d954..b70613382eee 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 cccp cc1 cc
+SUBDIR= cc_tools cc_int cccp cc1 cc
 
 .if !defined(NO_CPP)
 SUBDIR+= cpp
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index e06cc5006397..11d6c0d9bcf1 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_fbsd)
-LIBCC_FBSD=	${.OBJDIR}/../cc_fbsd/libcc_fbsd.a
-.else
-LIBCC_FBSD=	${.CURDIR}/../cc_fbsd/libcc_fbsd.a
-.endif
-
 .if exists(${.OBJDIR}/../cc_int)
 LIBCC_INT=	${.OBJDIR}/../cc_int/libcc_int.a
 .else
diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile
index d5a37ea66d55..1e697e3f5721 100644
--- a/gnu/usr.bin/cc/c++/Makefile
+++ b/gnu/usr.bin/cc/c++/Makefile
@@ -13,7 +13,7 @@ NOMAN=	1
 CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
 CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
 
-DPADD+=	${LIBCC_INT} ${LIBCC_FBSD}
-LDADD+=	${LIBCC_INT} ${LIBCC_FBSD}
+DPADD+=	${LIBCC_INT}
+LDADD+=	${LIBCC_INT}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index bc86c4de5233..98cfe53d7272 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -15,7 +15,7 @@ MLINKS=	gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1
 CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
 CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
 
-DPADD+=	${LIBCC_INT} ${LIBCC_FBSD}
-LDADD+=	${LIBCC_INT} ${LIBCC_FBSD}
+DPADD+=	${LIBCC_INT}
+LDADD+=	${LIBCC_INT}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc_fbsd/Makefile b/gnu/usr.bin/cc/cc_fbsd/Makefile
deleted file mode 100644
index c2df4fef6498..000000000000
--- a/gnu/usr.bin/cc/cc_fbsd/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-
-LIBCDIR=	${.CURDIR}/../../../../lib/libc
-
-.PATH: ${LIBCDIR}/gen ${LIBCDIR}/stdio
-
-LIB=		cc_fbsd
-INTERNALLIB=	YES
-
-SRCS=	getobjformat.c mktemp.c
-
-CFLAGS+= -D_open=open
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile
index 3ba15347903b..e7f557e6dc6e 100644
--- a/gnu/usr.bin/cc/cpp/Makefile
+++ b/gnu/usr.bin/cc/cpp/Makefile
@@ -11,7 +11,7 @@ NOMAN=	1
 CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
 CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
 
-DPADD+=	${LIBCC_INT} ${LIBCC_FBSD}
-LDADD+=	${LIBCC_INT} ${LIBCC_FBSD}
+DPADD+=	${LIBCC_INT}
+LDADD+=	${LIBCC_INT}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/f77/Makefile b/gnu/usr.bin/cc/f77/Makefile
index e209ff1d06b4..b03d9c82369d 100644
--- a/gnu/usr.bin/cc/f77/Makefile
+++ b/gnu/usr.bin/cc/f77/Makefile
@@ -10,8 +10,8 @@ SRCS=	gcc.c g77spec.c version.c
 CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
 CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
 
-DPADD=	${LIBCC_INT} ${LIBCC_FBSD}
-LDADD=	${LIBCC_INT} ${LIBCC_FBSD}
+DPADD=	${LIBCC_INT}
+LDADD=	${LIBCC_INT}
 
 CLEANFILES= f77.1