diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 22bb0a1b0bd..2872f636bdd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-02  Geoffrey Keating  <geoffk@apple.com>
+
+	* config/darwin8.h (LIB_SPEC): Switch -lmx and -lSystem.
+
 2005-03-02  Devang Patel  <dpatel@apple.com>
 	
 	Undo PR tree-optimization/18815 fix.
diff --git a/gcc/config/darwin8.h b/gcc/config/darwin8.h
index 6a061a41caf..639cb911c66 100644
--- a/gcc/config/darwin8.h
+++ b/gcc/config/darwin8.h
@@ -22,11 +22,13 @@ Boston, MA 02111-1307, USA.  */
 /* Darwin 7.0 and above have C99 functions.   */
 #define TARGET_C99_FUNCTIONS 1
 
-/* Machine dependent libraries.  Include libmx when compiling on Darwin 7.0
-   and above.  Include libSystemStubs when compiling on 8.0 and above and
-   not 64-bit long double.  */
+/* Machine dependent libraries.  Include libmx when compiling on
+   Darwin 7.0 and above, but before libSystem, since the functions are
+   actually in libSystem but for 7.x compatibility we want them to be
+   looked for in libmx first.  Include libSystemStubs when compiling
+   on 8.0 and above and not 64-bit long double.  */
 
 #undef	LIB_SPEC
 #define LIB_SPEC "%{!static:\
   %{!mlong-double-64:%{pg:-lSystemStubs_profile;:-lSystemStubs}} \
-  -lSystem -lmx}"
+  -lmx -lSystem}"