From 6dcd016526bbcbd9ee36af7f46cae4308b2af1fb Mon Sep 17 00:00:00 2001
From: Geoffrey Keating <geoffk@geoffk.org>
Date: Wed, 12 Jan 2000 18:56:45 +0000
Subject: [PATCH] Merge in changes from egcs for AIX cross-compilation support.

---
 ChangeLog                     | 5 +++++
 config/ChangeLog              | 5 +++++
 config/{mh-aix43 => mt-aix43} | 0
 configure.in                  | 8 ++++----
 4 files changed, 14 insertions(+), 4 deletions(-)
 rename config/{mh-aix43 => mt-aix43} (100%)

diff --git a/ChangeLog b/ChangeLog
index c5a19c425..666852f07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-06  Geoff Keating  <geoffk@cygnus.com>
+
+	* configure.in: Use mt-aix43 to handle *_TARGET defs,
+	not mh-aix43.
+
 1999-09-04  Steve Chamberlain  <sac@pobox.com>
 
 	* config.sub: Add support for configuring for pj.
diff --git a/config/ChangeLog b/config/ChangeLog
index 7d6fc6093..d824a6fbd 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-06  Geoff Keating  <geoffk@cygnus.com>
+
+	* mh-aix43: Delete, move to mt-aix43.
+	* mt-aix43: New file.
+
 1999-04-07  Michael Meissner  <meissner@cygnus.com>
 
 	* mt-d30v: New file, pass -g -Os -Wa,-C as default options.
diff --git a/config/mh-aix43 b/config/mt-aix43
similarity index 100%
rename from config/mh-aix43
rename to config/mt-aix43
diff --git a/configure.in b/configure.in
index a9221a667..ac7ba63f3 100644
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@
 ## For more information on these two systems, check out the documentation
 ## for 'Autoconf' (autoconf.texi) and 'Configure' (configure.texi).  
 
-#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998, 1999 Free Software Foundation, Inc.
+#   Copyright (C) 1992-99, 2000 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -223,9 +223,6 @@ case "${host}" in
   *-*-lynxos*)
     host_makefile_frag="${host_makefile_frag} config/mh-lynxos"
     ;;
-  *-*-aix4.[3456789]* | *-*-aix[56789].*)
-    host_makefile_frag="${host_makefile_frag} config/mh-aix43"
-    ;;
   *-*-sysv4*)
     host_makefile_frag="${host_makefile_frag} config/mh-sysv4"
     ;;
@@ -332,6 +329,9 @@ case "${target}" in
   *-*-linux-gnu)
     target_makefile_frag="${target_makefile_frag} config/mt-linux"
     ;;
+  *-*-aix4.[3456789]* | *-*-aix[56789].*)
+    target_makefile_frag="${target_makefile_frag} config/mt-aix43"
+    ;;
 esac
 
 # If --enable-target-optspace always use -Os instead of -O2 to build