Index: config/darwin-assert.h
===================================================================
RCS file: config/darwin-assert.h
diff -N config/darwin-assert.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ config/darwin-assert.h	8 Nov 2004 21:26:04 -0000
@@ -0,0 +1,21 @@
+#include <stdlib.h>
+#include <stdio.h>
+
+/* Allow this file to be included multiple times
+   with different settings of NDEBUG.  */
+#undef assert
+#undef __assert
+
+#ifdef NDEBUG
+#define assert(ignore) ((void) 0)
+#else
+
+#define assert(expression)  \
+  ((void) ((expression) ? 0 : __assert (#expression, __FUNCTION__, __FILE__, __LINE__)))
+
+#define __assert(expression, function, file, lineno)  \
+  (printf ("%s:%u: In `%s' failed assertion `%s'\n",		\
+	      file, lineno, function, expression),	\
+   abort (), 0)
+
+#endif
Index: config/t-darwin-pre8
===================================================================
RCS file: config/t-darwin-pre8
diff -N config/t-darwin-pre8
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ config/t-darwin-pre8	8 Nov 2004 21:26:04 -0000
@@ -0,0 +1,5 @@
+EXTRA_HEADERS += $(objdir)/darwininclude/assert.h
+$(objdir)/darwininclude/assert.h: $(srcdir)/config/darwin-assert.h
+	mkdir -p $(objdir)/darwininclude
+	cp $(srcdir)/config/darwin-assert.h $(objdir)/darwininclude/assert.h
+
Index: config.gcc
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config.gcc,v
retrieving revision 1.495
diff -u -p -r1.495 config.gcc
--- config.gcc	21 Oct 2004 22:28:22 -0000	1.495
+++ config.gcc	8 Nov 2004 21:26:04 -0000
@@ -332,12 +332,16 @@ esac
 case ${target} in
 *-*-darwin*)
   case ${target} in
-    *-darwin[0-6]*) ;;
+    *-darwin[0-6] | *-darwin[0-6].*) ;;
     *) tm_file="${tm_file} darwin7.h" ;;
   esac
   tm_file="${tm_file} darwin.h"
   tm_p_file="${tm_p_file} darwin-protos.h"
   tmake_file="t-darwin t-slibgcc-darwin"
+  case ${target} in
+    *-darwin[0-7] | *-darwin[0-7].*) tmake_file="${tmake_file} t-darwin-pre8";;
+    *) ;;
+  esac
   target_gtfiles="\$(srcdir)/config/darwin.c"
   c_target_objs="darwin-c.o"
   cxx_target_objs="darwin-c.o"