config.gcc (*-*-darwin*): Adjust t-make fragments for Darwin.

2010-05-28  Iain Sandoe  <iains@gcc.gnu.org>

        * config.gcc (*-*-darwin*): Adjust t-make fragments for Darwin.

From-SVN: r159979

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5531ad6c24fa32eaabf4cc637e86cb3af6fa7fe2..a4903566b0fe08b69f03e1a8a506bd00a3c96ff4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-28  Iain Sandoe  <iains@gcc.gnu.org>
+
+        * config.gcc (*-*-darwin*): Adjust t-make fragments for Darwin.
+
 2010-05-28  Maxim Kuvyrkov  <maxim@codesourcery.com>
 
        PR bootstrap/44314

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 022997a0a4c9f950de082fd61de736d1632e8f7c..fbee45e6cbc694e680339c72fee14d4aba4db903 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -408,6 +408,7 @@ esac
 # Common parts for widely ported systems.
 case ${target} in
 *-*-darwin*)
+  tmake_file="t-darwin ${cpu_type}/t-darwin"
   tm_file="${tm_file} darwin.h"
   case ${target} in
   *-*-darwin9*)
@@ -419,7 +420,6 @@ case ${target} in
   esac
   tm_file="${tm_file} ${cpu_type}/darwin.h"
   tm_p_file="${tm_p_file} darwin-protos.h"
-  tmake_file="t-darwin ${cpu_type}/t-darwin t-slibgcc-darwin"
   target_gtfiles="\$(srcdir)/config/darwin.c"
   extra_options="${extra_options} darwin.opt"
   c_target_objs="${c_target_objs} darwin-c.o"
@@ -1097,12 +1097,12 @@ 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-crtpc i386/t-crtfm"
+       tmake_file="${tmake_file} t-slibgcc-darwin i386/t-crtpc i386/t-crtfm"
        lto_binary_reader=lto-macho
        ;;
 x86_64-*-darwin*)
        with_cpu=${with_cpu:-generic}
-       tmake_file="${tmake_file} t-darwin ${cpu_type}/t-darwin64 t-slibgcc-darwin i386/t-crtpc i386/t-crtfm"
+       tmake_file="${tmake_file} ${cpu_type}/t-darwin64 t-slibgcc-darwin i386/t-crtpc i386/t-crtfm"
        tm_file="${tm_file} ${cpu_type}/darwin64.h"
        lto_binary_reader=lto-macho
        ;;
@@ -1923,13 +1923,14 @@ powerpc-*-darwin*)
          *-darwin[0-6]*)
            ;;
        esac
+       tmake_file="${tmake_file} t-slibgcc-darwin"
        lto_binary_reader=lto-macho
        extra_headers=altivec.h
        ;;
 powerpc64-*-darwin*)
        extra_options="${extra_options} ${cpu_type}/darwin.opt"
        extra_parts="crt2.o"
-       tmake_file="t-darwin ${cpu_type}/t-darwin ${cpu_type}/t-darwin64 t-slibgcc-darwin"
+       tmake_file="${tmake_file} ${cpu_type}/t-darwin64 t-slibgcc-darwin"
        tm_file="${tm_file} ${cpu_type}/darwin8.h ${cpu_type}/darwin64.h"
        lto_binary_reader=lto-macho
        extra_headers=altivec.h