diff -u -r /freebsd/gcc-2.6.1/cccp.c ./cccp.c --- /freebsd/gcc-2.6.1/cccp.c Tue Oct 25 15:37:44 1994 +++ ./cccp.c Wed Nov 2 17:36:25 1994 @@ -188,7 +188,7 @@ #ifndef VMS #ifndef HAVE_STRERROR extern int sys_nerr; -#if defined(bsd4_4) || defined(__NetBSD__) +#if defined(bsd4_4) || defined(__NetBSD__) || defined(__FreeBSD__) extern const char *const sys_errlist[]; #else extern char *sys_errlist[]; Only in .: cccp.c.orig Only in .: cccp.o Only in .: cexp.o diff -u -r /freebsd/gcc-2.6.1/collect2.c ./collect2.c --- /freebsd/gcc-2.6.1/collect2.c Thu Oct 20 15:05:46 1994 +++ ./collect2.c Wed Nov 2 17:36:25 1994 @@ -41,7 +41,7 @@ extern int errno; #endif -#if defined(bsd4_4) || defined(__NetBSD__) +#if defined(bsd4_4) || defined(__NetBSD__) || defined(__FreeBSD__) extern const char *const sys_errlist[]; #else extern char *sys_errlist[]; Only in .: collect2.c.orig diff -u -r /freebsd/gcc-2.6.1/config/i386/freebsd.h ./config/i386/freebsd.h --- /freebsd/gcc-2.6.1/config/i386/freebsd.h Tue Oct 18 17:59:52 1994 +++ ./config/i386/freebsd.h Wed Nov 2 17:36:37 1994 @@ -33,11 +33,13 @@ #undef CPP_PREDEFINES #define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#if 0 #define INCLUDE_DEFAULTS { \ { "/usr/include", 0 }, \ { "/usr/include/g++", 1 }, \ { 0, 0} \ } +#endif /* Like the default, except no -lg. */ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}" Only in ./config/i386: freebsd.h.orig diff -u -r /freebsd/gcc-2.6.1/config/i386/x-freebsd ./config/i386/x-freebsd --- /freebsd/gcc-2.6.1/config/i386/x-freebsd Mon Oct 31 04:52:41 1994 +++ ./config/i386/x-freebsd Wed Nov 2 18:45:36 1994 @@ -1,3 +1,6 @@ # Don't run fixproto STMP_FIXPROTO = -CLIB=-lgnumalloc +CLIB = -lgnumalloc + +# Find FreeBSD's includes before resorting to GCC's +LIBGCC2_INCLUDES -I/usr/include Only in .: config.h Only in .: config.status Only in ./cp: Makefile diff -u -r /freebsd/gcc-2.6.1/cp/g++.c ./cp/g++.c --- /freebsd/gcc-2.6.1/cp/g++.c Sat Oct 29 04:17:44 1994 +++ ./cp/g++.c Wed Nov 2 17:36:42 1994 @@ -84,7 +84,7 @@ #endif extern int sys_nerr; -#if defined(bsd4_4) || defined(__NetBSD__) +#if defined(bsd4_4) || defined(__NetBSD__) || defined(__FreeBSD__) extern const char *const sys_errlist[]; #else extern char *sys_errlist[]; Only in ./cp: g++.c.orig Only in ./cp: include Only in ./cp: stage1 Only in ./cp: stage2 Only in ./cp: stage3 Only in ./cp: stage4 Only in .: cpp Only in .: float.h-nat diff -u -r /freebsd/gcc-2.6.1/gcc.c ./gcc.c --- /freebsd/gcc-2.6.1/gcc.c Thu Oct 27 15:49:58 1994 +++ ./gcc.c Wed Nov 2 17:36:43 1994 @@ -166,7 +166,7 @@ #endif extern int sys_nerr; -#if defined(bsd4_4) || defined(__NetBSD__) +#if defined(bsd4_4) || defined(__NetBSD__) || defined (__FreeBSD__) extern const char *const sys_errlist[]; #else extern char *sys_errlist[]; Only in .: gcc.c.orig Only in .: gfloat.h diff -u -r /freebsd/gcc-2.6.1/ginclude/stdarg.h ./ginclude/stdarg.h --- /freebsd/gcc-2.6.1/ginclude/stdarg.h Fri Jul 8 19:04:27 1994 +++ ./ginclude/stdarg.h Wed Nov 2 17:36:49 1994 @@ -136,13 +136,13 @@ But on BSD NET2 we must not test or define or undef it. (Note that the comments in NET 2's ansi.h are incorrect for _VA_LIST_--see stdio.h!) */ -#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) || defined (__FreeBSD__) +#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) /* The macro _VA_LIST is used in SCO Unix 3.2. */ #ifndef _VA_LIST /* The macro _VA_LIST_T_H is used in the Bull dpx2 */ #ifndef _VA_LIST_T_H #define _VA_LIST_T_H -#if !(defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) || defined (__FreeBSD__)) +#if !(defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) #define _VA_LIST_ #endif #define _VA_LIST Only in ./ginclude: stdarg.h.orig diff -u -r /freebsd/gcc-2.6.1/ginclude/stddef.h ./ginclude/stddef.h --- /freebsd/gcc-2.6.1/ginclude/stddef.h Fri Oct 7 16:22:35 1994 +++ ./ginclude/stddef.h Wed Nov 2 17:36:54 1994 @@ -22,7 +22,7 @@ /* On 4.3bsd-net2, make sure ansi.h is included, so we have one less case to deal with in the following. */ -#if defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__FreeBSD__) +#if defined (__BSD_NET2__) || defined (____FreeBSD____) #include #endif Only in ./ginclude: stddef.h.orig diff -u -r /freebsd/gcc-2.6.1/ginclude/varargs.h ./ginclude/varargs.h --- /freebsd/gcc-2.6.1/ginclude/varargs.h Fri Jul 8 19:04:32 1994 +++ ./ginclude/varargs.h Wed Nov 2 17:36:59 1994 @@ -151,13 +151,13 @@ /* Michael Eriksson at Thu Sep 30 11:00:57 1993: Sequent defines _VA_LIST_ in to be the type to use for va_list (``typedef _VA_LIST_ va_list'') */ -#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__) +#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) || defined (__sequent__) /* The macro _VA_LIST is used in SCO Unix 3.2. */ #ifndef _VA_LIST /* The macro _VA_LIST_T_H is used in the Bull dpx2 */ #ifndef _VA_LIST_T_H #define _VA_LIST_T_H -#if !(defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__)) +#if !(defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) || defined (__sequent__) #define _VA_LIST_ #endif #define _VA_LIST Only in ./ginclude: varargs.h.orig Only in .: hconfig.h Only in .: include Only in .: libgcc.a Only in .: libgcc1.a Only in .: libgcc2.a Only in .: libgcc2.ready Only in .: md Only in .: multilib.h Only in .: objc-headers Only in .: obstack.o diff -u -r /freebsd/gcc-2.6.1/protoize.c ./protoize.c --- /freebsd/gcc-2.6.1/protoize.c Tue Oct 4 20:17:40 1994 +++ ./protoize.c Wed Nov 2 17:37:00 1994 @@ -79,7 +79,7 @@ #undef getopt extern int errno; -#if defined(bsd4_4) || defined(__NetBSD__) +#if defined(bsd4_4) || defined(__NetBSD__) || defined (__FreeBSD__) extern const char *const sys_errlist[]; #else extern char *sys_errlist[]; Only in .: protoize.c.orig Only in .: stage1 Only in .: stmp-fixinc Only in .: stmp-headers Only in .: stmp-int-hdrs Only in .: tconfig.h Only in .: tm.h Only in .: version.o Only in .: xlimits.h