7 files changed, 9 insertions, 29 deletions

diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index bd4cc292a2d56..c4d939d71bc89 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 cc1 cpp0 protoize tradcpp0 doc
+SUBDIR= cc_tools cc_int cc cc1 cpp0 protoize tradcpp0 doc
 
 .if !defined(NO_CPP)
 SUBDIR+= cpp
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index e9f4867046bc7..b130243456ca1 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -40,12 +40,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 be231122fa938..c1a57b2bc6195 100644
--- a/gnu/usr.bin/cc/c++/Makefile
+++ b/gnu/usr.bin/cc/c++/Makefile
@@ -14,7 +14,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 0ad1e81913e9c..4f90e71a3ba25 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -17,7 +17,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 c2df4fef64982..0000000000000
--- 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 27e49835b344b..16b5eba73f273 100644
--- a/gnu/usr.bin/cc/cpp/Makefile
+++ b/gnu/usr.bin/cc/cpp/Makefile
@@ -12,7 +12,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 717a983118a91..101a8974b5831 100644
--- a/gnu/usr.bin/cc/f77/Makefile
+++ b/gnu/usr.bin/cc/f77/Makefile
@@ -12,8 +12,8 @@ NOMAN=	# not while compile from GCC repo checkout
 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