diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 72c8dbb3106..8c8fc500692 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,8 +1,15 @@
+2007-06-15  Eric Christopher  <echristo@apple.com>
+
+	* config.gcc (i?86-*-darwin*): Add t-crtfm and t-crtpc.
+	(x86_64-*-darwin*): Ditto.
+	* config/i386/darwin.h (CRTEND_SPEC): New. Add support
+	for above.
+
 2007-06-15  Matthew Wilcox <matthew@wil.cx>
 
 	* doc/extend.texi: Document behavior of __attribute__((aligned))
 	on typedefs.
-	
+
 2007-06-15  Mark Mitchell  <mark@codesourcery.com>
 
 	* rtlanal.c (note_stores): Improve documentation.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 24364e8b67b..9700c046e3c 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1054,11 +1054,11 @@ i[34567]86-*-darwin*)
 	# then this file using that to set --with-cpu=i386 which has no -m64
 	# support.
 	with_cpu=${with_cpu:-generic}
-	tmake_file="${tmake_file} i386/t-fprules-softfp64 soft-fp/t-softfp"
+	tmake_file="${tmake_file} i386/t-fprules-softfp64 soft-fp/t-softfp i386/t-crtpc i386/t-crtfm"
 	;;
 x86_64-*-darwin*)
 	with_cpu=${with_cpu:-generic}
-	tmake_file="t-darwin ${cpu_type}/t-darwin64 t-slibgcc-darwin i386/t-fprules-softfp64 soft-fp/t-softfp"
+	tmake_file="t-darwin ${cpu_type}/t-darwin64 t-slibgcc-darwin i386/t-fprules-softfp64 soft-fp/t-softfp i386/t-crtpc i386/t-crtfm"
 	tm_file="${tm_file} ${cpu_type}/darwin64.h"
 	;;
 i[34567]86-*-elf*)
diff --git a/gcc/config/i386/darwin.h b/gcc/config/i386/darwin.h
index 9cc5e542445..d793e025665 100644
--- a/gcc/config/i386/darwin.h
+++ b/gcc/config/i386/darwin.h
@@ -108,6 +108,13 @@ Boston, MA 02110-1301, USA.  */
     ,objective-c++-header|,objc++-cpp-output:10.5;	\
     :10.4}"
 
+#undef ENDFILE_SPEC
+#define ENDFILE_SPEC \
+  "%{ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \
+   %{mpc32:crtprec32.o%s} \
+   %{mpc64:crtprec64.o%s} \
+   %{mpc80:crtprec80.o%s}"
+
 #undef SUBTARGET_EXTRA_SPECS
 #define SUBTARGET_EXTRA_SPECS                                   \
   DARWIN_EXTRA_SPECS                                            \