Switch to using libiberty in new location.

Disable building of cxxfilt in gcc, build it from its own directory.

10 files changed, 55 insertions, 40 deletions

diff --git a/gnu/egcs/Makefile.bsd-wrapper b/gnu/egcs/Makefile.bsd-wrapper
index ab9f1ab30e5..ca5e7f62dc2 100644
--- a/gnu/egcs/Makefile.bsd-wrapper
+++ b/gnu/egcs/Makefile.bsd-wrapper
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.5 2001/09/11 17:35:46 jason Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.6 2003/11/24 17:12:55 espie Exp $
 
-SUBDIR+= libiberty libio libstdc++ libf2c libobjc
+SUBDIR+= libio libf2c libstdc++ libobjc
 
 # just so that the main directory will have a subdir, which simplifies
 # libf2c/libobjc build 
diff --git a/gnu/egcs/gcc/Makefile.bsd-wrapper b/gnu/egcs/gcc/Makefile.bsd-wrapper
index e8d05ae67dd..b3f4c76c457 100644
--- a/gnu/egcs/gcc/Makefile.bsd-wrapper
+++ b/gnu/egcs/gcc/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.15 2003/04/08 01:55:05 millert Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.16 2003/11/24 17:12:55 espie Exp $
 
 MAN=		cccp.1 gcc.1 gcc-local.1 protoize.1 gcov.1
 MLINKS+=	gcc.1 cc.1
@@ -14,10 +14,23 @@ MLINKS+=	g++.1 c++.1
 MLINKS+=	g77.1 f77.1
 .endif
 
+LIBIBERTY_INCLUDES=${.CURDIR}/../../lib/libiberty/include
+GNUCFLAGS=	${CFLAGS} ${COPTS} -DOPENBSD_NATIVE \
+		-I${LIBIBERTY_INCLUDES}
+
 VAXHOST_CFLAGS=	-DIN_GCC -DOPENBSD_NATIVE -DHAVE_CONFIG_H -O0
+MAKE_FLAGS= 	CFLAGS="${GNUCFLAGS}" \
+		CC="${CC}" LDFLAGS="${LDSTATIC}" \
+		DEMANGLER_PROG= \
+		DEMANGLE_H= \
+		LIBIBERTY_INCLUDES=${LIBIBERTY_INCLUDES} \
+		build_infodir=.
+
+.if ${MACHINE_ARCH} == "vax"
+MAKE_FLAGS+=	HOST_CFLAGS="${VAXHOST_CFLAGS}"
+.endif
 
 GXX_INCDIR=	/usr/include/g++
-GNUCFLAGS=	CFLAGS="${CFLAGS} ${COPTS} -DOPENBSD_NATIVE"
 CLEANFILES=	.gdbinit */.gdbinit *.info* \
 		c-parse.c c-parse.h c-parse.y cexp.c cp/parse.c cp/parse.h \
 		f/*.info* objc-parse.c objc-parse.y target_path \
@@ -36,20 +49,13 @@ M_ARCH=		${MACHINE_ARCH}
 .endif
 
 
-GCCARCH=	${M_ARCH}-unknown-openbsd`uname -r`
+GCCARCH=	${M_ARCH}-unknown-openbsd${OSREV}
 
 all:	config.status
-.if ${MACHINE_ARCH} == "vax"
-	${MAKE} ${GNUCFLAGS} CC="${CC}" LDFLAGS="${LDSTATIC}" \
-		HOST_CFLAGS="${VAXHOST_CFLAGS}" build_infodir=. all doc
-.else
-	${MAKE} ${GNUCFLAGS} CC="${CC}" LDFLAGS="${LDSTATIC}" \
-		build_infodir=. all doc
-.endif
+	exec ${MAKE} ${MAKE_FLAGS} all doc
 
 tree-check.h: config.status
-	${MAKE} ${GNUCFLAGS} CC="${CC}" LDFLAGS="${LDSTATIC}" \
-		build_infodir=. tree-check.h
+	exec ${MAKE} ${MAKE_FLAGS} $@
 
 
 .FORCE:	.IGNORE
@@ -95,10 +101,10 @@ target_path: Makefile
 	echo /usr/lib/gcc-lib/$$__target/$$__version >target_path
 
 install:	maninstall target_path
-	${MAKE} ${GNUCFLAGS} prefix=${DESTDIR}/usr \
+	${MAKE} ${MAKE_FLAGS} \
+		prefix=${DESTDIR}/usr \
 		INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
 		infodir=${DESTDIR}/usr/share/info \
-		build_infodir=. \
 		tooldir=/tmp assertdir=/tmp \
 		INSTALL_TARGET='install-common $$(INSTALL_HEADERS) \
 		     $$(INSTALL_LIBGCC) install-info \
diff --git a/gnu/egcs/gcc/Makefile.in b/gnu/egcs/gcc/Makefile.in
index a5eeadfd0f5..37f89a8d60b 100644
--- a/gnu/egcs/gcc/Makefile.in
+++ b/gnu/egcs/gcc/Makefile.in
@@ -29,6 +29,7 @@
 
 # Directory where sources are, from where we are.
 srcdir = @srcdir@
+LIBIBERTY_INCLUDES=$(srcdir)/../include
 VPATH = @srcdir@
 
 # Variables that exist for you to override.
@@ -762,7 +763,7 @@ RTL_BASE_H = rtl.h rtl.def machmode.h machmode.def
 RTL_H = $(RTL_BASE_H) genrtl.h
 TREE_H = tree.h real.h tree.def machmode.h machmode.def tree-check.h
 BASIC_BLOCK_H = basic-block.h bitmap.h sbitmap.h
-DEMANGLE_H = $(srcdir)/../include/demangle.h
+DEMANGLE_H = $(LIBIBERTY_INCLUDES)/demangle.h
 RECOG_H = recog.h
 EXPR_H = expr.h insn-codes.h
 REGS_H = regs.h varray.h machmode.h machmode.def
@@ -1368,7 +1369,7 @@ collect2$(exeext): $(COLLECT2_OBJS) $(LIBDEPS)
 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(COLLECT2_OBJS) $(LIBS)
 
 collect2.o : collect2.c $(CONFIG_H) system.h gstab.h intl.h \
-	$(srcdir)/../include/obstack.h $(DEMANGLE_H) collect2.h
+	$(LIBIBERTY_INCLUDES)/obstack.h $(DEMANGLE_H) collect2.h
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES)  \
 	-DTARGET_MACHINE=\"$(target_alias)\" $(MAYBE_USE_COLLECT2) \
 	-c `echo $(srcdir)/collect2.c | sed 's,^\./,,'`
@@ -1503,7 +1504,7 @@ dbxout.o : dbxout.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) flags.h $(REGS_H) \
    toplev.h
 sdbout.o : sdbout.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) flags.h except.h \
    function.h $(EXPR_H) output.h hard-reg-set.h $(REGS_H) defaults.h real.h \
-   insn-config.h $(srcdir)/../include/obstack.h xcoffout.h c-pragma.h \
+   insn-config.h $(LIBIBERTY_INCLUDES)/obstack.h xcoffout.h c-pragma.h \
    sdbout.h toplev.h
 dwarfout.o : dwarfout.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) dwarf.h \
    flags.h insn-config.h reload.h output.h defaults.h toplev.h dwarfout.h
@@ -1514,7 +1515,7 @@ xcoffout.o : xcoffout.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) xcoffout.h \
    flags.h toplev.h output.h dbxout.h
 emit-rtl.o : emit-rtl.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \
    except.h function.h $(REGS_H) insn-config.h $(RECOG_H) real.h \
-   $(EXPR_H) $(srcdir)/../include/obstack.h hard-reg-set.h bitmap.h toplev.h
+   $(EXPR_H) $(LIBIBERTY_INCLUDES)/obstack.h hard-reg-set.h bitmap.h toplev.h
 real.o : real.c $(CONFIG_H) system.h $(TREE_H) toplev.h
 getpwd.o : getpwd.c $(CONFIG_H) system.h
 
@@ -1530,7 +1531,7 @@ stupid.o : stupid.c $(CONFIG_H) system.h $(RTL_H) $(REGS_H) hard-reg-set.h \
 
 cse.o : cse.c $(CONFIG_H) system.h $(RTL_H) $(REGS_H) hard-reg-set.h flags.h \
    real.h insn-config.h $(RECOG_H) $(EXPR_H) toplev.h output.h \
-   $(srcdir)/../include/hashtab.h
+   $(LIBIBERTY_INCLUDES)/hashtab.h
 gcse.o : gcse.c $(CONFIG_H) system.h $(RTL_H) $(REGS_H) hard-reg-set.h \
    flags.h real.h insn-config.h $(RECOG_H) $(EXPR_H) $(BASIC_BLOCK_H) \
    output.h toplev.h
@@ -2026,7 +2027,7 @@ protoize$(exeext): protoize.o $(PROTO_OBJS) $(LIBDEPS)
 unprotoize$(exeext): unprotoize.o $(PROTO_OBJS) $(LIBDEPS)
 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ unprotoize.o $(PROTO_OBJS) $(LIBS)
 
-protoize.o: protoize.c $(srcdir)/../include/getopt.h $(CONFIG_H) system.h \
+protoize.o: protoize.c $(LIBIBERTY_INCLUDES)/getopt.h $(CONFIG_H) system.h \
    Makefile
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
           -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
@@ -2037,7 +2038,7 @@ protoize.o: protoize.c $(srcdir)/../include/getopt.h $(CONFIG_H) system.h \
 	  -DSTD_PROTO_DIR=\"$(libsubdir)\" \
 	  $(srcdir)/protoize.c
 
-unprotoize.o: unprotoize.c protoize.c $(srcdir)/../include/getopt.h \
+unprotoize.o: unprotoize.c protoize.c $(LIBIBERTY_INCLUDES)/getopt.h \
    $(CONFIG_H) system.h Makefile
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
           -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
@@ -2229,7 +2230,7 @@ fix-header: fix-header.o scan-decls.o scan.o xsys-protos.h $(HOST_LIBDEPS) \
 	$(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ fix-header.o \
 	   scan-decls.o scan.o libcpp.a $(HOST_LIBS)
 
-fix-header.o: fix-header.c $(srcdir)/../include/obstack.h scan.h \
+fix-header.o: fix-header.c $(LIBIBERTY_INCLUDES)/obstack.h scan.h \
 	xsys-protos.h $(build_xm_file) system.h cpplib.h cpphash.h
 	$(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/fix-header.c
 
diff --git a/gnu/egcs/gcc/config/x-openbsd b/gnu/egcs/gcc/config/x-openbsd
index 727e4359fa1..605573897a8 100644
--- a/gnu/egcs/gcc/config/x-openbsd
+++ b/gnu/egcs/gcc/config/x-openbsd
@@ -1,4 +1,10 @@
 # enforce yacc...
 BISON=yacc
-# and we want our libiberty too
-LIBIBERTY=-liberty
+# no built libiberty
+LIBIBERTY=
+# because it's a `system lib'
+CLIB=-liberty
+# and so, we get obstack from there too
+OBSTACK=
+# don't build c++filt from there
+DEMANGLER_PROG=
diff --git a/gnu/egcs/gcc/cp/Makefile.in b/gnu/egcs/gcc/cp/Makefile.in
index b0cccf2a9f3..7f49dfa5124 100644
--- a/gnu/egcs/gcc/cp/Makefile.in
+++ b/gnu/egcs/gcc/cp/Makefile.in
@@ -102,6 +102,7 @@ tmake_file=@dep_tmake_file@
 # Directory where sources are, from where we are.
 srcdir = @srcdir@
 VPATH = @srcdir@
+LIBIBERTY_INCLUDES=$(srcdir)/../../include
 
 # Additional system libraries to link with.
 CLIB=
@@ -262,14 +263,14 @@ decl2.o : decl2.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h \
   lex.h decl.h $(EXPR_H) $(srcdir)/../except.h \
   $(srcdir)/../output.h $(srcdir)/../except.h $(srcdir)/../system.h \
   $(srcdir)/../toplev.h $(srcdir)/../dwarf2out.h $(srcdir)/../dwarfout.h \
-  $(srcdir)/../../include/splay-tree.h $(srcdir)/../varray.h
+  $(LIBIBERTY_INCLUDES)/splay-tree.h $(srcdir)/../varray.h
 typeck2.o : typeck2.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h \
   $(srcdir)/../system.h $(srcdir)/../toplev.h
 typeck.o : typeck.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h $(RTL_H) \
   $(EXPR_H) $(srcdir)/../system.h $(srcdir)/../toplev.h
 class.o : class.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h \
   $(srcdir)/../system.h $(srcdir)/../toplev.h \
-  $(srcdir)/../../include/splay-tree.h
+  $(LIBIBERTY_INCLUDES)/splay-tree.h
 call.o : call.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h \
   $(srcdir)/../system.h $(srcdir)/../toplev.h
 friend.o : friend.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h $(RTL_H) \
diff --git a/gnu/egcs/libf2c/Makefile.bsd-wrapper b/gnu/egcs/libf2c/Makefile.bsd-wrapper
index 20c955e88eb..d95f677f3c7 100644
--- a/gnu/egcs/libf2c/Makefile.bsd-wrapper
+++ b/gnu/egcs/libf2c/Makefile.bsd-wrapper
@@ -1,5 +1,6 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.5 2002/05/30 20:46:04 espie Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.6 2003/11/24 17:12:55 espie Exp $
 
+LIBIBERTY_INCLUDES=$(.CURDIR)/../../lib/libiberty/include
 EGCS_DIR= $(.CURDIR)/..
 .if defined(OBJMACHINE)
 OBJDIR=	obj.${MACHINE}
@@ -37,7 +38,7 @@ U77_SRCS = gerror_.c perror_.c ierrno_.c itime_.c time_.c \
 DEFS=-DAllow_TYQUAD -DSTDC_HEADERS=1 -D_POSIX_SOURCE=1 -DHAVE_TEMPNAM=1 \
 -DNON_ANSI_RW_MODES=1 -DNO_EOF_CHAR_CHECK=1 -DSkip_f2c_Undefs=1 \
 -DRETSIGTYPE=void -DIEEE_drem=1 -DHAVE_CONFIG_H \
--IlibU77 -I${.CURDIR}/libI77 -I${.OBJDIR} -I${.CURDIR}
+-I${LIBIBERTY_INCLUDES} -IlibU77 -I${.CURDIR}/libI77 -I${.OBJDIR} -I${.CURDIR}
 
 MISC =	F77_aloc.c s_rnge.c abort_.c getarg_.c iargc_.c\
 	getenv_.c signal_.c s_stop.c s_paus.c system_.c cabs.c\
@@ -138,6 +139,7 @@ config.status: Makefile.in configure
 		make -f Makefile.bsd-wrapper config.status tree-check.h 
 	# fake g771 existence
 	cd $(EGCS_OBJDIR)/gcc && touch f771
+	CPPFLAGS="$(CFLAGS)" \
 	PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
 	r=$(EGCS_OBJDIR) \
 	INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
diff --git a/gnu/egcs/libobjc/Makefile.bsd-wrapper b/gnu/egcs/libobjc/Makefile.bsd-wrapper
index d00cf84ad6b..c580898a6be 100644
--- a/gnu/egcs/libobjc/Makefile.bsd-wrapper
+++ b/gnu/egcs/libobjc/Makefile.bsd-wrapper
@@ -1,9 +1,8 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.5 2001/11/22 20:37:18 espie Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.6 2003/11/24 17:12:55 espie Exp $
 
 LIB=		objc
 
-#CXXFLAGS+=	-fno-implicit-templates
-#CPPFLAGS+=	-I$(.CURDIR) -I$(.CURDIR)/stl -I$(.CURDIR)/../libio -I$(IO_OBJDIR)
+LIBIBERTY_INCLUDES=${.CURDIR}/../../lib/libiberty/include
 #LDADD+=		-lm
 
 EGCS_DIR= $(.CURDIR)/..
@@ -19,7 +18,7 @@ EGCS_OBJDIR!=	if [ -d $(EGCS_DIR)/$(OBJDIR) ]; then \
 		fi
 
 CPPFLAGS+= -I. -I$(.CURDIR) -I$(.CURDIR)/objc  -I$(.CURDIR)/../gcc \
--I$(.CURDIR)/../gcc/config  -I$(EGCS_OBJDIR)/gcc -I$(.CURDIR)/../include \
+-I$(.CURDIR)/../gcc/config  -I$(EGCS_OBJDIR)/gcc -I$(LIBIBERTY_INCLUDES) \
 -DIN_GCC
 
 SRCS=archive.c class.c encoding.c gc.c hash.c init.c linking.m misc.c \
diff --git a/gnu/egcs/libstdc++/Makefile.bsd-wrapper b/gnu/egcs/libstdc++/Makefile.bsd-wrapper
index 72e89159dd0..0e2ff573042 100644
--- a/gnu/egcs/libstdc++/Makefile.bsd-wrapper
+++ b/gnu/egcs/libstdc++/Makefile.bsd-wrapper
@@ -1,11 +1,11 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.12 2003/02/09 19:31:50 espie Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.13 2003/11/24 17:12:55 espie Exp $
 
 .if (${MACHINE_ARCH} == "mips")
 NOPIC=
 .endif
 
 IO_DIR=		$(.CURDIR)/../libio
-LIBIBERTY_DIR=	$(.CURDIR)/../libiberty
+LIBIBERTY_DIR=	$(.CURDIR)/../../lib/libiberty
 STD_DIR=	$(.CURDIR)/std
 
 .if defined(OBJMACHINE)
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 3ad62edb3fc..058fda6bc6c 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -1,5 +1,5 @@
-#	$OpenBSD: Makefile,v 1.8 2001/03/18 17:39:55 millert Exp $
+#	$OpenBSD: Makefile,v 1.9 2003/11/24 17:12:55 espie Exp $
 
-SUBDIR+=../egcs libreadline
+SUBDIR+=libiberty ../egcs libreadline 
 
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index de478bebb0f..e2a7a1ef539 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.39 2003/10/15 07:47:08 mickey Exp $
+#	$OpenBSD: Makefile,v 1.40 2003/11/24 17:12:55 espie Exp $
 #	$NetBSD: Makefile,v 1.35 1996/04/03 21:20:52 chuck Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR+=	../egcs/gcc
-SUBDIR+=	cvs groff lynx rcs sendbug binutils
+SUBDIR+=	cxxfilt cvs groff lynx rcs sendbug binutils
 
 # most ports use binutils gas and ld, some do not (yet).
 .if ${ELF_TOOLCHAIN:L} == "no"