This is the mail archive of the binutils@sources.redhat.com mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: check mips abi x linker emulation compatibility


On Mar 23, 2003, Thiemo Seufer <ica2_ts at csv dot ica dot uni-stuttgart dot de> wrote:

> IMHO it's better to change the GAS default to n32 for mips64-unknown-linux
> and mips-sgi-irix6, because that is/will be the most heavily used ABI
> variant on NewABI capable systems.

Ok, here's a patch that fixes a typo in my earlier bfd patch, changes
the assembler default ABI as you suggest, adjusting the assembler and
the linker testsuite.  The assembler testsuite is currently very
broken, because of a patch that Eric installed the other day, but I
reverted his patch in my tree and, after the patch, got failures only
in the empic tests, that have been broken for a while.  The linker
testsuite was a bit trickier to fix: a number of tests seem to
actually depend on o32 behavior, and a few of the flag-compatibility
tests go further and actually rely on the no-abi default of the
assembler, which doesn't hold for mips64-linux-gnu.  I'm thinking of
simply disabling the 5 failing tests that depended on this behavior
(perhaps only for mips64-linux-gnu?).  They are:

FAIL: MIPS incompatible objects:  "-mips32" "-mips64"
FAIL: MIPS incompatible objects:  "-mips32r2" "-mips64"
FAIL: MIPS compatible objects:  "-mips4 -mgp32" "-mips2"
FAIL: MIPS compatible objects:  "-mips2" "-mips4 -mabi=eabi -mgp32"
FAIL: MIPS compatible objects:  "-march=sb1 -mgp32" "-march=4000 -mgp32"

Ok to install?

Index: bfd/ChangeLog
from  Alexandre Oliva  <aoliva at redhat dot com>

	* elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Improve
	error message for mixing different-endian files.  Check for ABI
	compatibility of input files with the selected emulation.

Index: bfd/elfxx-mips.c
===================================================================
RCS file: /cvs/uberbaum/bfd/elfxx-mips.c,v
retrieving revision 1.47
diff -u -p -r1.47 elfxx-mips.c
--- bfd/elfxx-mips.c 26 Mar 2003 01:04:22 -0000 1.47
+++ bfd/elfxx-mips.c 28 Mar 2003 05:53:29 -0000
@@ -9084,11 +9084,24 @@ _bfd_mips_elf_merge_private_bfd_data (ib
 
   /* Check if we have the same endianess */
   if (! _bfd_generic_verify_endian_match (ibfd, obfd))
-    return FALSE;
+    {
+      (*_bfd_error_handler)
+	(_("%s: endianness incompatible with that of the selected emulation"),
+	 bfd_archive_filename (ibfd));
+      return FALSE;
+    }
 
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
     return TRUE;
+
+  if (strcmp (bfd_get_target (ibfd), bfd_get_target (obfd)) != 0)
+    {
+      (*_bfd_error_handler)
+	(_("%s: ABI is incompatible with that of the selected emulation"),
+	 bfd_archive_filename (ibfd));
+      return FALSE;
+    }
 
   new_flags = elf_elfheader (ibfd)->e_flags;
   elf_elfheader (obfd)->e_flags |= new_flags & EF_MIPS_NOREORDER;
Index: gas/ChangeLog
from  Alexandre Oliva  <aoliva at redhat dot com>

	* configure.in (MIPS_DEFAULT_ABI): AC_DEFINE.
	* config/tc-mips.c (mips_after_parse_args): Set mips_abi to it.
	* config.in, configure: Rebuilt.

Index: gas/config.in
===================================================================
RCS file: /cvs/uberbaum/gas/config.in,v
retrieving revision 1.15
diff -u -p -r1.15 config.in
--- gas/config.in 14 Oct 2002 12:08:47 -0000 1.15
+++ gas/config.in 28 Mar 2003 06:42:15 -0000
@@ -172,6 +172,9 @@
 /* Generate 64-bit code by default on MIPS targets.  */
 #undef MIPS_DEFAULT_64BIT
 
+/* Choose a default ABI for MIPS targets.  */
+#undef MIPS_DEFAULT_ABI
+
 /* Default architecture. */
 #undef DEFAULT_ARCH
 
Index: gas/configure
===================================================================
RCS file: /cvs/uberbaum/gas/configure,v
retrieving revision 1.140
diff -u -p -r1.140 configure
--- gas/configure 11 Feb 2003 13:47:07 -0000 1.140
+++ gas/configure 28 Mar 2003 06:42:18 -0000
@@ -55,7 +55,6 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
-sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -170,7 +169,6 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
-  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -341,11 +339,6 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
-  -site-file | --site-file | --site-fil | --site-fi | --site-f)
-    ac_prev=sitefile ;;
-  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
-    sitefile="$ac_optarg" ;;
-
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -511,16 +504,12 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$sitefile"; then
-  if test -z "$CONFIG_SITE"; then
-    if test "x$prefix" != xNONE; then
-      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-    else
-      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-    fi
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
   fi
-else
-  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -559,12 +548,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:563: checking for Cygwin environment" >&5
+echo "configure:552: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 568 "configure"
+#line 557 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -575,7 +564,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -592,19 +581,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:596: checking for mingw32 environment" >&5
+echo "configure:585: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 601 "configure"
+#line 590 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:608: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -669,7 +658,7 @@ else { echo "configure: error: can not r
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:673: checking host system type" >&5
+echo "configure:662: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -690,7 +679,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:694: checking target system type" >&5
+echo "configure:683: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -708,7 +697,7 @@ target_os=`echo $target | sed 's/^\([^-]
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:712: checking build system type" >&5
+echo "configure:701: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -733,7 +722,7 @@ test "$host_alias" != "$target_alias" &&
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:737: checking for $ac_word" >&5
+echo "configure:726: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -763,7 +752,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:767: checking for $ac_word" >&5
+echo "configure:756: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -814,7 +803,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:818: checking for $ac_word" >&5
+echo "configure:807: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -846,7 +835,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:850: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:839: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -857,12 +846,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 861 "configure"
+#line 850 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -888,12 +877,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:892: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:881: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:897: checking whether we are using GNU C" >&5
+echo "configure:886: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -902,7 +891,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:906: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -921,7 +910,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:925: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:914: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -953,7 +942,7 @@ else
 fi
 
 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:957: checking for POSIXized ISC" >&5
+echo "configure:946: checking for POSIXized ISC" >&5
 if test -d /etc/conf/kconfig.d &&
   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
@@ -987,7 +976,7 @@ BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOM
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:991: checking for a BSD compatible install" >&5
+echo "configure:980: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1040,7 +1029,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:1044: checking whether build environment is sane" >&5
+echo "configure:1033: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -1097,7 +1086,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1101: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1090: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1143,7 +1132,7 @@ EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:1147: checking for working aclocal" >&5
+echo "configure:1136: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1156,7 +1145,7 @@ else
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1160: checking for working autoconf" >&5
+echo "configure:1149: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1169,7 +1158,7 @@ else
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:1173: checking for working automake" >&5
+echo "configure:1162: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1182,7 +1171,7 @@ else
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1186: checking for working autoheader" >&5
+echo "configure:1175: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1195,7 +1184,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1199: checking for working makeinfo" >&5
+echo "configure:1188: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1290,7 +1279,7 @@ ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1294: checking for ld used by GCC" >&5
+echo "configure:1283: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1320,10 +1309,10 @@ echo "configure:1294: checking for ld us
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1324: checking for GNU ld" >&5
+echo "configure:1313: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1327: checking for non-GNU ld" >&5
+echo "configure:1316: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1358,7 +1347,7 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1362: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1351: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1375,7 +1364,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1379: checking for $LD option to reload object files" >&5
+echo "configure:1368: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1387,7 +1376,7 @@ reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1391: checking for BSD-compatible nm" >&5
+echo "configure:1380: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1425,7 +1414,7 @@ NM="$lt_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1429: checking whether ln -s works" >&5
+echo "configure:1418: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1446,7 +1435,7 @@ else
 fi
 
 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:1450: checking how to recognise dependant libraries" >&5
+echo "configure:1439: checking how to recognise dependant libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1619,13 +1608,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:1623: checking for object suffix" >&5
+echo "configure:1612: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:1629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -1645,7 +1634,7 @@ ac_objext=$ac_cv_objext
 
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1649: checking for executable suffix" >&5
+echo "configure:1638: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1655,10 +1644,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
+      *.c | *.o | *.obj) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1688,7 +1677,7 @@ case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:1692: checking for ${ac_tool_prefix}file" >&5
+echo "configure:1681: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1750,7 +1739,7 @@ fi
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:1754: checking for file" >&5
+echo "configure:1743: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1821,7 +1810,7 @@ esac
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1825: checking for $ac_word" >&5
+echo "configure:1814: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1853,7 +1842,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1857: checking for $ac_word" >&5
+echo "configure:1846: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1888,7 +1877,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1892: checking for $ac_word" >&5
+echo "configure:1881: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1920,7 +1909,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1924: checking for $ac_word" >&5
+echo "configure:1913: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1987,8 +1976,21 @@ test x"$pic_mode" = xno && libtool_flags
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 1991 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:1992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 1980 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   if test "$lt_cv_prog_gnu_ld" = yes; then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -melf32bsmip"
+      ;;
+    *N32*)
+      LD="${LD-ld} -melf32bmipn32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -melf64bmip"
+      ;;
+    esac
+   else
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2000,6 +2002,7 @@ case $host in
       LD="${LD-ld} -64"
       ;;
     esac
+   fi
   fi
   rm -rf conftest*
   ;;
@@ -2007,7 +2010,7 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:2014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *ELF-32*)
       HPUX_IA64_MODE="32"
@@ -2020,12 +2023,54 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo configure:2030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    case "`/usr/bin/file conftest.o`" in
+    *32-bit*)
+      case $host in
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_i386"
+          ;;
+        ppc64-*linux*)
+          LD="${LD-ld} -m elf32ppclinux"
+          ;;
+        s390x-*linux*)
+          LD="${LD-ld} -m elf_s390"
+          ;;
+        sparc64-*linux*)
+          LD="${LD-ld} -m elf32_sparc"
+          ;;
+      esac
+      ;;
+    *64-bit*)
+      case $host in
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        ppc*-*linux*|powerpc*-*linux*)
+          LD="${LD-ld} -m elf64ppc"
+          ;;
+        s390*-*linux*)
+          LD="${LD-ld} -m elf64_s390"
+          ;;
+        sparc*-*linux*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2029: checking whether the C compiler needs -belf" >&5
+echo "configure:2074: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2038,14 +2083,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
-#line 2042 "configure"
+#line 2087 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2741,6 +2786,18 @@ EOF
 	    mips_default_64bit=0
 	    ;;
 	esac
+	# Decide which ABI to target by default.
+	case ${target} in
+	  mips64*-linux* | mips-sgi-irix6*)
+	    mips_default_abi=N32_ABI
+	    ;;
+	  mips*-linux*)
+	    mips_default_abi=O32_ABI
+	    ;;
+	  *)
+	    mips_default_abi=NO_ABI
+	    ;;
+	esac
 	cat >> confdefs.h <<EOF
 #define MIPS_CPU_STRING_DEFAULT "$mips_cpu"
 EOF
@@ -2753,6 +2810,10 @@ EOF
 #define MIPS_DEFAULT_64BIT $mips_default_64bit
 EOF
 
+	cat >> confdefs.h <<EOF
+#define MIPS_DEFAULT_ABI $mips_default_abi
+EOF
+
 	;;
     esac
 
@@ -3201,7 +3262,7 @@ EOF
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3205: checking for $ac_word" >&5
+echo "configure:3266: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3231,7 +3292,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3235: checking for $ac_word" >&5
+echo "configure:3296: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3282,7 +3343,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3286: checking for $ac_word" >&5
+echo "configure:3347: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3314,7 +3375,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:3318: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:3379: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -3325,12 +3386,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 3329 "configure"
+#line 3390 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:3334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -3356,12 +3417,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:3360: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:3421: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:3365: checking whether we are using GNU C" >&5
+echo "configure:3426: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3370,7 +3431,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:3374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:3435: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -3389,7 +3450,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:3393: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:3454: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3426,7 +3487,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3430: checking for $ac_word" >&5
+echo "configure:3491: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3457,7 +3518,7 @@ done
 test -n "$YACC" || YACC="yacc"
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:3461: checking how to run the C preprocessor" >&5
+echo "configure:3522: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -3472,13 +3533,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 3476 "configure"
+#line 3537 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3482: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -3489,13 +3550,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 3493 "configure"
+#line 3554 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -3506,13 +3567,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 3510 "configure"
+#line 3571 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -3542,7 +3603,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3546: checking for $ac_word" >&5
+echo "configure:3607: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3575,7 +3636,7 @@ test -n "$LEX" || LEX="$missing_dir/miss
 # Extract the first word of "flex", so it can be a program name with args.
 set dummy flex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3579: checking for $ac_word" >&5
+echo "configure:3640: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3609,7 +3670,7 @@ then
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:3613: checking for yywrap in -l$ac_lib" >&5
+echo "configure:3674: checking for yywrap in -l$ac_lib" >&5
 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3617,7 +3678,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3621 "configure"
+#line 3682 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3628,7 +3689,7 @@ int main() {
 yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:3632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3651,7 +3712,7 @@ fi
 fi
 
 echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:3655: checking lex output file root" >&5
+echo "configure:3716: checking lex output file root" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3672,7 +3733,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
 echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
-echo "configure:3676: checking whether yytext is a pointer" >&5
+echo "configure:3737: checking whether yytext is a pointer" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3684,14 +3745,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPU
 ac_save_LIBS="$LIBS"
 LIBS="$LIBS $LEXLIB"
 cat > conftest.$ac_ext <<EOF
-#line 3688 "configure"
+#line 3749 "configure"
 #include "confdefs.h"
 `cat $LEX_OUTPUT_ROOT.c`
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_prog_lex_yytext_pointer=yes
 else
@@ -3717,7 +3778,7 @@ ALL_LINGUAS="fr tr es"
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3721: checking for $ac_word" >&5
+echo "configure:3782: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3745,12 +3806,12 @@ else
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3749: checking for ANSI C header files" >&5
+echo "configure:3810: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3754 "configure"
+#line 3815 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3758,7 +3819,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3775,7 +3836,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3779 "configure"
+#line 3840 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3793,7 +3854,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3797 "configure"
+#line 3858 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3814,7 +3875,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 3818 "configure"
+#line 3879 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3825,7 +3886,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
 exit (0); }
 
 EOF
-if { (eval echo configure:3829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -3849,12 +3910,12 @@ EOF
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3853: checking for working const" >&5
+echo "configure:3914: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3858 "configure"
+#line 3919 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3903,7 +3964,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:3907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -3924,21 +3985,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:3928: checking for inline" >&5
+echo "configure:3989: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 3935 "configure"
+#line 3996 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:3942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -3964,12 +4025,12 @@ EOF
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3968: checking for off_t" >&5
+echo "configure:4029: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3973 "configure"
+#line 4034 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3997,12 +4058,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:4001: checking for size_t" >&5
+echo "configure:4062: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4006 "configure"
+#line 4067 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4032,19 +4093,19 @@ fi
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:4036: checking for working alloca.h" >&5
+echo "configure:4097: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4041 "configure"
+#line 4102 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:4048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -4065,12 +4126,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:4069: checking for alloca" >&5
+echo "configure:4130: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4074 "configure"
+#line 4135 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -4098,7 +4159,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:4102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -4130,12 +4191,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:4134: checking whether alloca needs Cray hooks" >&5
+echo "configure:4195: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4139 "configure"
+#line 4200 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -4160,12 +4221,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4164: checking for $ac_func" >&5
+echo "configure:4225: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4169 "configure"
+#line 4230 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4188,7 +4249,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4215,7 +4276,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:4219: checking stack direction for C alloca" >&5
+echo "configure:4280: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4223,7 +4284,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 4227 "configure"
+#line 4288 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -4242,7 +4303,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:4246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -4263,21 +4324,21 @@ EOF
 
 fi
 
-for ac_hdr in unistd.h
+for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4271: checking for $ac_hdr" >&5
+echo "configure:4332: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4276 "configure"
+#line 4337 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4306,12 +4367,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4310: checking for $ac_func" >&5
+echo "configure:4371: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4315 "configure"
+#line 4376 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4334,7 +4395,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4359,7 +4420,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:4363: checking for working mmap" >&5
+echo "configure:4424: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4367,7 +4428,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 4371 "configure"
+#line 4432 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -4395,11 +4456,24 @@ else
 #include <fcntl.h>
 #include <sys/mman.h>
 
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
 /* This mess was copied from the GNU getpagesize.h.  */
 #ifndef HAVE_GETPAGESIZE
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
 
 /* Assume that all systems that can run configure have sys/param.h.  */
 # ifndef HAVE_SYS_PARAM_H
@@ -4507,7 +4581,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:4511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -4535,17 +4609,17 @@ unistd.h values.h sys/param.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4539: checking for $ac_hdr" >&5
+echo "configure:4613: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4544 "configure"
+#line 4618 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4575,12 +4649,12 @@ done
 __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4579: checking for $ac_func" >&5
+echo "configure:4653: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4584 "configure"
+#line 4658 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4603,7 +4677,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4632,12 +4706,12 @@ done
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4636: checking for $ac_func" >&5
+echo "configure:4710: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4641 "configure"
+#line 4715 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4660,7 +4734,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4694,19 +4768,19 @@ EOF
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:4698: checking for LC_MESSAGES" >&5
+echo "configure:4772: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4703 "configure"
+#line 4777 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:4710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -4727,7 +4801,7 @@ EOF
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:4731: checking whether NLS is requested" >&5
+echo "configure:4805: checking whether NLS is requested" >&5
         # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval="$enable_nls"
@@ -4747,7 +4821,7 @@ fi
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:4751: checking whether included gettext is requested" >&5
+echo "configure:4825: checking whether included gettext is requested" >&5
       # Check whether --with-included-gettext or --without-included-gettext was given.
 if test "${with_included_gettext+set}" = set; then
   withval="$with_included_gettext"
@@ -4766,17 +4840,17 @@ fi
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:4770: checking for libintl.h" >&5
+echo "configure:4844: checking for libintl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4775 "configure"
+#line 4849 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4793,19 +4867,19 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
-echo "configure:4797: checking for gettext in libc" >&5
+echo "configure:4871: checking for gettext in libc" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4802 "configure"
+#line 4876 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:4809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libc=yes
 else
@@ -4821,7 +4895,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1
 
 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:4825: checking for bindtextdomain in -lintl" >&5
+echo "configure:4899: checking for bindtextdomain in -lintl" >&5
 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4829,7 +4903,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4833 "configure"
+#line 4907 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4840,7 +4914,7 @@ int main() {
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:4844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4856,19 +4930,19 @@ fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
-echo "configure:4860: checking for gettext in libintl" >&5
+echo "configure:4934: checking for gettext in libintl" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4865 "configure"
+#line 4939 "configure"
 #include "confdefs.h"
 
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:4872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libintl=yes
 else
@@ -4896,7 +4970,7 @@ EOF
 	      # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4900: checking for $ac_word" >&5
+echo "configure:4974: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4930,12 +5004,12 @@ fi
 		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4934: checking for $ac_func" >&5
+echo "configure:5008: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4939 "configure"
+#line 5013 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4958,7 +5032,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4985,7 +5059,7 @@ done
 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4989: checking for $ac_word" >&5
+echo "configure:5063: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5021,7 +5095,7 @@ fi
 		# Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5025: checking for $ac_word" >&5
+echo "configure:5099: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5053,7 +5127,7 @@ else
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 5057 "configure"
+#line 5131 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -5061,7 +5135,7 @@ extern int _nl_msg_cat_cntr;
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:5065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -5093,7 +5167,7 @@ fi
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5097: checking for $ac_word" >&5
+echo "configure:5171: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5127,7 +5201,7 @@ fi
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5131: checking for $ac_word" >&5
+echo "configure:5205: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5163,7 +5237,7 @@ fi
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5167: checking for $ac_word" >&5
+echo "configure:5241: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5253,7 +5327,7 @@ fi
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:5257: checking for catalogs to be installed" >&5
+echo "configure:5331: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -5281,17 +5355,17 @@ echo "configure:5257: checking for catal
       if test "$CATOBJEXT" = ".cat"; then
 	 ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:5285: checking for linux/version.h" >&5
+echo "configure:5359: checking for linux/version.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5290 "configure"
+#line 5364 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5295: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5354,7 +5428,7 @@ fi
   
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:5358: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:5432: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -5379,7 +5453,7 @@ fi
 
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:5383: checking for executable suffix" >&5
+echo "configure:5457: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5389,10 +5463,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:5393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:5467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
+      *.c | *.o | *.obj) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -5414,17 +5488,17 @@ for ac_hdr in string.h stdlib.h memory.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5418: checking for $ac_hdr" >&5
+echo "configure:5492: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5423 "configure"
+#line 5497 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5454,7 +5528,7 @@ done
 # Put this here so that autoconf's "cross-compiling" message doesn't confuse
 # people who are not cross-compiling but are compiling cross-assemblers.
 echo $ac_n "checking whether compiling a cross-assembler""... $ac_c" 1>&6
-echo "configure:5458: checking whether compiling a cross-assembler" >&5
+echo "configure:5532: checking whether compiling a cross-assembler" >&5
 if test "${host}" = "${target}"; then
   cross_gas=no
 else
@@ -5469,19 +5543,19 @@ echo "$ac_t""$cross_gas" 1>&6
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:5473: checking for working alloca.h" >&5
+echo "configure:5547: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5478 "configure"
+#line 5552 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:5485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -5502,12 +5576,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:5506: checking for alloca" >&5
+echo "configure:5580: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5511 "configure"
+#line 5585 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -5535,7 +5609,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:5539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -5567,12 +5641,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:5571: checking whether alloca needs Cray hooks" >&5
+echo "configure:5645: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5576 "configure"
+#line 5650 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -5597,12 +5671,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5601: checking for $ac_func" >&5
+echo "configure:5675: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5606 "configure"
+#line 5680 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5625,7 +5699,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5652,7 +5726,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:5656: checking stack direction for C alloca" >&5
+echo "configure:5730: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5660,7 +5734,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 5664 "configure"
+#line 5738 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -5679,7 +5753,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:5683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -5701,21 +5775,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:5705: checking for inline" >&5
+echo "configure:5779: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 5712 "configure"
+#line 5786 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:5719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -5745,12 +5819,12 @@ esac
 for ac_func in unlink remove
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5749: checking for $ac_func" >&5
+echo "configure:5823: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5754 "configure"
+#line 5828 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5773,7 +5847,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5802,12 +5876,12 @@ done
 for ac_func in sbrk
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5806: checking for $ac_func" >&5
+echo "configure:5880: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5811 "configure"
+#line 5885 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5830,7 +5904,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5865,7 +5939,7 @@ case $host in
   ;;
 *-ncr-sysv4.3*)
   echo $ac_n "checking for _mwvalidcheckl in -lmw""... $ac_c" 1>&6
-echo "configure:5869: checking for _mwvalidcheckl in -lmw" >&5
+echo "configure:5943: checking for _mwvalidcheckl in -lmw" >&5
 ac_lib_var=`echo mw'_'_mwvalidcheckl | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5873,7 +5947,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmw  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5877 "configure"
+#line 5951 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5884,7 +5958,7 @@ int main() {
 _mwvalidcheckl()
 ; return 0; }
 EOF
-if { (eval echo configure:5888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5905,7 +5979,7 @@ else
 fi
 
   echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:5909: checking for main in -lm" >&5
+echo "configure:5983: checking for main in -lm" >&5
 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5913,14 +5987,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5917 "configure"
+#line 5991 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5943,7 +6017,7 @@ fi
   ;;
 *)
   echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:5947: checking for main in -lm" >&5
+echo "configure:6021: checking for main in -lm" >&5
 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5951,14 +6025,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5955 "configure"
+#line 6029 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5989,12 +6063,12 @@ esac
 # enough, but on some of those systems, the assert macro relies on requoting
 # working properly!
 echo $ac_n "checking for working assert macro""... $ac_c" 1>&6
-echo "configure:5993: checking for working assert macro" >&5
+echo "configure:6067: checking for working assert macro" >&5
 if eval "test \"`echo '$''{'gas_cv_assert_ok'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5998 "configure"
+#line 6072 "configure"
 #include "confdefs.h"
 #include <assert.h>
 #include <stdio.h>
@@ -6010,7 +6084,7 @@ assert (a == b
 
 ; return 0; }
 EOF
-if { (eval echo configure:6014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gas_cv_assert_ok=yes
 else
@@ -6051,12 +6125,12 @@ gas_test_headers="
 "
 
 echo $ac_n "checking whether declaration is required for strstr""... $ac_c" 1>&6
-echo "configure:6055: checking whether declaration is required for strstr" >&5
+echo "configure:6129: checking whether declaration is required for strstr" >&5
 if eval "test \"`echo '$''{'gas_cv_decl_needed_strstr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6060 "configure"
+#line 6134 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -6067,7 +6141,7 @@ x = (f) strstr;
 
 ; return 0; }
 EOF
-if { (eval echo configure:6071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gas_cv_decl_needed_strstr=no
 else
@@ -6088,12 +6162,12 @@ fi
 
 
 echo $ac_n "checking whether declaration is required for malloc""... $ac_c" 1>&6
-echo "configure:6092: checking whether declaration is required for malloc" >&5
+echo "configure:6166: checking whether declaration is required for malloc" >&5
 if eval "test \"`echo '$''{'gas_cv_decl_needed_malloc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6097 "configure"
+#line 6171 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -6104,7 +6178,7 @@ x = (f) malloc;
 
 ; return 0; }
 EOF
-if { (eval echo configure:6108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gas_cv_decl_needed_malloc=no
 else
@@ -6125,12 +6199,12 @@ fi
 
 
 echo $ac_n "checking whether declaration is required for free""... $ac_c" 1>&6
-echo "configure:6129: checking whether declaration is required for free" >&5
+echo "configure:6203: checking whether declaration is required for free" >&5
 if eval "test \"`echo '$''{'gas_cv_decl_needed_free'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6134 "configure"
+#line 6208 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -6141,7 +6215,7 @@ x = (f) free;
 
 ; return 0; }
 EOF
-if { (eval echo configure:6145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gas_cv_decl_needed_free=no
 else
@@ -6162,12 +6236,12 @@ fi
 
 
 echo $ac_n "checking whether declaration is required for sbrk""... $ac_c" 1>&6
-echo "configure:6166: checking whether declaration is required for sbrk" >&5
+echo "configure:6240: checking whether declaration is required for sbrk" >&5
 if eval "test \"`echo '$''{'gas_cv_decl_needed_sbrk'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6171 "configure"
+#line 6245 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -6178,7 +6252,7 @@ x = (f) sbrk;
 
 ; return 0; }
 EOF
-if { (eval echo configure:6182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gas_cv_decl_needed_sbrk=no
 else
@@ -6199,12 +6273,12 @@ fi
 
 
 echo $ac_n "checking whether declaration is required for environ""... $ac_c" 1>&6
-echo "configure:6203: checking whether declaration is required for environ" >&5
+echo "configure:6277: checking whether declaration is required for environ" >&5
 if eval "test \"`echo '$''{'gas_cv_decl_needed_environ'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6208 "configure"
+#line 6282 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -6215,7 +6289,7 @@ x = (f) environ;
 
 ; return 0; }
 EOF
-if { (eval echo configure:6219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gas_cv_decl_needed_environ=no
 else
@@ -6239,12 +6313,12 @@ fi
 # for it?
 
 echo $ac_n "checking whether declaration is required for errno""... $ac_c" 1>&6
-echo "configure:6243: checking whether declaration is required for errno" >&5
+echo "configure:6317: checking whether declaration is required for errno" >&5
 if eval "test \"`echo '$''{'gas_cv_decl_needed_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6248 "configure"
+#line 6322 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_ERRNO_H
@@ -6259,7 +6333,7 @@ x = (f) errno;
 
 ; return 0; }
 EOF
-if { (eval echo configure:6263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gas_cv_decl_needed_errno=no
 else
Index: gas/configure.in
===================================================================
RCS file: /cvs/uberbaum/gas/configure.in,v
retrieving revision 1.127
diff -u -p -r1.127 configure.in
--- gas/configure.in 11 Feb 2003 13:47:08 -0000 1.127
+++ gas/configure.in 28 Mar 2003 06:42:19 -0000
@@ -576,12 +576,26 @@ changequote([,])dnl
 	    mips_default_64bit=0
 	    ;;
 	esac
+	# Decide which ABI to target by default.
+	case ${target} in
+	  mips64*-linux* | mips-sgi-irix6*)
+	    mips_default_abi=N32_ABI
+	    ;;
+	  mips*-linux*)
+	    mips_default_abi=O32_ABI
+	    ;;
+	  *)
+	    mips_default_abi=NO_ABI
+	    ;;
+	esac
 	AC_DEFINE_UNQUOTED(MIPS_CPU_STRING_DEFAULT, "$mips_cpu",
 			   [Default CPU for MIPS targets. ])
 	AC_DEFINE_UNQUOTED(USE_E_MIPS_ABI_O32, $use_e_mips_abi_o32,
 			   [Allow use of E_MIPS_ABI_O32 on MIPS targets. ])
 	AC_DEFINE_UNQUOTED(MIPS_DEFAULT_64BIT, $mips_default_64bit,
 			   [Generate 64-bit code by default on MIPS targets. ])
+	AC_DEFINE_UNQUOTED(MIPS_DEFAULT_ABI, $mips_default_abi,
+			   [Choose a default ABI for MIPS targets. ])
 	;;
     esac
 
Index: gas/config/tc-mips.c
===================================================================
RCS file: /cvs/uberbaum/gas/config/tc-mips.c,v
retrieving revision 1.198
diff -u -p -r1.198 tc-mips.c
--- gas/config/tc-mips.c 26 Mar 2003 23:32:06 -0000 1.198
+++ gas/config/tc-mips.c 28 Mar 2003 06:42:26 -0000
@@ -10753,6 +10753,9 @@ mips_after_parse_args ()
       g_switch_value = 0;
     }
 
+  if (mips_abi == NO_ABI)
+    mips_abi = MIPS_DEFAULT_ABI;
+
   /* The following code determines the architecture and register size.
      Similar code was added to GCC 3.3 (see override_options() in
      config/mips/mips.c).  The GAS and GCC code should be kept in sync
Index: gas/testsuite/ChangeLog
from  Alexandre Oliva  <aoliva at redhat dot com>

	* gas/mips/abs.d, gas/mips/add.d, gas/mips/and.d,
	gas/mips/beq.d, gas/mips/bge.d, gas/mips/bgeu.d,
	gas/mips/blt.d, gas/mips/bltu.d, gas/mips/branch-misc-1.d,
	gas/mips/break20.d, gas/mips/cp0sel-names-mips32.d,
	gas/mips/cp0sel-names-mips32r2.d,
	gas/mips/cp0sel-names-mips64.d,
	gas/mips/cp0sel-names-numeric.d, gas/mips/cp0sel-names-sb1.d,
	gas/mips/elf-jal.d, gas/mips/elf-rel.d, gas/mips/elf-rel2.d,
	gas/mips/elf-rel3.d, gas/mips/elf-rel4.d, gas/mips/elf-rel5.d,
	gas/mips/elf-rel6.d, gas/mips/elf-rel7.d,
	gas/mips/elf_arch_mips1.d, gas/mips/elf_arch_mips2.d,
	gas/mips/elf_arch_mips3.d, gas/mips/elf_arch_mips32.d,
	gas/mips/elf_arch_mips32r2.d, gas/mips/elf_arch_mips4.d,
	gas/mips/elf_arch_mips5.d, gas/mips/elf_arch_mips64.d,
	gas/mips/elf_ase_mips16.d, gas/mips/empic.d,
	gas/mips/empic2.d, gas/mips/empic3_e.d, gas/mips/empic3_g1.d,
	gas/mips/empic3_g2.d, gas/mips/hwr-names-mips32r2.d,
	gas/mips/hwr-names-numeric.d, gas/mips/jal-empic-elf-2.d,
	gas/mips/jal-empic-elf-3.d, gas/mips/jal-empic-elf.d,
	gas/mips/jal-svr4pic.d, gas/mips/jal-xgot.d, gas/mips/jal.d,
	gas/mips/la-empic.d, gas/mips/la-svr4pic.d,
	gas/mips/la-xgot.d, gas/mips/la.d, gas/mips/lb-empic.d,
	gas/mips/lb-svr4pic.d, gas/mips/lb-xgot-ilocks.d,
	gas/mips/lb-xgot.d, gas/mips/lb.d, gas/mips/ld-empic.d,
	gas/mips/ld-svr4pic.d, gas/mips/ld-xgot.d, gas/mips/ld.d,
	gas/mips/li.d, gas/mips/lif-empic.d, gas/mips/lif-svr4pic.d,
	gas/mips/lif-xgot.d, gas/mips/lifloat.d,
	gas/mips/mips-gp32-fp32-pic.d, gas/mips/mips-gp32-fp32.d,
	gas/mips/mips-gp32-fp64-pic.d, gas/mips/mips-gp32-fp64.d,
	gas/mips/mips-gp64-fp32-pic.d, gas/mips/mips-gp64-fp32.d,
	gas/mips/mips-gp64-fp64-pic.d, gas/mips/mips-gp64-fp64.d,
	gas/mips/mips.exp, gas/mips/mips16-e.d, gas/mips/mips16-f.d,
	gas/mips/mips32.d, gas/mips/mips32r2.d, gas/mips/mips4010.d,
	gas/mips/mips4650.d, gas/mips/mips64.d, gas/mips/mipsel16-e.d,
	gas/mips/mipsel16-f.d, gas/mips/rol-hw.d, gas/mips/rol.d,
	gas/mips/sb.d, gas/mips/sync.d, gas/mips/tempic.d,
	gas/mips/tmips16-e.d, gas/mips/tmips16-f.d,
	gas/mips/tmipsel16-e.d, gas/mips/tmipsel16-f.d,
	gas/mips/trunc.d, gas/mips/uld.d, gas/mips/ulh-empic.d,
	gas/mips/ulh-svr4pic.d, gas/mips/ulh-xgot.d, gas/mips/ulh.d,
	gas/mips/ulw.d, gas/mips/usd.d, gas/mips/ush.d,
	gas/mips/usw.d, gas/mips/vr4122.d: Added ABI specification.
	gas/vtable/vtable.exp: mips64*-*-linux* and mips*-*-irix6* are
	RELA.

Index: gas/testsuite/gas/mips/abs.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/abs.d,v
retrieving revision 1.4
diff -u -p -r1.4 abs.d
--- gas/testsuite/gas/mips/abs.d 27 Dec 2002 23:51:48 -0000 1.4
+++ gas/testsuite/gas/mips/abs.d 28 Mar 2003 06:53:54 -0000
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses
 #name: MIPS abs
+#as: -32
 
 # Test the abs macro.
 
Index: gas/testsuite/gas/mips/add.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/add.d,v
retrieving revision 1.3
diff -u -p -r1.3 add.d
--- gas/testsuite/gas/mips/add.d 27 Dec 2002 23:51:48 -0000 1.3
+++ gas/testsuite/gas/mips/add.d 28 Mar 2003 06:53:54 -0000
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses
 #name: MIPS add
+#as: -32
 
 # Test the add macro.
 
Index: gas/testsuite/gas/mips/and.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/and.d,v
retrieving revision 1.3
diff -u -p -r1.3 and.d
--- gas/testsuite/gas/mips/and.d 27 Dec 2002 23:51:48 -0000 1.3
+++ gas/testsuite/gas/mips/and.d 28 Mar 2003 06:53:54 -0000
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses
 #name: MIPS and
+#as: -32
 
 # Test the and macro.
 
Index: gas/testsuite/gas/mips/beq.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/beq.d,v
retrieving revision 1.5
diff -u -p -r1.5 beq.d
--- gas/testsuite/gas/mips/beq.d 12 Dec 2002 04:40:22 -0000 1.5
+++ gas/testsuite/gas/mips/beq.d 28 Mar 2003 06:53:54 -0000
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS beq
+#as: -32
 
 # Test the beq macro.
 
Index: gas/testsuite/gas/mips/bge.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/bge.d,v
retrieving revision 1.7
diff -u -p -r1.7 bge.d
--- gas/testsuite/gas/mips/bge.d 12 Mar 2003 23:05:31 -0000 1.7
+++ gas/testsuite/gas/mips/bge.d 28 Mar 2003 06:53:54 -0000
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS bge
+#as: -32
 
 # Test the bge macro.
 
Index: gas/testsuite/gas/mips/bgeu.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/bgeu.d,v
retrieving revision 1.7
diff -u -p -r1.7 bgeu.d
--- gas/testsuite/gas/mips/bgeu.d 12 Mar 2003 23:05:31 -0000 1.7
+++ gas/testsuite/gas/mips/bgeu.d 28 Mar 2003 06:53:54 -0000
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS bgeu
+#as: -32
 
 # Test the bgeu macro.
 
Index: gas/testsuite/gas/mips/blt.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/blt.d,v
retrieving revision 1.7
diff -u -p -r1.7 blt.d
--- gas/testsuite/gas/mips/blt.d 12 Mar 2003 23:05:31 -0000 1.7
+++ gas/testsuite/gas/mips/blt.d 28 Mar 2003 06:53:54 -0000
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS blt
+#as: -32
 
 # Test the blt macro.
 
Index: gas/testsuite/gas/mips/bltu.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/bltu.d,v
retrieving revision 1.7
diff -u -p -r1.7 bltu.d
--- gas/testsuite/gas/mips/bltu.d 12 Mar 2003 23:05:31 -0000 1.7
+++ gas/testsuite/gas/mips/bltu.d 28 Mar 2003 06:53:54 -0000
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS bltu
+#as: -32
 
 # Test the bltu macro.
 
Index: gas/testsuite/gas/mips/branch-misc-1.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/branch-misc-1.d,v
retrieving revision 1.1
diff -u -p -r1.1 branch-misc-1.d
--- gas/testsuite/gas/mips/branch-misc-1.d 18 Sep 2002 20:50:46 -0000 1.1
+++ gas/testsuite/gas/mips/branch-misc-1.d 28 Mar 2003 06:53:54 -0000
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS branch-misc-1
+#as: -32
 
 # Test the branches to local symbols in current file.
 
Index: gas/testsuite/gas/mips/break20.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/break20.d,v
retrieving revision 1.2
diff -u -p -r1.2 break20.d
--- gas/testsuite/gas/mips/break20.d 29 Jun 2001 21:27:43 -0000 1.2
+++ gas/testsuite/gas/mips/break20.d 28 Mar 2003 06:53:54 -0000
@@ -1,4 +1,4 @@
-#as: -march=r3900
+#as: -32 -march=r3900
 #objdump: -dr --prefix-addresses -mmips:3900
 #name: MIPS 20-bit break
 
Index: gas/testsuite/gas/mips/cp0sel-names-mips32.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/cp0sel-names-mips32.d,v
retrieving revision 1.1
diff -u -p -r1.1 cp0sel-names-mips32.d
--- gas/testsuite/gas/mips/cp0sel-names-mips32.d 31 Dec 2002 08:11:17 -0000 1.1
+++ gas/testsuite/gas/mips/cp0sel-names-mips32.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32 -M gpr-names=numeric,cp0-names=mips32
 #name: MIPS CP0 with sel register disassembly (mips32)
-#as: -march=mips32
+#as: -32 -march=mips32
 #source: cp0sel-names.s
 
 # Check objdump's handling of -M cp0-names=foo options.
Index: gas/testsuite/gas/mips/cp0sel-names-mips32r2.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/cp0sel-names-mips32r2.d,v
retrieving revision 1.1
diff -u -p -r1.1 cp0sel-names-mips32r2.d
--- gas/testsuite/gas/mips/cp0sel-names-mips32r2.d 31 Dec 2002 08:11:17 -0000 1.1
+++ gas/testsuite/gas/mips/cp0sel-names-mips32r2.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32 -M gpr-names=numeric,cp0-names=mips32r2
 #name: MIPS CP0 with sel register disassembly (mips32r2)
-#as: -march=mips32
+#as: -32 -march=mips32
 #source: cp0sel-names.s
 
 # Check objdump's handling of -M cp0-names=foo options.
Index: gas/testsuite/gas/mips/cp0sel-names-mips64.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/cp0sel-names-mips64.d,v
retrieving revision 1.1
diff -u -p -r1.1 cp0sel-names-mips64.d
--- gas/testsuite/gas/mips/cp0sel-names-mips64.d 31 Dec 2002 08:11:17 -0000 1.1
+++ gas/testsuite/gas/mips/cp0sel-names-mips64.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32 -M gpr-names=numeric,cp0-names=mips64
 #name: MIPS CP0 with sel register disassembly (mips64)
-#as: -march=mips32
+#as: -32 -march=mips32
 #source: cp0sel-names.s
 
 # Check objdump's handling of -M cp0-names=foo options.
Index: gas/testsuite/gas/mips/cp0sel-names-numeric.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/cp0sel-names-numeric.d,v
retrieving revision 1.1
diff -u -p -r1.1 cp0sel-names-numeric.d
--- gas/testsuite/gas/mips/cp0sel-names-numeric.d 31 Dec 2002 08:11:17 -0000 1.1
+++ gas/testsuite/gas/mips/cp0sel-names-numeric.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32 -M gpr-names=numeric,cp0-names=numeric
 #name: MIPS CP0 with sel register disassembly (numeric)
-#as: -march=mips32
+#as: -32 -march=mips32
 #source: cp0sel-names.s
 
 # Check objdump's handling of -M cp0-names=foo options.
Index: gas/testsuite/gas/mips/cp0sel-names-sb1.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/cp0sel-names-sb1.d,v
retrieving revision 1.1
diff -u -p -r1.1 cp0sel-names-sb1.d
--- gas/testsuite/gas/mips/cp0sel-names-sb1.d 31 Dec 2002 08:11:17 -0000 1.1
+++ gas/testsuite/gas/mips/cp0sel-names-sb1.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32 -M gpr-names=numeric,cp0-names=sb1
 #name: MIPS CP0 with sel register disassembly (sb1)
-#as: -march=mips32
+#as: -32 -march=mips32
 #source: cp0sel-names.s
 
 # Check objdump's handling of -M cp0-names=foo options.
Index: gas/testsuite/gas/mips/elf-jal.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf-jal.d,v
retrieving revision 1.2
diff -u -p -r1.2 elf-jal.d
--- gas/testsuite/gas/mips/elf-jal.d 27 Dec 2002 23:51:48 -0000 1.2
+++ gas/testsuite/gas/mips/elf-jal.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,7 @@
 #objdump: -dr --prefix-addresses
 #name: MIPS ELF jal
 #source: jal.s
+#as: -32
 
 # Test the jal macro.
 
Index: gas/testsuite/gas/mips/elf-rel.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf-rel.d,v
retrieving revision 1.6
diff -u -p -r1.6 elf-rel.d
--- gas/testsuite/gas/mips/elf-rel.d 23 May 2002 17:25:21 -0000 1.6
+++ gas/testsuite/gas/mips/elf-rel.d 28 Mar 2003 06:53:55 -0000
@@ -1,5 +1,6 @@
 #objdump: -sr -j .text
 #name: MIPS ELF reloc
+#as: -32
 
 # Test the HI16/LO16 generation.
 
Index: gas/testsuite/gas/mips/elf-rel2.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf-rel2.d,v
retrieving revision 1.4
diff -u -p -r1.4 elf-rel2.d
--- gas/testsuite/gas/mips/elf-rel2.d 10 Aug 2001 20:38:33 -0000 1.4
+++ gas/testsuite/gas/mips/elf-rel2.d 28 Mar 2003 06:53:55 -0000
@@ -1,5 +1,6 @@
 #objdump: -sr -j .text
 #name: MIPS ELF reloc 2
+#as: -mabi=o64
 
 # Test the GPREL and LITERAL generation.
 # FIXME: really this should check that the contents of .sdata, .lit4,
Index: gas/testsuite/gas/mips/elf-rel3.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf-rel3.d,v
retrieving revision 1.3
diff -u -p -r1.3 elf-rel3.d
--- gas/testsuite/gas/mips/elf-rel3.d 10 Aug 2001 20:38:33 -0000 1.3
+++ gas/testsuite/gas/mips/elf-rel3.d 28 Mar 2003 06:53:55 -0000
@@ -1,5 +1,6 @@
 #objdump: -sr -j .data
 #name: MIPS ELF reloc 3
+#as: -32
 
 .*:     file format elf.*mips
 
Index: gas/testsuite/gas/mips/elf-rel4.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf-rel4.d,v
retrieving revision 1.2
diff -u -p -r1.2 elf-rel4.d
--- gas/testsuite/gas/mips/elf-rel4.d 4 Oct 2001 00:57:01 -0000 1.2
+++ gas/testsuite/gas/mips/elf-rel4.d 28 Mar 2003 06:53:55 -0000
@@ -1,5 +1,6 @@
 #objdump: --prefix-addresses -dr
 #name: MIPS ELF reloc 4
+#as: -32
 
 .*: +file format.*
 
Index: gas/testsuite/gas/mips/elf-rel5.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf-rel5.d,v
retrieving revision 1.1
diff -u -p -r1.1 elf-rel5.d
--- gas/testsuite/gas/mips/elf-rel5.d 17 Nov 2001 02:59:06 -0000 1.1
+++ gas/testsuite/gas/mips/elf-rel5.d 28 Mar 2003 06:53:55 -0000
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS ELF reloc 5
+#as: -32
 
 .*: +file format elf.*mips.*
 
Index: gas/testsuite/gas/mips/elf-rel6.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf-rel6.d,v
retrieving revision 1.2
diff -u -p -r1.2 elf-rel6.d
--- gas/testsuite/gas/mips/elf-rel6.d 2 Aug 2002 02:33:48 -0000 1.2
+++ gas/testsuite/gas/mips/elf-rel6.d 28 Mar 2003 06:53:55 -0000
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses
 #name: MIPS ELF reloc 6
+#as: -32
 
 .*: +file format elf.*mips.*
 
Index: gas/testsuite/gas/mips/elf-rel7.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf-rel7.d,v
retrieving revision 1.1
diff -u -p -r1.1 elf-rel7.d
--- gas/testsuite/gas/mips/elf-rel7.d 21 Oct 2002 14:59:30 -0000 1.1
+++ gas/testsuite/gas/mips/elf-rel7.d 28 Mar 2003 06:53:55 -0000
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses
 #name: MIPS ELF reloc 7
+#as: -32
 
 .*: +file format elf.*mips.*
 
Index: gas/testsuite/gas/mips/elf_arch_mips1.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf_arch_mips1.d,v
retrieving revision 1.1
diff -u -p -r1.1 elf_arch_mips1.d
--- gas/testsuite/gas/mips/elf_arch_mips1.d 31 Dec 2002 07:42:20 -0000 1.1
+++ gas/testsuite/gas/mips/elf_arch_mips1.d 28 Mar 2003 06:53:55 -0000
@@ -1,7 +1,7 @@
 # name: ELF MIPS1 markings
 # source: empty.s
 # objdump: -p
-# as: -march=mips1
+# as: -32 -march=mips1
 
 .*:.*file format.*elf.*mips.*
 # Note: objdump omits leading zeros, so must check for the fact that
Index: gas/testsuite/gas/mips/elf_arch_mips2.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf_arch_mips2.d,v
retrieving revision 1.1
diff -u -p -r1.1 elf_arch_mips2.d
--- gas/testsuite/gas/mips/elf_arch_mips2.d 31 Dec 2002 07:42:20 -0000 1.1
+++ gas/testsuite/gas/mips/elf_arch_mips2.d 28 Mar 2003 06:53:55 -0000
@@ -1,7 +1,7 @@
 # name: ELF MIPS2 markings
 # source: empty.s
 # objdump: -p
-# as: -march=mips2
+# as: -32 -march=mips2
 
 .*:.*file format.*elf.*mips.*
 private flags = 1.......: .*\[mips2\].*
Index: gas/testsuite/gas/mips/elf_arch_mips3.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf_arch_mips3.d,v
retrieving revision 1.1
diff -u -p -r1.1 elf_arch_mips3.d
--- gas/testsuite/gas/mips/elf_arch_mips3.d 31 Dec 2002 07:42:20 -0000 1.1
+++ gas/testsuite/gas/mips/elf_arch_mips3.d 28 Mar 2003 06:53:55 -0000
@@ -1,7 +1,7 @@
 # name: ELF MIPS3 markings
 # source: empty.s
 # objdump: -p
-# as: -march=mips3
+# as: -32 -march=mips3
 
 .*:.*file format.*elf.*mips.*
 private flags = 2.......: .*\[mips3\].*
Index: gas/testsuite/gas/mips/elf_arch_mips32.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf_arch_mips32.d,v
retrieving revision 1.1
diff -u -p -r1.1 elf_arch_mips32.d
--- gas/testsuite/gas/mips/elf_arch_mips32.d 31 Dec 2002 07:42:20 -0000 1.1
+++ gas/testsuite/gas/mips/elf_arch_mips32.d 28 Mar 2003 06:53:55 -0000
@@ -1,7 +1,7 @@
 # name: ELF MIPS32 markings
 # source: empty.s
 # objdump: -p
-# as: -march=mips32
+# as: -32 -march=mips32
 
 .*:.*file format.*elf.*mips.*
 private flags = 5.......: .*\[mips32\].*
Index: gas/testsuite/gas/mips/elf_arch_mips32r2.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf_arch_mips32r2.d,v
retrieving revision 1.1
diff -u -p -r1.1 elf_arch_mips32r2.d
--- gas/testsuite/gas/mips/elf_arch_mips32r2.d 31 Dec 2002 07:42:20 -0000 1.1
+++ gas/testsuite/gas/mips/elf_arch_mips32r2.d 28 Mar 2003 06:53:55 -0000
@@ -1,7 +1,7 @@
 # name: ELF MIPS32r2 markings
 # source: empty.s
 # objdump: -p
-# as: -march=mips32r2
+# as: -32 -march=mips32r2
 
 .*:.*file format.*elf.*mips.*
 private flags = 7.......: .*\[mips32r2\].*
Index: gas/testsuite/gas/mips/elf_arch_mips4.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf_arch_mips4.d,v
retrieving revision 1.1
diff -u -p -r1.1 elf_arch_mips4.d
--- gas/testsuite/gas/mips/elf_arch_mips4.d 31 Dec 2002 07:42:20 -0000 1.1
+++ gas/testsuite/gas/mips/elf_arch_mips4.d 28 Mar 2003 06:53:55 -0000
@@ -1,7 +1,7 @@
 # name: ELF MIPS4 markings
 # source: empty.s
 # objdump: -p
-# as: -march=mips4
+# as: -32 -march=mips4
 
 .*:.*file format.*elf.*mips.*
 private flags = 3.......: .*\[mips4\].*
Index: gas/testsuite/gas/mips/elf_arch_mips5.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf_arch_mips5.d,v
retrieving revision 1.1
diff -u -p -r1.1 elf_arch_mips5.d
--- gas/testsuite/gas/mips/elf_arch_mips5.d 31 Dec 2002 07:42:20 -0000 1.1
+++ gas/testsuite/gas/mips/elf_arch_mips5.d 28 Mar 2003 06:53:55 -0000
@@ -1,7 +1,7 @@
 # name: ELF MIPS5 markings
 # source: empty.s
 # objdump: -p
-# as: -march=mips5
+# as: -32 -march=mips5
 
 .*:.*file format.*elf.*mips.*
 private flags = 4.......: .*\[mips5\].*
Index: gas/testsuite/gas/mips/elf_arch_mips64.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf_arch_mips64.d,v
retrieving revision 1.1
diff -u -p -r1.1 elf_arch_mips64.d
--- gas/testsuite/gas/mips/elf_arch_mips64.d 31 Dec 2002 07:42:20 -0000 1.1
+++ gas/testsuite/gas/mips/elf_arch_mips64.d 28 Mar 2003 06:53:55 -0000
@@ -1,7 +1,7 @@
 # name: ELF MIPS64 markings
 # source: empty.s
 # objdump: -p
-# as: -march=mips64
+# as: -32 -march=mips64
 
 .*:.*file format.*elf.*mips.*
 private flags = 6.......: .*\[mips64\].*
Index: gas/testsuite/gas/mips/elf_ase_mips16.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf_ase_mips16.d,v
retrieving revision 1.2
diff -u -p -r1.2 elf_ase_mips16.d
--- gas/testsuite/gas/mips/elf_ase_mips16.d 31 Dec 2002 07:42:20 -0000 1.2
+++ gas/testsuite/gas/mips/elf_ase_mips16.d 28 Mar 2003 06:53:55 -0000
@@ -1,7 +1,7 @@
 # name: ELF MIPS16 ASE markings
 # source: empty.s
 # objdump: -p
-# as: -mips16
+# as: -32 -mips16
 
 .*:.*file format.*mips.*
 private flags = [0-9a-f]*[4-7c-f]......: .*[[,]mips16[],].*
Index: gas/testsuite/gas/mips/empic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/empic.d,v
retrieving revision 1.8
diff -u -p -r1.8 empic.d
--- gas/testsuite/gas/mips/empic.d 9 Aug 2002 11:07:24 -0000 1.8
+++ gas/testsuite/gas/mips/empic.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: -rst -mmips:4000
 #name: MIPS empic
-#as: -membedded-pic -mips3
+#as: -mabi=o64 -membedded-pic -mips3
 #stderr: empic.l
 
 # Check GNU-specific embedded relocs, for ELF.
Index: gas/testsuite/gas/mips/empic2.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/empic2.d,v
retrieving revision 1.2
diff -u -p -r1.2 empic2.d
--- gas/testsuite/gas/mips/empic2.d 26 Feb 2002 22:17:56 -0000 1.2
+++ gas/testsuite/gas/mips/empic2.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: --prefix-addresses -dr --show-raw-insn -mmips:4000
 #name: MIPS empic2
-#as: -membedded-pic -mips3
+#as: -mabi=o64 -membedded-pic -mips3
 
 # Check assembly of and relocs for -membedded-pic la, lw, ld, sw, sd macros.
 
Index: gas/testsuite/gas/mips/empic3_e.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/empic3_e.d,v
retrieving revision 1.1
diff -u -p -r1.1 empic3_e.d
--- gas/testsuite/gas/mips/empic3_e.d 2 Jan 2002 18:59:30 -0000 1.1
+++ gas/testsuite/gas/mips/empic3_e.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: --prefix-addresses -dr --show-raw-insn -mmips:4000
 #name: MIPS empic3 (external)
-#as: -membedded-pic -mips3
+#as: -mabi=o64 -membedded-pic -mips3
 
 # Check PC-relative HI/LO relocs relocs for -membedded-pic when HI and
 # LO are split over a 32K boundary.
Index: gas/testsuite/gas/mips/empic3_g1.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/empic3_g1.d,v
retrieving revision 1.1
diff -u -p -r1.1 empic3_g1.d
--- gas/testsuite/gas/mips/empic3_g1.d 2 Jan 2002 18:59:30 -0000 1.1
+++ gas/testsuite/gas/mips/empic3_g1.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: --prefix-addresses -dr --show-raw-insn -mmips:4000
 #name: MIPS empic3 (global, negative)
-#as: -membedded-pic -mips3
+#as: -mabi=o64 -membedded-pic -mips3
 
 # Check PC-relative HI/LO relocs relocs for -membedded-pic when HI and
 # LO are split over a 32K boundary.
Index: gas/testsuite/gas/mips/empic3_g2.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/empic3_g2.d,v
retrieving revision 1.1
diff -u -p -r1.1 empic3_g2.d
--- gas/testsuite/gas/mips/empic3_g2.d 2 Jan 2002 18:59:30 -0000 1.1
+++ gas/testsuite/gas/mips/empic3_g2.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: --prefix-addresses -dr --show-raw-insn -mmips:4000
 #name: MIPS empic3 (global, positive)
-#as: -membedded-pic -mips3
+#as: -mabi=o64 -membedded-pic -mips3
 
 # Check PC-relative HI/LO relocs relocs for -membedded-pic when HI and
 # LO are split over a 32K boundary.
Index: gas/testsuite/gas/mips/hwr-names-mips32r2.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/hwr-names-mips32r2.d,v
retrieving revision 1.1
diff -u -p -r1.1 hwr-names-mips32r2.d
--- gas/testsuite/gas/mips/hwr-names-mips32r2.d 31 Dec 2002 07:29:28 -0000 1.1
+++ gas/testsuite/gas/mips/hwr-names-mips32r2.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32r2 -M gpr-names=numeric,hwr-names=mips32r2
 #name: MIPS HWR disassembly (mips32r2)
-#as: -mips32r2
+#as: -32 -mips32r2
 #source: hwr-names.s
 
 # Check objdump's handling of -M hwr-names=foo options.
Index: gas/testsuite/gas/mips/hwr-names-numeric.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/hwr-names-numeric.d,v
retrieving revision 1.1
diff -u -p -r1.1 hwr-names-numeric.d
--- gas/testsuite/gas/mips/hwr-names-numeric.d 31 Dec 2002 07:29:28 -0000 1.1
+++ gas/testsuite/gas/mips/hwr-names-numeric.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32r2 -M gpr-names=numeric,hwr-names=numeric
 #name: MIPS HWR disassembly (numeric)
-#as: -mips32r2
+#as: -32 -mips32r2
 #source: hwr-names.s
 
 # Check objdump's handling of -M hwr-names=foo options.
Index: gas/testsuite/gas/mips/jal-empic-elf-2.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/jal-empic-elf-2.d,v
retrieving revision 1.2
diff -u -p -r1.2 jal-empic-elf-2.d
--- gas/testsuite/gas/mips/jal-empic-elf-2.d 27 Dec 2002 23:51:48 -0000 1.2
+++ gas/testsuite/gas/mips/jal-empic-elf-2.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS jal-empic-elf-2
-#as: -membedded-pic
+#as: -32 -membedded-pic
 
 # Test the jal macro harder with -membedded-pic.
 
Index: gas/testsuite/gas/mips/jal-empic-elf-3.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/jal-empic-elf-3.d,v
retrieving revision 1.2
diff -u -p -r1.2 jal-empic-elf-3.d
--- gas/testsuite/gas/mips/jal-empic-elf-3.d 27 Dec 2002 23:51:48 -0000 1.2
+++ gas/testsuite/gas/mips/jal-empic-elf-3.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS jal-empic-elf-3
-#as: -membedded-pic
+#as: -32 -membedded-pic
 
 # Test the jal macro harder with -membedded-pic.
 
Index: gas/testsuite/gas/mips/jal-empic-elf.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/jal-empic-elf.d,v
retrieving revision 1.2
diff -u -p -r1.2 jal-empic-elf.d
--- gas/testsuite/gas/mips/jal-empic-elf.d 27 Dec 2002 23:51:48 -0000 1.2
+++ gas/testsuite/gas/mips/jal-empic-elf.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS jal-empic-elf
-#as: -membedded-pic
+#as: -32 -membedded-pic
 #source: jal.s
 
 # Test the jal macro with -membedded-pic.
Index: gas/testsuite/gas/mips/jal-svr4pic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/jal-svr4pic.d,v
retrieving revision 1.5
diff -u -p -r1.5 jal-svr4pic.d
--- gas/testsuite/gas/mips/jal-svr4pic.d 23 Oct 2001 19:20:28 -0000 1.5
+++ gas/testsuite/gas/mips/jal-svr4pic.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS R3000 jal-svr4pic
-#as: -mips1 -KPIC -mtune=r3000
+#as: -32 -mips1 -KPIC -mtune=r3000
 
 # Test the jal macro with -KPIC.
 
Index: gas/testsuite/gas/mips/jal-xgot.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/jal-xgot.d,v
retrieving revision 1.5
diff -u -p -r1.5 jal-xgot.d
--- gas/testsuite/gas/mips/jal-xgot.d 23 Oct 2001 19:20:28 -0000 1.5
+++ gas/testsuite/gas/mips/jal-xgot.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS R3000 jal-xgot
-#as: -mips1 -KPIC -xgot -mtune=r3000
+#as: -32 -mips1 -KPIC -xgot -mtune=r3000
 #source: jal-svr4pic.s
 
 # Test the jal macro with -KPIC -xgot.
Index: gas/testsuite/gas/mips/jal.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/jal.d,v
retrieving revision 1.2
diff -u -p -r1.2 jal.d
--- gas/testsuite/gas/mips/jal.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/jal.d 28 Mar 2003 06:53:55 -0000
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS jal
+#as: -32
 
 # Test the jal macro.
 
Index: gas/testsuite/gas/mips/la-empic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/la-empic.d,v
retrieving revision 1.2
diff -u -p -r1.2 la-empic.d
--- gas/testsuite/gas/mips/la-empic.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/la-empic.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS la-empic
-#as: -mips1 -membedded-pic
+#as: -32 -mips1 -membedded-pic
 
 # Test the la macro with -membedded-pic.
 
Index: gas/testsuite/gas/mips/la-svr4pic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/la-svr4pic.d,v
retrieving revision 1.4
diff -u -p -r1.4 la-svr4pic.d
--- gas/testsuite/gas/mips/la-svr4pic.d 15 May 2001 12:11:13 -0000 1.4
+++ gas/testsuite/gas/mips/la-svr4pic.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS la-svr4pic
-#as: -mips1 -KPIC --defsym KPIC=1
+#as: -32 -mips1 -KPIC --defsym KPIC=1
 #source: la.s
 
 # Test the la macro with -KPIC.
Index: gas/testsuite/gas/mips/la-xgot.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/la-xgot.d,v
retrieving revision 1.4
diff -u -p -r1.4 la-xgot.d
--- gas/testsuite/gas/mips/la-xgot.d 15 May 2001 12:11:13 -0000 1.4
+++ gas/testsuite/gas/mips/la-xgot.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS la-xgot
-#as: -mips1 -KPIC -xgot --defsym KPIC=1
+#as: -32 -mips1 -KPIC -xgot --defsym KPIC=1
 #source: la.s
 
 # Test the la macro with -KPIC -xgot.
Index: gas/testsuite/gas/mips/la.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/la.d,v
retrieving revision 1.3
diff -u -p -r1.3 la.d
--- gas/testsuite/gas/mips/la.d 15 May 2001 12:11:13 -0000 1.3
+++ gas/testsuite/gas/mips/la.d 28 Mar 2003 06:53:55 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS la
-#as: -mips1
+#as: -32 -mips1
 
 # Test the la macro.
 
Index: gas/testsuite/gas/mips/lb-empic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/lb-empic.d,v
retrieving revision 1.2
diff -u -p -r1.2 lb-empic.d
--- gas/testsuite/gas/mips/lb-empic.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/lb-empic.d 28 Mar 2003 06:53:56 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS lb-empic
-#as: -mips1 -membedded-pic
+#as: -32 -mips1 -membedded-pic
 #source: lb-pic.s
 
 # Test the lb macro with -membedded-pic.
Index: gas/testsuite/gas/mips/lb-svr4pic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/lb-svr4pic.d,v
retrieving revision 1.3
diff -u -p -r1.3 lb-svr4pic.d
--- gas/testsuite/gas/mips/lb-svr4pic.d 27 Dec 2002 23:51:48 -0000 1.3
+++ gas/testsuite/gas/mips/lb-svr4pic.d 28 Mar 2003 06:53:56 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses
 #name: MIPS lb-svr4pic
-#as: -KPIC
+#as: -32 -KPIC
 #source: lb-pic.s
 
 # Test the lb macro with -KPIC.
Index: gas/testsuite/gas/mips/lb-xgot-ilocks.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/lb-xgot-ilocks.d,v
retrieving revision 1.4
diff -u -p -r1.4 lb-xgot-ilocks.d
--- gas/testsuite/gas/mips/lb-xgot-ilocks.d 3 Jul 2001 18:49:04 -0000 1.4
+++ gas/testsuite/gas/mips/lb-xgot-ilocks.d 28 Mar 2003 06:53:56 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS lb-xgot-ilocks
-#as: -mips1 -KPIC -xgot -mtune=r3900 -march=r3900
+#as: -32 -mips1 -KPIC -xgot -mtune=r3900 -march=r3900
 #source: lb-pic.s
 
 # Test the lb macro with -KPIC -xgot.
Index: gas/testsuite/gas/mips/lb-xgot.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/lb-xgot.d,v
retrieving revision 1.3
diff -u -p -r1.3 lb-xgot.d
--- gas/testsuite/gas/mips/lb-xgot.d 29 Jun 2001 21:27:43 -0000 1.3
+++ gas/testsuite/gas/mips/lb-xgot.d 28 Mar 2003 06:53:56 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS lb-xgot
-#as: -mips1 -KPIC -xgot -mtune=r3000
+#as: -32 -mips1 -KPIC -xgot -mtune=r3000
 #source: lb-pic.s
 
 # Test the lb macro with -KPIC -xgot.
Index: gas/testsuite/gas/mips/lb.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/lb.d,v
retrieving revision 1.4
diff -u -p -r1.4 lb.d
--- gas/testsuite/gas/mips/lb.d 27 Dec 2002 23:51:48 -0000 1.4
+++ gas/testsuite/gas/mips/lb.d 28 Mar 2003 06:53:56 -0000
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses
 #name: MIPS lb
+#as: -32
 
 # Test the lb macro.
 
Index: gas/testsuite/gas/mips/ld-empic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ld-empic.d,v
retrieving revision 1.3
diff -u -p -r1.3 ld-empic.d
--- gas/testsuite/gas/mips/ld-empic.d 25 Oct 2001 01:22:18 -0000 1.3
+++ gas/testsuite/gas/mips/ld-empic.d 28 Mar 2003 06:53:56 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ld-empic
-#as: -mips1 -membedded-pic --defsym EMPIC=1
+#as: -32 -mips1 -membedded-pic --defsym EMPIC=1
 #source: ld-pic.s
 
 # Test the ld macro with -membedded-pic.
Index: gas/testsuite/gas/mips/ld-svr4pic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ld-svr4pic.d,v
retrieving revision 1.3
diff -u -p -r1.3 ld-svr4pic.d
--- gas/testsuite/gas/mips/ld-svr4pic.d 29 Jun 2001 21:27:43 -0000 1.3
+++ gas/testsuite/gas/mips/ld-svr4pic.d 28 Mar 2003 06:53:56 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ld-svr4pic
-#as: -mips1 -mtune=r3000 -KPIC
+#as: -32 -mips1 -mtune=r3000 -KPIC
 #source: ld-pic.s
 
 # Test the ld macro with -KPIC.
Index: gas/testsuite/gas/mips/ld-xgot.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ld-xgot.d,v
retrieving revision 1.3
diff -u -p -r1.3 ld-xgot.d
--- gas/testsuite/gas/mips/ld-xgot.d 29 Jun 2001 21:27:43 -0000 1.3
+++ gas/testsuite/gas/mips/ld-xgot.d 28 Mar 2003 06:53:56 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ld-xgot
-#as: -mips1 -mtune=r3000 -KPIC -xgot
+#as: -32 -mips1 -mtune=r3000 -KPIC -xgot
 #source: ld-pic.s
 
 # Test the ld macro with -KPIC -xgot.
Index: gas/testsuite/gas/mips/ld.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ld.d,v
retrieving revision 1.4
diff -u -p -r1.4 ld.d
--- gas/testsuite/gas/mips/ld.d 4 Oct 2001 00:57:01 -0000 1.4
+++ gas/testsuite/gas/mips/ld.d 28 Mar 2003 06:53:56 -0000
@@ -1,5 +1,5 @@
 #objdump: -dr --prefix-addresses -mmips:4000
-#as: -march=r4000
+#as: -32 -march=r4000
 #name: MIPS ld
 
 # Test the ld macro.
Index: gas/testsuite/gas/mips/li.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/li.d,v
retrieving revision 1.2
diff -u -p -r1.2 li.d
--- gas/testsuite/gas/mips/li.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/li.d 28 Mar 2003 06:53:56 -0000
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS li
+#as: -32
 
 # Test the li macro.
 
Index: gas/testsuite/gas/mips/lif-empic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/lif-empic.d,v
retrieving revision 1.3
diff -u -p -r1.3 lif-empic.d
--- gas/testsuite/gas/mips/lif-empic.d 27 Jul 2001 06:26:23 -0000 1.3
+++ gas/testsuite/gas/mips/lif-empic.d 28 Mar 2003 06:53:56 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS lifloat-empic
-#as: -mips1 -membedded-pic --defsym EMPIC=1
+#as: -32 -mips1 -membedded-pic --defsym EMPIC=1
 #source: lifloat.s
 
 # Test the li.d and li.s macros with -membedded-pic.
Index: gas/testsuite/gas/mips/lif-svr4pic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/lif-svr4pic.d,v
retrieving revision 1.3
diff -u -p -r1.3 lif-svr4pic.d
--- gas/testsuite/gas/mips/lif-svr4pic.d 29 Jun 2001 21:27:43 -0000 1.3
+++ gas/testsuite/gas/mips/lif-svr4pic.d 28 Mar 2003 06:53:56 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS lifloat-svr4pic
-#as: -mips1 -mtune=r3000 -KPIC -EB --defsym SVR4=1
+#as: -32 -mips1 -mtune=r3000 -KPIC -EB --defsym SVR4=1
 #source: lifloat.s
 
 # Test the li.d and li.s macros with -KPIC.
Index: gas/testsuite/gas/mips/lif-xgot.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/lif-xgot.d,v
retrieving revision 1.3
diff -u -p -r1.3 lif-xgot.d
--- gas/testsuite/gas/mips/lif-xgot.d 29 Jun 2001 21:27:43 -0000 1.3
+++ gas/testsuite/gas/mips/lif-xgot.d 28 Mar 2003 06:53:56 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS lifloat-xgot
-#as: -mips1 -mtune=r3000 -KPIC -xgot -EB --defsym XGOT=1
+#as: -32 -mips1 -mtune=r3000 -KPIC -xgot -EB --defsym XGOT=1
 #source: lifloat.s
 
 # Test the li.d and li.s macros with -KPIC -xgot.
Index: gas/testsuite/gas/mips/lifloat.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/lifloat.d,v
retrieving revision 1.2
diff -u -p -r1.2 lifloat.d
--- gas/testsuite/gas/mips/lifloat.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/lifloat.d 28 Mar 2003 06:53:56 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS lifloat
-#as: -mips1
+#as: -32 -mips1
 
 # Test the li.d and li.s macros.
 
Index: gas/testsuite/gas/mips/mips-gp32-fp32-pic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips-gp32-fp32-pic.d,v
retrieving revision 1.3
diff -u -p -r1.3 mips-gp32-fp32-pic.d
--- gas/testsuite/gas/mips/mips-gp32-fp32-pic.d 10 Aug 2001 16:28:04 -0000 1.3
+++ gas/testsuite/gas/mips/mips-gp32-fp32-pic.d 28 Mar 2003 06:53:56 -0000
@@ -1,5 +1,5 @@
 #objdump: -d -mmips:8000
-#as: -march=8000 -EB -mgp32 -mfp32 -KPIC
+#as: -32 -march=8000 -EB -mgp32 -mfp32 -KPIC
 #name: MIPS -mgp32 -mfp32 (SVR4 PIC)
 
 .*: +file format.*
Index: gas/testsuite/gas/mips/mips-gp32-fp32.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips-gp32-fp32.d,v
retrieving revision 1.3
diff -u -p -r1.3 mips-gp32-fp32.d
--- gas/testsuite/gas/mips/mips-gp32-fp32.d 10 Aug 2001 16:28:04 -0000 1.3
+++ gas/testsuite/gas/mips/mips-gp32-fp32.d 28 Mar 2003 06:53:56 -0000
@@ -1,5 +1,5 @@
 #objdump: -d -mmips:8000
-#as: -march=8000 -EB -mgp32 -mfp32
+#as: -32 -march=8000 -EB -mgp32 -mfp32
 #name: MIPS -mgp32 -mfp32
 
 .*: +file format.*
Index: gas/testsuite/gas/mips/mips-gp32-fp64-pic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips-gp32-fp64-pic.d,v
retrieving revision 1.4
diff -u -p -r1.4 mips-gp32-fp64-pic.d
--- gas/testsuite/gas/mips/mips-gp32-fp64-pic.d 25 Jul 2002 09:48:07 -0000 1.4
+++ gas/testsuite/gas/mips/mips-gp32-fp64-pic.d 28 Mar 2003 06:53:56 -0000
@@ -1,5 +1,5 @@
 #objdump: -d -mmips:8000
-#as: -march=8000 -EB -mgp32 -mfp64 -KPIC
+#as: -32 -march=8000 -EB -mgp32 -mfp64 -KPIC
 #name: MIPS -mgp32 -mfp64 (SVR4 PIC)
 
 .*: +file format.*
Index: gas/testsuite/gas/mips/mips-gp32-fp64.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips-gp32-fp64.d,v
retrieving revision 1.4
diff -u -p -r1.4 mips-gp32-fp64.d
--- gas/testsuite/gas/mips/mips-gp32-fp64.d 25 Jul 2002 09:48:07 -0000 1.4
+++ gas/testsuite/gas/mips/mips-gp32-fp64.d 28 Mar 2003 06:53:56 -0000
@@ -1,5 +1,5 @@
 #objdump: -d -mmips:8000
-#as: -march=8000 -EB -mgp32 -mfp64
+#as: -32 -march=8000 -EB -mgp32 -mfp64
 #name: MIPS -mgp32 -mfp64
 
 .*: +file format.*
Index: gas/testsuite/gas/mips/mips-gp64-fp32-pic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d,v
retrieving revision 1.4
diff -u -p -r1.4 mips-gp64-fp32-pic.d
--- gas/testsuite/gas/mips/mips-gp64-fp32-pic.d 25 Feb 2002 13:21:38 -0000 1.4
+++ gas/testsuite/gas/mips/mips-gp64-fp32-pic.d 28 Mar 2003 06:53:56 -0000
@@ -1,5 +1,5 @@
 #objdump: -d -mmips:8000
-#as: -march=8000 -EB -mfp32 -KPIC
+#as: -mabi=o64 -march=8000 -EB -mfp32 -KPIC
 #name: MIPS -mgp64 -mfp32 (SVR4 PIC)
 
 .*: +file format.*
Index: gas/testsuite/gas/mips/mips-gp64-fp32.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips-gp64-fp32.d,v
retrieving revision 1.5
diff -u -p -r1.5 mips-gp64-fp32.d
--- gas/testsuite/gas/mips/mips-gp64-fp32.d 22 Apr 2002 22:29:47 -0000 1.5
+++ gas/testsuite/gas/mips/mips-gp64-fp32.d 28 Mar 2003 06:53:56 -0000
@@ -1,5 +1,5 @@
 #objdump: -d -mmips:8000
-#as: -march=8000 -EB -mfp32
+#as: -mabi=o64 -march=8000 -EB -mfp32
 #name: MIPS -mgp64 -mfp32
 #stderr: mips-gp64-fp32.l
 
Index: gas/testsuite/gas/mips/mips-gp64-fp64-pic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips-gp64-fp64-pic.d,v
retrieving revision 1.4
diff -u -p -r1.4 mips-gp64-fp64-pic.d
--- gas/testsuite/gas/mips/mips-gp64-fp64-pic.d 25 Feb 2002 13:21:38 -0000 1.4
+++ gas/testsuite/gas/mips/mips-gp64-fp64-pic.d 28 Mar 2003 06:53:56 -0000
@@ -1,5 +1,5 @@
 #objdump: -d -mmips:8000
-#as: -march=8000 -EB -KPIC
+#as: -mabi=o64 -march=8000 -EB -KPIC
 #name: MIPS -mgp64 -mfp64 (SVR4 PIC)
 
 .*: +file format.*
Index: gas/testsuite/gas/mips/mips-gp64-fp64.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips-gp64-fp64.d,v
retrieving revision 1.5
diff -u -p -r1.5 mips-gp64-fp64.d
--- gas/testsuite/gas/mips/mips-gp64-fp64.d 22 Apr 2002 22:29:47 -0000 1.5
+++ gas/testsuite/gas/mips/mips-gp64-fp64.d 28 Mar 2003 06:53:56 -0000
@@ -1,5 +1,5 @@
 #objdump: -d -mmips:8000
-#as: -march=8000 -EB
+#as: -mabi=o64 -march=8000 -EB
 #name: MIPS -mgp64 -mfp64
 #stderr: mips-gp64-fp32.l
 
Index: gas/testsuite/gas/mips/mips.exp
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips.exp,v
retrieving revision 1.64
diff -u -p -r1.64 mips.exp
--- gas/testsuite/gas/mips/mips.exp 12 Mar 2003 23:05:31 -0000 1.64
+++ gas/testsuite/gas/mips/mips.exp 28 Mar 2003 06:53:57 -0000
@@ -407,7 +407,7 @@ if { [istarget mips*-*-*] } then {
     run_dump_test_arches "blt"		[mips_arch_list_matching mips2]
     run_dump_test_arches "bltu"		[mips_arch_list_matching mips2]
     run_dump_test_arches "branch-misc-1" [mips_arch_list_matching mips1]
-    run_list_test_arches "branch-misc-2" "" [mips_arch_list_matching mips1]
+    run_list_test_arches "branch-misc-2" "-32" [mips_arch_list_matching mips1]
 
     if $ilocks {
 	run_dump_test "div-ilocks"
@@ -431,7 +431,7 @@ if { [istarget mips*-*-*] } then {
 	run_dump_test_arches "jal-empic-elf-2" [mips_arch_list_matching mips1]
 	run_dump_test_arches "jal-empic-elf-3" [mips_arch_list_matching mips1]
     }
-    run_list_test_arches "jal-range" ""	[mips_arch_list_matching mips1]
+    run_list_test_arches "jal-range" "-32" [mips_arch_list_matching mips1]
     if !$aout { run_dump_test "la" }
     if $elf { run_dump_test "la-svr4pic" }
     if $elf { run_dump_test "la-xgot" }
@@ -510,7 +510,7 @@ if { [istarget mips*-*-*] } then {
 	run_dump_test "mips16-jalx"
 	run_dump_test "mips-jalx"
     }
-    run_list_test "mips-no-jalx" ""
+    run_list_test "mips-no-jalx" "-32"
     run_dump_test "delay"
     run_dump_test "nodelay"
     run_dump_test "mips4010"
@@ -528,7 +528,7 @@ if { [istarget mips*-*-*] } then {
     run_dump_test_arches "mips32"	[mips_arch_list_matching mips32]
 
     run_dump_test_arches "mips32r2"	[mips_arch_list_matching mips32r2]
-    run_list_test_arches "mips32r2-ill" "" [mips_arch_list_matching mips32r2]
+    run_list_test_arches "mips32r2-ill" "-32" [mips_arch_list_matching mips32r2]
 
     run_dump_test_arches "mips64"	[mips_arch_list_matching mips64]
 
@@ -541,8 +541,8 @@ if { [istarget mips*-*-*] } then {
 
     run_dump_test "relax"
 
-    run_list_test "illegal" ""
-    run_list_test "baddata1" ""
+    run_list_test "illegal" "-32"
+    run_list_test "baddata1" "-32"
 
     # LOSE: As of 2002-02-08, the next 4 tests fail for target mips-ecoff.
     # It's unknown whether they _should_ pass as-is, or whether different
Index: gas/testsuite/gas/mips/mips16-e.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips16-e.d,v
retrieving revision 1.4
diff -u -p -r1.4 mips16-e.d
--- gas/testsuite/gas/mips/mips16-e.d 10 Aug 2001 20:38:33 -0000 1.4
+++ gas/testsuite/gas/mips/mips16-e.d 28 Mar 2003 06:53:57 -0000
@@ -1,6 +1,6 @@
 #objdump: -rst -mips16
 #name: MIPS16 reloc
-#as: -mips16
+#as: -32 -mips16
 
 # Check MIPS16 reloc processing
 
Index: gas/testsuite/gas/mips/mips16-f.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips16-f.d,v
retrieving revision 1.5
diff -u -p -r1.5 mips16-f.d
--- gas/testsuite/gas/mips/mips16-f.d 25 Aug 2001 00:48:49 -0000 1.5
+++ gas/testsuite/gas/mips/mips16-f.d 28 Mar 2003 06:53:57 -0000
@@ -1,6 +1,6 @@
 #objdump: -rst -mips16
 #name: MIPS16 reloc 2
-#as: -mips16
+#as: -32 -mips16
 
 # Check MIPS16 reloc processing
 
Index: gas/testsuite/gas/mips/mips32.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips32.d,v
retrieving revision 1.9
diff -u -p -r1.9 mips32.d
--- gas/testsuite/gas/mips/mips32.d 27 Dec 2002 23:51:48 -0000 1.9
+++ gas/testsuite/gas/mips/mips32.d 28 Mar 2003 06:53:57 -0000
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS MIPS32 instructions
+#as: -32
 
 # Check MIPS32 instruction assembly
 
Index: gas/testsuite/gas/mips/mips32r2.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips32r2.d,v
retrieving revision 1.2
diff -u -p -r1.2 mips32r2.d
--- gas/testsuite/gas/mips/mips32r2.d 2 Jan 2003 20:03:08 -0000 1.2
+++ gas/testsuite/gas/mips/mips32r2.d 28 Mar 2003 06:53:57 -0000
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
 #name: MIPS MIPS32r2 instructions
+#as: -32
 
 # Check MIPS32 Release 2 (mips32r2) instruction assembly
 
Index: gas/testsuite/gas/mips/mips4010.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips4010.d,v
retrieving revision 1.3
diff -u -p -r1.3 mips4010.d
--- gas/testsuite/gas/mips/mips4010.d 29 Jun 2001 21:27:43 -0000 1.3
+++ gas/testsuite/gas/mips/mips4010.d 28 Mar 2003 06:53:57 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4010
 #name: MIPS 4010
-#as: -march=4010
+#as: -32 -march=4010
 
 
 .*: +file format .*mips.*
Index: gas/testsuite/gas/mips/mips4650.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips4650.d,v
retrieving revision 1.3
diff -u -p -r1.3 mips4650.d
--- gas/testsuite/gas/mips/mips4650.d 29 Jun 2001 21:27:43 -0000 1.3
+++ gas/testsuite/gas/mips/mips4650.d 28 Mar 2003 06:53:57 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4650
 #name: MIPS 4650
-#as: -march=4650 -mtune=4650
+#as: -32 -march=4650 -mtune=4650
 
 
 .*: +file format .*mips.*
Index: gas/testsuite/gas/mips/mips64.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips64.d,v
retrieving revision 1.7
diff -u -p -r1.7 mips64.d
--- gas/testsuite/gas/mips/mips64.d 27 Dec 2002 23:51:49 -0000 1.7
+++ gas/testsuite/gas/mips/mips64.d 28 Mar 2003 06:53:57 -0000
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS MIPS64 instructions
+#as: -32
 
 # Check MIPS64 instruction assembly
 
Index: gas/testsuite/gas/mips/mipsel16-e.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mipsel16-e.d,v
retrieving revision 1.1
diff -u -p -r1.1 mipsel16-e.d
--- gas/testsuite/gas/mips/mipsel16-e.d 25 Aug 2001 00:48:49 -0000 1.1
+++ gas/testsuite/gas/mips/mipsel16-e.d 28 Mar 2003 06:53:57 -0000
@@ -1,6 +1,6 @@
 #objdump: -rst -mips16
 #name: MIPS16 reloc
-#as: -mips16
+#as: -32 -mips16
 #source: mips16-e.s
 
 # Check MIPS16 reloc processing
Index: gas/testsuite/gas/mips/mipsel16-f.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mipsel16-f.d,v
retrieving revision 1.4
diff -u -p -r1.4 mipsel16-f.d
--- gas/testsuite/gas/mips/mipsel16-f.d 25 Aug 2001 00:48:49 -0000 1.4
+++ gas/testsuite/gas/mips/mipsel16-f.d 28 Mar 2003 06:53:57 -0000
@@ -1,6 +1,6 @@
 #objdump: -rst -mips16
 #name: MIPS16 reloc 2
-#as: -mips16
+#as: -32 -mips16
 #source: mips16-f.s
 
 # Check MIPS16 reloc processing
Index: gas/testsuite/gas/mips/rol-hw.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/rol-hw.d,v
retrieving revision 1.2
diff -u -p -r1.2 rol-hw.d
--- gas/testsuite/gas/mips/rol-hw.d 27 Dec 2002 23:51:49 -0000 1.2
+++ gas/testsuite/gas/mips/rol-hw.d 28 Mar 2003 06:53:57 -0000
@@ -2,6 +2,7 @@
 #name: MIPS hardware rol/ror
 #source: rol.s
 #stderr: rol-hw.l
+#as: -32
 
 # Test the rol and ror macros.
 
Index: gas/testsuite/gas/mips/rol.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/rol.d,v
retrieving revision 1.6
diff -u -p -r1.6 rol.d
--- gas/testsuite/gas/mips/rol.d 27 Dec 2002 23:51:49 -0000 1.6
+++ gas/testsuite/gas/mips/rol.d 28 Mar 2003 06:53:57 -0000
@@ -1,6 +1,7 @@
 #objdump: -dr --prefix-addresses
 #name: MIPS macro rol/ror
 #stderr: rol.l
+#as: -32
 
 # Test the rol and ror macros.
 
Index: gas/testsuite/gas/mips/sb.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/sb.d,v
retrieving revision 1.3
diff -u -p -r1.3 sb.d
--- gas/testsuite/gas/mips/sb.d 7 Aug 2001 12:36:13 -0000 1.3
+++ gas/testsuite/gas/mips/sb.d 28 Mar 2003 06:53:57 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS sb
-#as: -mips1
+#as: -32 -mips1
 
 # Test the sb macro.
 
Index: gas/testsuite/gas/mips/sync.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/sync.d,v
retrieving revision 1.3
diff -u -p -r1.3 sync.d
--- gas/testsuite/gas/mips/sync.d 3 Dec 2000 20:50:35 -0000 1.3
+++ gas/testsuite/gas/mips/sync.d 28 Mar 2003 06:53:57 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: sync instructions
-#as: -mips2
+#as: -32 -mips2
 
 .*: +file format .*mips.*
 
Index: gas/testsuite/gas/mips/tempic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/tempic.d,v
retrieving revision 1.6
diff -u -p -r1.6 tempic.d
--- gas/testsuite/gas/mips/tempic.d 14 Aug 2002 07:24:56 -0000 1.6
+++ gas/testsuite/gas/mips/tempic.d 28 Mar 2003 06:53:57 -0000
@@ -1,6 +1,6 @@
 #objdump: -rst -mmips:4000
 #name: MIPS empic
-#as: -membedded-pic -mips3
+#as: -mabi=o64 -membedded-pic -mips3
 #source: empic.s
 #stderr: empic.l
 
Index: gas/testsuite/gas/mips/tmips16-e.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/tmips16-e.d,v
retrieving revision 1.3
diff -u -p -r1.3 tmips16-e.d
--- gas/testsuite/gas/mips/tmips16-e.d 10 Aug 2001 20:38:33 -0000 1.3
+++ gas/testsuite/gas/mips/tmips16-e.d 28 Mar 2003 06:53:57 -0000
@@ -1,6 +1,6 @@
 #objdump: -rst -mips16
 #name: MIPS16 reloc
-#as: -mips16
+#as: -32 -mips16
 #source: mips16-e.s
 
 # Check MIPS16 reloc processing
Index: gas/testsuite/gas/mips/tmips16-f.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/tmips16-f.d,v
retrieving revision 1.1
diff -u -p -r1.1 tmips16-f.d
--- gas/testsuite/gas/mips/tmips16-f.d 6 Sep 2001 20:02:20 -0000 1.1
+++ gas/testsuite/gas/mips/tmips16-f.d 28 Mar 2003 06:53:57 -0000
@@ -1,6 +1,6 @@
 #objdump: -rst -mips16
 #name: MIPS16 reloc 2
-#as: -mips16
+#as: -32 -mips16
 #source: mips16-f.s
 
 # Check MIPS16 reloc processing
Index: gas/testsuite/gas/mips/tmipsel16-e.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/tmipsel16-e.d,v
retrieving revision 1.3
diff -u -p -r1.3 tmipsel16-e.d
--- gas/testsuite/gas/mips/tmipsel16-e.d 10 Aug 2001 20:38:33 -0000 1.3
+++ gas/testsuite/gas/mips/tmipsel16-e.d 28 Mar 2003 06:53:57 -0000
@@ -1,6 +1,6 @@
 #objdump: -rst -mips16
 #name: MIPS16 reloc
-#as: -mips16
+#as: -32 -mips16
 #source: mips16-e.s
 
 # Check MIPS16 reloc processing
Index: gas/testsuite/gas/mips/tmipsel16-f.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/tmipsel16-f.d,v
retrieving revision 1.1
diff -u -p -r1.1 tmipsel16-f.d
--- gas/testsuite/gas/mips/tmipsel16-f.d 25 Aug 2001 00:48:49 -0000 1.1
+++ gas/testsuite/gas/mips/tmipsel16-f.d 28 Mar 2003 06:53:57 -0000
@@ -1,6 +1,6 @@
 #objdump: -rst -mips16
 #name: MIPS16 reloc 2
-#as: -mips16
+#as: -32 -mips16
 #source: mips16-f.s
 
 # Check MIPS16 reloc processing
Index: gas/testsuite/gas/mips/trunc.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/trunc.d,v
retrieving revision 1.4
diff -u -p -r1.4 trunc.d
--- gas/testsuite/gas/mips/trunc.d 7 Aug 2001 12:36:13 -0000 1.4
+++ gas/testsuite/gas/mips/trunc.d 28 Mar 2003 06:53:57 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS trunc
-#as: -mips1 -mtune=r3000
+#as: -32 -mips1 -mtune=r3000
 
 # Test the trunc macros.
 
Index: gas/testsuite/gas/mips/uld.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/uld.d,v
retrieving revision 1.4
diff -u -p -r1.4 uld.d
--- gas/testsuite/gas/mips/uld.d 4 Oct 2001 00:57:01 -0000 1.4
+++ gas/testsuite/gas/mips/uld.d 28 Mar 2003 06:53:57 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS uld
-#as: -mips3 -mtune=r4000
+#as: -32 -mips3 -mtune=r4000
 
 # Test the uld macro.
 
Index: gas/testsuite/gas/mips/ulh-empic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ulh-empic.d,v
retrieving revision 1.2
diff -u -p -r1.2 ulh-empic.d
--- gas/testsuite/gas/mips/ulh-empic.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/ulh-empic.d 28 Mar 2003 06:53:57 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ulh-empic
-#as: -mips1 -membedded-pic
+#as: -32 -mips1 -membedded-pic
 #source: ulh-pic.s
 
 # Test the ulh macro with -membedded-pic.
Index: gas/testsuite/gas/mips/ulh-svr4pic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ulh-svr4pic.d,v
retrieving revision 1.2
diff -u -p -r1.2 ulh-svr4pic.d
--- gas/testsuite/gas/mips/ulh-svr4pic.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/ulh-svr4pic.d 28 Mar 2003 06:53:57 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ulh-svr4pic
-#as: -mips1 -KPIC -EB
+#as: -32 -mips1 -KPIC -EB
 #source: ulh-pic.s
 
 # Test the unaligned load and store macros with -KPIC.
Index: gas/testsuite/gas/mips/ulh-xgot.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ulh-xgot.d,v
retrieving revision 1.3
diff -u -p -r1.3 ulh-xgot.d
--- gas/testsuite/gas/mips/ulh-xgot.d 29 Jun 2001 21:27:43 -0000 1.3
+++ gas/testsuite/gas/mips/ulh-xgot.d 28 Mar 2003 06:53:57 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ulh-xgot
-#as: -mips1 -mtune=r3000 -KPIC -xgot -EB --defsym XGOT=1
+#as: -32 -mips1 -mtune=r3000 -KPIC -xgot -EB --defsym XGOT=1
 #source: ulh-pic.s
 
 # Test the unaligned load and store macros with -KPIC -xgot.
Index: gas/testsuite/gas/mips/ulh.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ulh.d,v
retrieving revision 1.2
diff -u -p -r1.2 ulh.d
--- gas/testsuite/gas/mips/ulh.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/ulh.d 28 Mar 2003 06:53:58 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ulh
-#as: -mips1
+#as: -32 -mips1
 
 # Test the ulh macro.
 
Index: gas/testsuite/gas/mips/ulw.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ulw.d,v
retrieving revision 1.2
diff -u -p -r1.2 ulw.d
--- gas/testsuite/gas/mips/ulw.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/ulw.d 28 Mar 2003 06:53:58 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ulw
-#as: -mips1
+#as: -32 -mips1
 
 # Test the ulw macro.
 
Index: gas/testsuite/gas/mips/usd.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/usd.d,v
retrieving revision 1.4
diff -u -p -r1.4 usd.d
--- gas/testsuite/gas/mips/usd.d 4 Oct 2001 00:57:01 -0000 1.4
+++ gas/testsuite/gas/mips/usd.d 28 Mar 2003 06:53:58 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS usd
-#as: -mips3 -mtune=r4000
+#as: -32 -mips3 -mtune=r4000
 
 # Test the usd macro.
 
Index: gas/testsuite/gas/mips/ush.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ush.d,v
retrieving revision 1.2
diff -u -p -r1.2 ush.d
--- gas/testsuite/gas/mips/ush.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/ush.d 28 Mar 2003 06:53:58 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ush
-#as: -mips1
+#as: -32 -mips1
 
 # Test the ush macro.
 
Index: gas/testsuite/gas/mips/usw.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/usw.d,v
retrieving revision 1.2
diff -u -p -r1.2 usw.d
--- gas/testsuite/gas/mips/usw.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/usw.d 28 Mar 2003 06:53:58 -0000
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS usw
-#as: -mips1
+#as: -32 -mips1
 
 # Test the usw macro.
 
Index: gas/testsuite/gas/mips/vr4122.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/vr4122.d,v
retrieving revision 1.1
diff -u -p -r1.1 vr4122.d
--- gas/testsuite/gas/mips/vr4122.d 30 Sep 2002 12:04:54 -0000 1.1
+++ gas/testsuite/gas/mips/vr4122.d 28 Mar 2003 06:53:58 -0000
@@ -1,5 +1,5 @@
 #objdump: -dz --prefix-addresses -m mips:4120
-#as: -march=vr4120 -mtune=vr4120 -mfix-vr4122-bugs
+#as: -32 -march=vr4120 -mtune=vr4120 -mfix-vr4122-bugs
 #name: MIPS vr4122 workarounds
 
 .*: +file format .*mips.*
Index: gas/testsuite/gas/vtable/vtable.exp
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/vtable/vtable.exp,v
retrieving revision 1.16
diff -u -p -r1.16 vtable.exp
--- gas/testsuite/gas/vtable/vtable.exp 27 Aug 2002 23:51:47 -0000 1.16
+++ gas/testsuite/gas/vtable/vtable.exp 28 Mar 2003 06:53:58 -0000
@@ -42,7 +42,9 @@ if { (   [istarget "*-*-elf*"] || [istar
 	|| [istarget "dlx-*"]
 	|| [istarget "i*86-*"] 
 	|| [istarget "m32r-*"] 
-	|| [istarget "mips*-*"] 
+	|| ([istarget "mips*-*"]
+	    && ! [istarget "mips64*-*-linux*"]
+	    && ! [istarget "mips*-*-irix6*"])
 	|| [istarget "m68hc*-*"] 
 	|| [istarget "or32-*"] 
 	|| [istarget "strongarm*-*"] 
Index: ld/testsuite/ChangeLog
from  Alexandre Oliva  <aoliva at redhat dot com>

	* config/default.exp: Force default ABI and linker emulations to
	o32 in mips64*-linux-gnu*.
	* ld-elf/merge.d: Xfail on mips64*-linux-gnu*.

Index: ld/testsuite/config/default.exp
===================================================================
RCS file: /cvs/uberbaum/ld/testsuite/config/default.exp,v
retrieving revision 1.4
diff -u -p -r1.4 default.exp
--- ld/testsuite/config/default.exp 24 Jul 2001 11:07:06 -0000 1.4
+++ ld/testsuite/config/default.exp 28 Mar 2003 07:48:53 -0000
@@ -60,6 +60,17 @@ if {![file isdirectory tmpdir/gas]} then
 }
 set gcc_gas_flag "-B[pwd]/tmpdir/gas/"
 
+# The mips64-*-linux-gnu compiler defaults to the N32 ABI after
+# installed, but to the O32 ABI in the build tree, because of some
+# specs-file hacks.  Make sure we use an ABI that is compatible with
+# the one we expect.
+if {[istarget mips64*-*-linux*] &&
+    (![board_info [target_info name] exists multilib_flags] ||
+     ![string match "*-mabi" [board_info [target_info name] multilib_flags]])
+   } {
+    append gcc_gas_flag " -mabi=n32"
+}
+
 # load the utility procedures
 load_lib ld-lib.exp
 
@@ -221,4 +232,18 @@ if ![info exists LD] then {
 
 if ![info exists LDFLAGS] then {
     set LDFLAGS {}
+}
+
+# The mips64-*-linux-gnu compiler defaults to the N32 ABI after
+# installed, but to the O32 ABI in the build tree, because of some
+# specs-file hacks.  Make sure we use an ABI that is compatible with
+# the one the tests expect.
+if {[istarget mips64*-*-linux*]} {
+    append gcc_gas_flag " -mabi=32"
+    append as " -32"
+    if {[istarget mips64el*-*-linux*]} {
+	append ld " -melf32ltsmip"
+    } else {
+	append ld " -melf32btsmip"
+    }
 }
Index: ld/testsuite/ld-elf/merge.d
===================================================================
RCS file: /cvs/uberbaum/ld/testsuite/ld-elf/merge.d,v
retrieving revision 1.1
diff -u -p -r1.1 merge.d
--- ld/testsuite/ld-elf/merge.d 21 Nov 2002 13:30:31 -0000 1.1
+++ ld/testsuite/ld-elf/merge.d 28 Mar 2003 07:48:53 -0000
@@ -3,7 +3,7 @@
 #objdump: -s
 #xfail: "arc-*-*" "avr-*-*" "cris-*-*" "dlx-*-*" "fr30-*-*" "frv-*-*"
 #xfail: "hppa*-*-*" "h8300-*-*" "i960-*-*" "ip2k-*-*" "m32r-*-*" "mcore-*-*"
-#xfail: "mn10*-*-*" "openrisc-*-*" "pj-*-*" "sparc*-*-*"
+#xfail: "mn10*-*-*" "mips64*-*-linux*" "openrisc-*-*" "pj-*-*" "sparc*-*-*"
 
 .*:     file format .*elf.*
 
-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                 aoliva at {redhat dot com, gcc.gnu.org}
CS PhD student at IC-Unicamp        oliva at {lsd dot ic dot unicamp dot br, gnu.org}
Free Software Evangelist                Professional serial bug killer

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]