From eaec4980e139903ae9b274d1abcf3a13946603a8 Mon Sep 17 00:00:00 2001
From: Michael Matz <matz@gcc.gnu.org>
Date: Thu, 18 May 2006 13:19:27 +0000
Subject: [PATCH] re PR target/27599 (build failure on mingw)

	PR target/27599
	* config.host: Make assignments to host_xmake_file cumulative.
	* config.host (*-darwin*): Test $host, not $target.

From-SVN: r113886
---
 gcc/ChangeLog   | 10 ++++++++--
 gcc/config.host | 28 ++++++++++++++--------------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4759c32b81c..8465db33d04 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,12 @@
+2006-05-18  Michael Matz  <matz@suse.de>
+
+	PR target/27599
+	* config.host: Make assignments to host_xmake_file cumulative.
+	* config.host (*-darwin*): Test $host, not $target.
+
 2006-05-12  Stuart Hastings  <stuart@apple.com>
 
-        * gcc/config/i386/i386.opt (-mstackrealign): New flag.  *
+	* gcc/config/i386/i386.opt (-mstackrealign): New flag.  *
 	gcc/config/i386/i386.c (force_align_arg_pointer): New attribute.
 	(ix86_handle_cconv_attribute): Emit error when
 	force_align_arg_pointer attribute collides with too many regparms.
@@ -190,7 +196,7 @@
 
 2006-05-16  Danny Smith  <dannysmith@users.sourceforge.net>
 
-        PR target/27599
+	PR target/27599
 	* config.host (i[34567]86-*-mingw*): Append i386/x-mingw32 to
 	host_xmake_file.
 
diff --git a/gcc/config.host b/gcc/config.host
index 64d3dbcabb0..b36066f44e5 100644
--- a/gcc/config.host
+++ b/gcc/config.host
@@ -86,11 +86,11 @@ case ${host} in
 esac
 
 # Common parts for widely ported systems.
-case ${target} in
+case ${host} in
   *-darwin*)
     # Generic darwin host support.
     out_host_hook_obj=host-darwin.o
-    host_xmake_file=x-darwin
+    host_xmake_file="${host_xmake_file} x-darwin"
     ;;
 esac
 
@@ -109,7 +109,7 @@ esac
 case ${host} in
   alpha*-dec-*vms*)
     host_xm_file=alpha/xm-vms.h
-    host_xmake_file=alpha/x-vms
+    host_xmake_file="${host_xmake_file} alpha/x-vms"
     host_exeext=.exe
     host_can_use_collect2=no
     # This removes the cpu type and manufacturer components and
@@ -119,36 +119,36 @@ case ${host} in
     local_prefix=/gnu
     ;;
   hppa1.1-*-pro*)
-    host_xmake_file="pa/x-ada"
+    host_xmake_file="${host_xmake_file} pa/x-ada"
     ;;
   hppa1.1-*-osf*)
-    host_xmake_file="pa/x-ada"
+    host_xmake_file="${host_xmake_file} pa/x-ada"
     ;;
   hppa1.1-*-rtems*)
-    host_xmake_file="pa/x-ada"
+    host_xmake_file="${host_xmake_file} pa/x-ada"
     ;;
   hppa1.1-*-bsd*)
-    host_xmake_file="pa/x-ada"
+    host_xmake_file="${host_xmake_file} pa/x-ada"
     ;;
   hppa1.0-*-hpux10* | hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
     out_host_hook_obj=host-hpux.o
-    host_xmake_file="pa/x-ada-hpux10 x-hpux"
+    host_xmake_file="${host_xmake_file} pa/x-ada-hpux10 x-hpux"
     ;;
   hppa1.0-*-hpux11* | hppa1.1-*-hpux11* | hppa2*-*-hpux11* | \
   hppa*64*-*-hpux11*)
     out_host_hook_obj=host-hpux.o
-    host_xmake_file="pa/x-ada x-hpux"
+    host_xmake_file="${host_xmake_file} pa/x-ada x-hpux"
     ;;
   hppa*-*-linux*)
     out_host_hook_obj=host-hpux.o
-    host_xmake_file=x-hpux
+    host_xmake_file="${host_xmake_file} x-hpux"
     ;;
   i370-*-opened* | i370-*-mvs* ) # IBM 360/370/390 Architecture
     host_xm_defines='FATAL_EXIT_CODE=12'
     ;;
   i[34567]86-*-solaris2*)
     out_host_hook_obj=host-solaris.o
-    host_xmake_file=x-solaris
+    host_xmake_file="${host_xmake_file} x-solaris"
     ;;
   i[34567]86-pc-msdosdjgpp*)
     host_xm_file=i386/xm-djgpp.h
@@ -178,7 +178,7 @@ case ${host} in
     exit 1
     ;;
   i[34567]86-*-interix3*)
-    host_xmake_file="x-interix"
+    host_xmake_file="${host_xmake_file} x-interix"
     ;;
   i[34567]86-*-darwin*)
     out_host_hook_obj="${out_host_hook_obj} host-i386-darwin.o"
@@ -193,7 +193,7 @@ case ${host} in
     ;;
   *-*-solaris2*)
     out_host_hook_obj=host-solaris.o
-    host_xmake_file=x-solaris
+    host_xmake_file="${host_xmake_file} x-solaris"
     ;;
   *-*-linux*)
     out_host_hook_obj=host-linux.o
@@ -202,6 +202,6 @@ case ${host} in
   ia64-*-hpux*)
     use_long_long_for_widest_fast_int=yes
     out_host_hook_obj=host-hpux.o
-    host_xmake_file=x-hpux
+    host_xmake_file="${host_xmake_file} x-hpux"
     ;;
 esac