Merge in changes from egcs for AIX cross-compilation support.

diff --git a/ChangeLog b/ChangeLog
index c5a19c425222236aeb284a25e9242bf43aff6145..666852f075d4c14191718c22112f3d28e30eac9f 100644 (file)
--- 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 7d6fc60936856bca17bbdf9faee0f2ca2a14451d..d824a6fbd433bac2b73c9cd7346a518abac9f507 100644 (file)
--- 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/mh-aix43
deleted file mode 100644 (file)
index 9eb750c..0000000
--- a/config/mh-aix43
+++ /dev/null
@@ -1,4 +0,0 @@
-# AIX 4.3 and above requires -X32_64 flag to all ar and nm commands
-# to handle both 32-bit and 64-bit objects.
-AR_FOR_TARGET=ar -X32_64
-NM_FOR_TARGET=nm -X32_64

diff --git a/config/mt-aix43 b/config/mt-aix43
new file mode 100644 (file)
index 0000000..9eb750c
--- /dev/null
+++ b/config/mt-aix43
@@ -0,0 +1,4 @@
+# AIX 4.3 and above requires -X32_64 flag to all ar and nm commands
+# to handle both 32-bit and 64-bit objects.
+AR_FOR_TARGET=ar -X32_64
+NM_FOR_TARGET=nm -X32_64

diff --git a/configure.in b/configure.in
index a9221a66710ea45553c1b165a0130a8f4835142d..ac7ba63f3173daaf44f5c979ddd49f487a7f948b 100644 (file)
--- 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