Minimum set of changes to switch from Gcc 2.7.2 (in contrib/gcc) to Egcs 1.1.2

(in contrib/egcs)

1 files changed, 66 insertions, 9 deletions

diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index f2841d9..01e9c62 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -1,8 +1,9 @@
 #
-# $Id: Makefile,v 1.19 1999/01/09 21:50:55 jdp Exp $
+# $Id: Makefile,v 1.25 1999/03/14 21:30:05 obrien Exp $
 #
 
-GCCDIR=	${.CURDIR}/../../../contrib/gcc
+GCCDIR=	${.CURDIR}/../../../contrib/egcs/gcc
+
 .PATH:  ${GCCDIR}/cp ${GCCDIR}
 
 LIB=	gcc
@@ -25,6 +26,7 @@ INSTALL_PIC_ARCHIVE=  yes
 # (CC).
 #
 XCC=	${CC}
+XCXX=	${CXX}
 
 # Members of libgcc1.a.
 LIB1FUNCS= _mulsi3 _udivsi3 _divsi3 _umodsi3 _modsi3 \
@@ -42,14 +44,27 @@ LIB2FUNCS= _muldi3 _divdi3 _moddi3 _udivdi3 _umoddi3 _negdi2 \
 	   _fixunsdfsi _fixunssfsi _fixunsdfdi _fixdfdi _fixunssfdi _fixsfdi \
 	   _fixxfdi _fixunsxfdi _floatdixf _fixunsxfsi \
 	   _fixtfdi _fixunstfdi _floatditf \
-	   __gcc_bcmp _varargs _eprintf _op_new _op_vnew _new_handler \
-	   _op_delete \
-	   _op_vdel _bb _shtab _clear_cache _trampoline __main _exit _ctors \
+	   __gcc_bcmp _varargs __dummy _eprintf \
+	   _bb _shtab _clear_cache _trampoline __main _exit _ctors \
 	   _eh _pure
 
+# Library members defined in new1.cc.
+NEW1FUNCS= _op_new _op_newnt 
+
+# Library members defined in new2.cc.
+NEW2FUNCS= _op_vnew _op_vnewnt _op_delete _op_delnt _op_vdel _op_vdelnt 
+
+SRCS=	frame.c tinfo.cc tinfo2.cc new.cc exception.cc
+
+CFLAGS+=	-I${GCCDIR}/config -I${GCCDIR} -I.
+CFLAGS+=	-fexceptions
+CFLAGS+=	-DIN_GCC
+CXXFLAGS+=	-I${GCCDIR}/cp/inc
+CXXFLAGS+=	-nostdinc++
+
 COMMONHDRS=	config.h tconfig.h tm.h
-CFLAGS+=	-I${GCCDIR}/config -I.
 CLEANFILES+=	${COMMONHDRS}
+SRCS+=		${COMMONHDRS}
 
 LIB1OBJS=	${LIB1FUNCS:S/$/.o/}
 LIB2OBJS=	${LIB2FUNCS:S/$/.o/}
@@ -57,14 +72,26 @@ LIB1SOBJS=	${LIB1FUNCS:S/$/.So/}
 LIB2SOBJS=	${LIB2FUNCS:S/$/.So/}
 LIB1POBJS=	${LIB1FUNCS:S/$/.po/}
 LIB2POBJS=	${LIB2FUNCS:S/$/.po/}
+NEW1OBJS=	${NEW1FUNCS:S/$/.o/}
+NEW2OBJS=	${NEW2FUNCS:S/$/.o/}
+NEW1SOBJS=	${NEW1FUNCS:S/$/.So/}
+NEW2SOBJS=	${NEW2FUNCS:S/$/.So/}
+NEW1POBJS=	${NEW1FUNCS:S/$/.po/}
+NEW2POBJS=	${NEW2FUNCS:S/$/.po/}
 
-OBJS=		${LIB1OBJS} ${LIB2OBJS}
+OBJS=		${LIB1OBJS} ${LIB2OBJS} ${NEW1OBJS} ${NEW2OBJS}
 
-config.h tconfig.h:
+config.h:
 	echo '#include "${MACHINE_ARCH}/xm-freebsd.h"' > ${.TARGET}
 
+tconfig.h:
+	echo '#include "${MACHINE_ARCH}/xm-${MACHINE_ARCH}.h"' > ${.TARGET}
+
 tm.h:
-	echo '#include "${MACHINE_ARCH}/freebsd.h"' > ${.TARGET}
+	echo '#include "${MACHINE_ARCH}/${MACHINE_ARCH}.h"' > ${.TARGET}
+	echo '#include "${MACHINE_ARCH}/att.h"' >> ${.TARGET}
+	echo '#include "${MACHINE_ARCH}/freebsd.h"' >> ${.TARGET}
+	echo '#include "${MACHINE_ARCH}/perform.h"' >> ${.TARGET}
 
 ${OBJS}: ${COMMONHDRS}
 
@@ -78,6 +105,16 @@ ${LIB2OBJS}: libgcc2.c
 	@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
 	@mv ${.TARGET}.tmp ${.TARGET}
 
+${NEW1OBJS}: new1.cc
+	${XCXX} -c ${CXXFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.cc}
+	@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
+	@mv ${.TARGET}.tmp ${.TARGET}
+
+${NEW2OBJS}: new2.cc
+	${CXX} -c ${CXXFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.cc}
+	@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
+	@mv ${.TARGET}.tmp ${.TARGET}
+
 .if !defined(NOPIC)
 ${LIB1SOBJS}: libgcc1.c
 	${CC} -c -fpic ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
@@ -88,6 +125,16 @@ ${LIB2SOBJS}: libgcc2.c
 	${XCC} -c -fpic ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 	@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
 	@mv ${.TARGET}.tmp ${.TARGET}
+
+${NEW1SOBJS}: new1.cc
+	${XCXX} -c -fpic ${CXXFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.cc}
+	@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
+	@mv ${.TARGET}.tmp ${.TARGET}
+
+${NEW2SOBJS}: new2.cc
+	${CXX} -c -fpic ${CXXFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.cc}
+	@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
+	@mv ${.TARGET}.tmp ${.TARGET}
 .endif
 
 .if !defined(NOPROFILE)
@@ -100,6 +147,16 @@ ${LIB2POBJS}: libgcc2.c
 	${XCC} -c -p ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 	@${LD} -o ${.TARGET}.tmp -X -r ${.TARGET}
 	@mv ${.TARGET}.tmp ${.TARGET}
+
+${NEW1POBJS}: new1.cc
+	${XCXX} -c -p ${CXXFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.cc}
+	@${LD} -o ${.TARGET}.tmp -X -r ${.TARGET}
+	@mv ${.TARGET}.tmp ${.TARGET}
+
+${NEW2POBJS}: new2.cc
+	${CXX} -c -p ${CXXFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.cc}
+	@${LD} -o ${.TARGET}.tmp -X -r ${.TARGET}
+	@mv ${.TARGET}.tmp ${.TARGET}
 .endif
 
 .include <bsd.lib.mk>