rebuild with current tools

6 files changed, 2389 insertions, 2487 deletions

diff --git a/gas/Makefile.in b/gas/Makefile.in
index 0bd7733..07b2eee 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994-99, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -81,14 +81,13 @@ INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLOBJS = @INTLOBJS@
-LD = @LD@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NM = @NM@
+OBJDUMP = @OBJDUMP@
 OPCODES_LIB = @OPCODES_LIB@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
@@ -96,7 +95,6 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 atof = @atof@
 cgen_cpu_prefix = @cgen_cpu_prefix@
diff --git a/gas/aclocal.m4 b/gas/aclocal.m4
index ebbe468..4b4ca84 100644
--- a/gas/aclocal.m4
+++ b/gas/aclocal.m4
@@ -160,7 +160,7 @@ fi
 AC_SUBST($1)])
 
 
-# serial 35 AC_PROG_LIBTOOL
+# serial 40 AC_PROG_LIBTOOL
 AC_DEFUN(AC_PROG_LIBTOOL,
 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
 
@@ -169,10 +169,11 @@ AC_CACHE_SAVE
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
 CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
-DLLTOOL="$DLLTOOL" AS="$AS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
 || AC_MSG_ERROR([libtool configure failed])
 
 # Reload cache, that may have been modified by ltconfig
@@ -201,24 +202,33 @@ AC_REQUIRE([AC_PROG_RANLIB])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_PROG_LD])dnl
 AC_REQUIRE([AC_PROG_NM])dnl
-AC_REQUIRE([AC_SYS_NM_PARSE])dnl
-AC_REQUIRE([AC_SYS_SYMBOL_UNDERSCORE])dnl
 AC_REQUIRE([AC_PROG_LN_S])dnl
 dnl
 
+case "$target" in
+NONE) lt_target="$host" ;;
+*) lt_target="$target" ;;
+esac
+
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$lt_dlopen" = yes && libtool_flags="$libtool_flags --enable-dlopen"
-test "$silent" = yes && libtool_flags="$libtool_flags --silent"
 test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
 test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
+[libtool_flags="$libtool_flags --enable-dlopen"])
+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+[libtool_flags="$libtool_flags --enable-win32-dll"])
+AC_ARG_ENABLE(libtool-lock,
+  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
+test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case "$host" in
+case "$lt_target" in
 *-*-irix6*)
   # Find out which ABI we are using.
   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
@@ -250,33 +260,28 @@ case "$host" in
   fi
   ;;
 
-*-*-cygwin*)
-  AC_SYS_LIBTOOL_CYGWIN
+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+[*-*-cygwin* | *-*-mingw*)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
   ;;
-
+])
 esac
-
-# enable the --disable-libtool-lock switch
-
-AC_ARG_ENABLE(libtool-lock,
-[  --disable-libtool-lock  force libtool not to do file locking],
-need_locks=$enableval,
-need_locks=yes)
-
-if test x"$need_locks" = xno; then
-  libtool_flags="$libtool_flags --disable-lock"
-fi
 ])
 
-# AC_LIBTOOL_DLOPEN - check for dlopen support
-AC_DEFUN(AC_LIBTOOL_DLOPEN, [lt_dlopen=yes])
+# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
+AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+
+# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
+AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
 
 # AC_ENABLE_SHARED - implement the --enable-shared flag
 # Usage: AC_ENABLE_SHARED[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN(AC_ENABLE_SHARED,
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_SHARED, [dnl
+define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(shared,
 changequote(<<, >>)dnl
 <<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
@@ -301,15 +306,15 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
 ])
 
 # AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN(AC_DISABLE_SHARED,
-[AC_ENABLE_SHARED(no)])
+AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_SHARED(no)])
 
 # AC_ENABLE_STATIC - implement the --enable-static flag
 # Usage: AC_ENABLE_STATIC[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN(AC_ENABLE_STATIC,
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_STATIC, [dnl
+define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(static,
 changequote(<<, >>)dnl
 <<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
@@ -334,16 +339,16 @@ enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
 ])
 
 # AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN(AC_DISABLE_STATIC,
-[AC_ENABLE_STATIC(no)])
+AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_STATIC(no)])
 
 
 # AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
 # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN(AC_ENABLE_FAST_INSTALL,
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(fast-install,
 changequote(<<, >>)dnl
 <<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
@@ -368,9 +373,8 @@ enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
 ])
 
 # AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN(AC_DISABLE_FAST_INSTALL,
-[AC_ENABLE_FAST_INSTALL(no)])
-
+AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_FAST_INSTALL(no)])
 
 # AC_PROG_LD - find the path to the GNU or non-GNU linker
 AC_DEFUN(AC_PROG_LD,
@@ -388,7 +392,7 @@ if test "$ac_cv_prog_gcc" = yes; then
   case "$ac_prog" in
     # Accept absolute paths.
 changequote(,)dnl
-    /* | [A-Za-z]:[\\/]*)
+    [\\/]* | [A-Za-z]:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
 changequote([,])dnl
       # Canonicalize the path of ld
@@ -414,10 +418,10 @@ else
 fi
 AC_CACHE_VAL(ac_cv_path_LD,
 [if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog"; then
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
@@ -440,7 +444,6 @@ else
   AC_MSG_RESULT(no)
 fi
 test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_SUBST(LD)
 AC_PROG_LD_GNU
 ])
 
@@ -462,10 +465,10 @@ AC_CACHE_VAL(ac_cv_path_NM,
   # Let the user override the test.
   ac_cv_path_NM="$NM"
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/nm; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
@@ -486,230 +489,24 @@ else
 fi])
 NM="$ac_cv_path_NM"
 AC_MSG_RESULT([$NM])
-AC_SUBST(NM)
 ])
 
-# AC_SYS_NM_PARSE - Check for command to grab the raw symbol name followed
-# by C symbol name from nm.
-AC_DEFUN(AC_SYS_NM_PARSE,
+# AC_CHECK_LIBM - check for math library
+AC_DEFUN(AC_CHECK_LIBM,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output])
-AC_CACHE_VAL(ac_cv_sys_global_symbol_pipe,
-[# These are sane defaults that work on at least a few old systems.
-# {They come from Ultrix.  What could be older than Ultrix?!! ;)}
-
-changequote(,)dnl
-# Character class describing NM global symbol codes.
-ac_symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Transform the above into a raw symbol and a C symbol.
-ac_symxfrm='\1 \2\3 \3'
-
-# Transform an extracted symbol line into a proper C declaration
-ac_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
-
-# Define system-specific variables.
-case "$host_os" in
-aix*)
-  ac_symcode='[BCDT]'
-  ;;
-cygwin* | mingw*)
-  ac_symcode='[ABCDGISTW]'
-  ;;
-hpux*)
-  ac_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
+LIBM=
+case "$lt_target" in
+*-*-beos* | *-*-cygwin*)
+  # These system don't have libm
   ;;
-irix*)
-  ac_symcode='[BCDEGRST]'
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
   ;;
-solaris*)
-  ac_symcode='[BDT]'
+*)
+  AC_CHECK_LIB(m, main, LIBM="-lm")
   ;;
 esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-  ac_symcode='[ABCDGISTW]'
-fi
-changequote([,])dnl
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($ac_symcode\)[ 	][ 	]*\($ac_symprfx\)$ac_sympat$/$ac_symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  ac_pipe_works=no
-  rm -f conftest.$ac_ext
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func;return 0;}
-EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    ac_nlist=conftest.nm
-  
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
-
-      # Try sorting and uniquifying the output.
-      if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
-	mv -f "$ac_nlist"T "$ac_nlist"
-      else
-	rm -f "$ac_nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
-	if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
-	  cat <<EOF > conftest.c
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$ac_global_symbol_to_cdecl"' < "$ac_nlist" >> conftest.c'
-
-	  cat <<EOF >> conftest.c
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-changequote(,)dnl
-lt_preloaded_symbols[] =
-changequote([,])dnl
-{
-EOF
-	sed 's/^. \(.*\) \(.*\)$/  {"\2", (lt_ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
-	cat <<\EOF >> conftest.c
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftestm.$ac_objext
-	  ac_save_LIBS="$LIBS"
-	  ac_save_CFLAGS="$CFLAGS"
-	  LIBS="conftestm.$ac_objext"
-	  CFLAGS="$CFLAGS$no_builtin_flag"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest; then
-	    ac_pipe_works=yes
-	  else
-	    echo "configure: failed program was:" >&AC_FD_CC
-	    cat conftest.c >&AC_FD_CC
-	  fi
-	  LIBS="$ac_save_LIBS"
-	  CFLAGS="$ac_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
-	fi
-      else
-	echo "cannot find nm_test_var in $ac_nlist" >&AC_FD_CC
-      fi
-    else
-      echo "cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
-    fi
-  else
-    echo "$progname: failed program was:" >&AC_FD_CC
-    cat conftest.c >&AC_FD_CC
-  fi
-  rm -rf conftest*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$ac_pipe_works" = yes; then
-    if test x"$ac_symprfx" = x"_"; then
-      ac_cv_sys_symbol_underscore=yes
-    else
-      ac_cv_sys_symbol_underscore=no
-    fi
-    break
-  else
-    ac_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-
-ac_result=yes
-if test -z "$ac_cv_sys_global_symbol_pipe"; then
-   ac_result=no
-fi
-AC_MSG_RESULT($ac_result)
-])
-
-# AC_SYS_LIBTOOL_CYGWIN - find tools needed on cygwin
-AC_DEFUN(AC_SYS_LIBTOOL_CYGWIN,
-[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-AC_CHECK_TOOL(AS, as, false)
-])
-
-# AC_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols
-#                            with an underscore?
-AC_DEFUN(AC_SYS_SYMBOL_UNDERSCORE,
-[AC_REQUIRE([AC_PROG_NM])dnl
-AC_REQUIRE([AC_SYS_NM_PARSE])dnl
-AC_MSG_CHECKING([for _ prefix in compiled symbols])
-AC_CACHE_VAL(ac_cv_sys_symbol_underscore,
-[ac_cv_sys_symbol_underscore=no
-cat > conftest.$ac_ext <<EOF
-void nm_test_func(){}
-int main(){nm_test_func;return 0;}
-EOF
-if AC_TRY_EVAL(ac_compile); then
-  # Now try to grab the symbols.
-  ac_nlist=conftest.nm
-  if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
-    # See whether the symbols have a leading underscore.
-    if egrep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
-      ac_cv_sys_symbol_underscore=yes
-    else
-      if egrep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
-	:
-      else
-	echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
-      fi
-    fi
-  else
-    echo "configure: cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
-  fi
-else
-  echo "configure: failed program was:" >&AC_FD_CC
-  cat conftest.c >&AC_FD_CC
-fi
-rm -rf conftest*
-])
-AC_MSG_RESULT($ac_cv_sys_symbol_underscore)
-USE_SYMBOL_UNDERSCORE=${ac_cv_sys_symbol_underscore=no}
-AC_SUBST(USE_SYMBOL_UNDERSCORE)dnl
-])
-
-# AC_CHECK_LIBM - check for math library
-AC_DEFUN(AC_CHECK_LIBM, [
-AC_CHECK_LIB(mw, _mwvalidcheckl)
-AC_CHECK_LIB(m, cos)
 ])
 
 # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
@@ -720,13 +517,14 @@ AC_CHECK_LIB(m, cos)
 # '${top_builddir}/' (note the single quotes!) if your package is not
 # flat, and, if you're not using automake, define top_builddir as
 # appropriate in the Makefiles.
-AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [
+AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   case "$enable_ltdl_convenience" in
   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
   "") enable_ltdl_convenience=yes
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac
   LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
 ])
 
 # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
@@ -738,16 +536,23 @@ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [
 # flat, and, if you're not using automake, define top_builddir as
 # appropriate in the Makefiles.
 # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [
-  AC_CHECK_LIB(ltdl, main, LIBLTDL="-lltdl", [
-    case "$enable_ltdl_install" in
-    no) AC_MSG_WARN([libltdl not installed, but installation disabled]) ;;
-    "") enable_ltdl_install=yes
-        ac_configure_args="$ac_configure_args --enable-ltdl-install" ;;
-    esac
+AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  AC_CHECK_LIB(ltdl, main,
+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+  [if test x"$enable_ltdl_install" = xno; then
+     AC_MSG_WARN([libltdl not installed, but installation disabled])
+   else
+     enable_ltdl_install=yes
+   fi
   ])
-  if test x"$enable_ltdl_install" != x"no"; then
+  if test x"$enable_ltdl_install" = x"yes"; then
+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
     LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
+  else
+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+    LIBLTDL="-lltdl"
+    INCLTDL=
   fi
 ])
 
@@ -759,9 +564,9 @@ AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
 AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
 AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
 AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
-AC_DEFUN(AM_SYS_NM_PARSE, [indir([AC_SYS_NM_PARSE])])dnl
-AC_DEFUN(AM_SYS_SYMBOL_UNDERSCORE, [indir([AC_SYS_SYMBOL_UNDERSCORE])])dnl
-AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN, [indir([AC_SYS_LIBTOOL_CYGWIN])])dnl
+
+dnl This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])dnl
 
 # Like AC_CONFIG_HEADER, but automatically create stamp file.
 
diff --git a/gas/configure b/gas/configure
index 62d35d1..e7d4901 100755
--- a/gas/configure
+++ b/gas/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13.1 
+# Generated automatically using autoconf version 2.13 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -20,7 +20,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
 ac_help="$ac_help
-  --disable-libtool-lock  force libtool not to do file locking"
+  --disable-libtool-lock  avoid locking (might break parallel builds)"
 ac_help="$ac_help
   --enable-bfd-assembler  use BFD back end for writing object files"
 ac_help="$ac_help
@@ -51,6 +51,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -165,6 +166,7 @@ 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
@@ -335,6 +337,11 @@ 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=*)
@@ -356,7 +363,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13.1"
+    echo "configure generated by autoconf version 2.13"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -500,12 +507,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-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"
+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
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -516,7 +527,7 @@ done
 
 if test -r "$cache_file"; then
   echo "loading cache $cache_file"
-      test -f "$cache_file" && . $cache_file
+  . $cache_file
 else
   echo "creating cache $cache_file"
   > $cache_file
@@ -560,130 +571,9 @@ done
 if test -z "$ac_aux_dir"; then
   { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
 fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:570: checking host system type" >&5
-if test "x$ac_cv_host" = "x" || (test "x$host" != "xNONE" && test "x$host" != "x$ac_cv_host_alias"); then
-
-# Make sure we can run config.sub.
-  if $ac_config_sub sun4 >/dev/null 2>&1; then :
-    else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-  fi
-
-  ac_cv_host_alias=$host
-  case "$ac_cv_host_alias" in
-  NONE)
-    case $nonopt in
-    NONE)
-      if ac_cv_host_alias=`$ac_config_guess`; then :
-      else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-      fi ;;
-    *) ac_cv_host_alias=$nonopt ;;
-    esac ;;
-  esac
-
-  ac_cv_host=`$ac_config_sub $ac_cv_host_alias`
-  ac_cv_host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-  ac_cv_host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-  ac_cv_host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-else
-  echo $ac_n "(cached) $ac_c" 1>&6
-fi
-
-echo "$ac_t""$ac_cv_host" 1>&6
-
-host=$ac_cv_host
-host_alias=$ac_cv_host_alias
-host_cpu=$ac_cv_host_cpu
-host_vendor=$ac_cv_host_vendor
-host_os=$ac_cv_host_os
-
-
-
-
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:611: checking target system type" >&5
-if test "x$ac_cv_target" = "x" || (test "x$target" != "xNONE" && test "x$target" != "x$ac_cv_target_alias"); then
-
-# Make sure we can run config.sub.
-  if $ac_config_sub sun4 >/dev/null 2>&1; then :
-    else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-  fi
-
-  ac_cv_target_alias=$target
-  case "$ac_cv_target_alias" in
-  NONE)
-    case $nonopt in
-    NONE)
-      ac_cv_target_alias=$host_alias ;;
-
-    *) ac_cv_target_alias=$nonopt ;;
-    esac ;;
-  esac
-
-  ac_cv_target=`$ac_config_sub $ac_cv_target_alias`
-  ac_cv_target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-  ac_cv_target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-  ac_cv_target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-else
-  echo $ac_n "(cached) $ac_c" 1>&6
-fi
-
-echo "$ac_t""$ac_cv_target" 1>&6
-
-target=$ac_cv_target
-target_alias=$ac_cv_target_alias
-target_cpu=$ac_cv_target_cpu
-target_vendor=$ac_cv_target_vendor
-target_os=$ac_cv_target_os
-
-
-
-
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:651: checking build system type" >&5
-if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" != "x$ac_cv_build_alias"); then
-
-# Make sure we can run config.sub.
-  if $ac_config_sub sun4 >/dev/null 2>&1; then :
-    else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-  fi
-
-  ac_cv_build_alias=$build
-  case "$ac_cv_build_alias" in
-  NONE)
-    case $nonopt in
-    NONE)
-      ac_cv_build_alias=$host_alias ;;
-
-    *) ac_cv_build_alias=$nonopt ;;
-    esac ;;
-  esac
-
-  ac_cv_build=`$ac_config_sub $ac_cv_build_alias`
-  ac_cv_build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-  ac_cv_build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-  ac_cv_build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-else
-  echo $ac_n "(cached) $ac_c" 1>&6
-fi
-
-echo "$ac_t""$ac_cv_build" 1>&6
-
-build=$ac_cv_build
-build_alias=$ac_cv_build_alias
-build_cpu=$ac_cv_build_cpu
-build_vendor=$ac_cv_build_vendor
-build_os=$ac_cv_build_os
-
-
-
+ac_config_guess=$ac_aux_dir/config.guess
+ac_config_sub=$ac_aux_dir/config.sub
+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
 # Do some error checking and defaulting for the host and target type.
@@ -706,6 +596,69 @@ NONE---*---* | *---NONE---* | *---*---NONE) ;;
 *) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
 esac
 
+
+# Make sure we can run config.sub.
+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
+else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking host system type""... $ac_c" 1>&6
+echo "configure:607: checking host system type" >&5
+
+host_alias=$host
+case "$host_alias" in
+NONE)
+  case $nonopt in
+  NONE)
+    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
+    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+    fi ;;
+  *) host_alias=$nonopt ;;
+  esac ;;
+esac
+
+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$host" 1>&6
+
+echo $ac_n "checking target system type""... $ac_c" 1>&6
+echo "configure:628: checking target system type" >&5
+
+target_alias=$target
+case "$target_alias" in
+NONE)
+  case $nonopt in
+  NONE) target_alias=$host_alias ;;
+  *) target_alias=$nonopt ;;
+  esac ;;
+esac
+
+target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$target" 1>&6
+
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:646: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
 test "$host_alias" != "$target_alias" &&
   test "$program_prefix$program_suffix$program_transform_name" = \
     NONENONEs,x,x, &&
@@ -724,9 +677,9 @@ test "$host_alias" != "$target_alias" &&
 # 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:728: checking for a BSD compatible install" >&5
+echo "configure:681: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
-if eval "test \"\${ac_cv_path_install+set}\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
@@ -744,10 +697,6 @@ else
             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
 	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
 	  else
 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
 	    break 2
@@ -776,12 +725,12 @@ echo "$ac_t""$INSTALL" 1>&6
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:785: checking whether build environment is sane" >&5
+echo "configure:734: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -829,18 +778,18 @@ EOF_SED
   rm -f conftestsed
 fi
 test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},;$program_transform_name"
+  program_transform_name="s,^,${program_prefix},; $program_transform_name"
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},;$program_transform_name"
+  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
 
 # sed with no file args requires a program.
 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:842: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:791: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftestmake <<\EOF
@@ -884,7 +833,7 @@ EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:888: checking for working aclocal" >&5
+echo "configure:837: 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.
@@ -897,7 +846,7 @@ else
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:901: checking for working autoconf" >&5
+echo "configure:850: 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.
@@ -910,7 +859,7 @@ else
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:914: checking for working automake" >&5
+echo "configure:863: 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.
@@ -923,7 +872,7 @@ else
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:927: checking for working autoheader" >&5
+echo "configure:876: 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.
@@ -936,7 +885,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:940: checking for working makeinfo" >&5
+echo "configure:889: 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.
@@ -1022,8 +971,8 @@ fi
 # 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:1026: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_prog_RANLIB+set}\" = set"; then
+echo "configure:975: 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
   if test -n "$RANLIB"; then
@@ -1052,8 +1001,8 @@ fi
 # 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:1056: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
+echo "configure:1005: 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
   if test -n "$CC"; then
@@ -1082,8 +1031,8 @@ 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:1086: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
+echo "configure:1035: 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
   if test -n "$CC"; then
@@ -1129,12 +1078,12 @@ fi
 
   if test -z "$CC"; then
     case "`uname -s`" in
-    *win32* | *WIN32* | *CYGWIN*)
+    *win32* | *WIN32*)
       # 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:1137: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
+echo "configure:1086: 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
   if test -n "$CC"; then
@@ -1164,8 +1113,8 @@ fi
   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1169: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:1118: 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.
@@ -1176,12 +1125,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1180 "configure"
+#line 1129 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1134: \"$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
@@ -1206,14 +1155,14 @@ echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
 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 $CPPFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1211: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+echo "configure:1160: 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:1216: checking whether we are using GNU C" >&5
-if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then
+echo "configure:1165: 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
   cat > conftest.c <<EOF
@@ -1221,7 +1170,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1225: \"$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:1174: \"$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
@@ -1240,8 +1189,8 @@ 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:1244: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"\${ac_cv_prog_cc_g+set}\" = set"; then
+echo "configure:1193: 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
   echo 'void f(){}' > conftest.c
@@ -1283,11 +1232,11 @@ ac_prog=ld
 if test "$ac_cv_prog_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:1287: checking for ld used by GCC" >&5
+echo "configure:1236: checking for ld used by GCC" >&5
   ac_prog=`($CC -print-prog-name=ld) 2>&5`
   case "$ac_prog" in
     # Accept absolute paths.
-    /* | [A-Za-z]:[\\/]*)
+    [\\/]* | [A-Za-z]:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
       # Canonicalize the path of ld
       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
@@ -1307,19 +1256,19 @@ echo "configure:1287: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1311: checking for GNU ld" >&5
+echo "configure:1260: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1314: checking for non-GNU ld" >&5
+echo "configure:1263: checking for non-GNU ld" >&5
 fi
-if eval "test \"\${ac_cv_path_LD+set}\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog"; then
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
@@ -1344,10 +1293,9 @@ else
   echo "$ac_t""no" 1>&6
 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:1350: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"\${ac_cv_prog_gnu_ld+set}\" = set"; then
+echo "configure:1298: checking if the linker ($LD) is GNU ld" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
@@ -1362,18 +1310,18 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
 
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1366: checking for BSD-compatible nm" >&5
-if eval "test \"\${ac_cv_path_NM+set}\" = set"; then
+echo "configure:1314: checking for BSD-compatible nm" >&5
+if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
   ac_cv_path_NM="$NM"
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/nm; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
@@ -1397,214 +1345,9 @@ fi
 NM="$ac_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
-echo "configure:1404: checking command to parse $NM output" >&5
-if eval "test \"\${ac_cv_sys_global_symbol_pipe+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # These are sane defaults that work on at least a few old systems.
-# {They come from Ultrix.  What could be older than Ultrix?!! ;)}
-
-# Character class describing NM global symbol codes.
-ac_symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Transform the above into a raw symbol and a C symbol.
-ac_symxfrm='\1 \2\3 \3'
-
-# Transform an extracted symbol line into a proper C declaration
-ac_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
-
-# Define system-specific variables.
-case "$host_os" in
-aix*)
-  ac_symcode='[BCDT]'
-  ;;
-cygwin* | mingw*)
-  ac_symcode='[ABCDGISTW]'
-  ;;
-hpux*)
-  ac_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
-  ;;
-irix*)
-  ac_symcode='[BCDEGRST]'
-  ;;
-solaris*)
-  ac_symcode='[BDT]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-  ac_symcode='[ABCDGISTW]'
-fi
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* 	\($ac_symcode\) 	 	*\($ac_symprfx\)$ac_sympat$/$ac_symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  ac_pipe_works=no
-  rm -f conftest.$ac_ext
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func;return 0;}
-EOF
-
-  if { (eval echo configure:1467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    # Now try to grab the symbols.
-    ac_nlist=conftest.nm
-  
-    if { (eval echo configure:1471: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
-
-      # Try sorting and uniquifying the output.
-      if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
-	mv -f "$ac_nlist"T "$ac_nlist"
-      else
-	rm -f "$ac_nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
-	if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
-	  cat <<EOF > conftest.c
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$ac_global_symbol_to_cdecl"' < "$ac_nlist" >> conftest.c'
-
-	  cat <<EOF >> conftest.c
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[] =
-{
-EOF
-	sed 's/^. \(.*\) \(.*\)$/  {"\2", (lt_ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
-	cat <<\EOF >> conftest.c
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftestm.$ac_objext
-	  ac_save_LIBS="$LIBS"
-	  ac_save_CFLAGS="$CFLAGS"
-	  LIBS="conftestm.$ac_objext"
-	  CFLAGS="$CFLAGS$no_builtin_flag"
-	  if { (eval echo configure:1523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-	    ac_pipe_works=yes
-	  else
-	    echo "configure: failed program was:" >&5
-	    cat conftest.c >&5
-	  fi
-	  LIBS="$ac_save_LIBS"
-	  CFLAGS="$ac_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $ac_nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $ac_nlist" >&5
-      fi
-    else
-      echo "cannot run $ac_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.c >&5
-  fi
-  rm -rf conftest*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$ac_pipe_works" = yes; then
-    if test x"$ac_symprfx" = x"_"; then
-      ac_cv_sys_symbol_underscore=yes
-    else
-      ac_cv_sys_symbol_underscore=no
-    fi
-    break
-  else
-    ac_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-
-ac_result=yes
-if test -z "$ac_cv_sys_global_symbol_pipe"; then
-   ac_result=no
-fi
-echo "$ac_t""$ac_result" 1>&6
-
-echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6
-echo "configure:1569: checking for _ prefix in compiled symbols" >&5
-if eval "test \"\${ac_cv_sys_symbol_underscore+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_cv_sys_symbol_underscore=no
-cat > conftest.$ac_ext <<EOF
-void nm_test_func(){}
-int main(){nm_test_func;return 0;}
-EOF
-if { (eval echo configure:1578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  # Now try to grab the symbols.
-  ac_nlist=conftest.nm
-  if { (eval echo configure:1581: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
-    # See whether the symbols have a leading underscore.
-    if egrep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
-      ac_cv_sys_symbol_underscore=yes
-    else
-      if egrep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
-	:
-      else
-	echo "configure: cannot find nm_test_func in $ac_nlist" >&5
-      fi
-    fi
-  else
-    echo "configure: cannot run $ac_cv_sys_global_symbol_pipe" >&5
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.c >&5
-fi
-rm -rf conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_sys_symbol_underscore" 1>&6
-USE_SYMBOL_UNDERSCORE=${ac_cv_sys_symbol_underscore=no}
-
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1607: checking whether ln -s works" >&5
-if eval "test \"\${ac_cv_prog_LN_S+set}\" = set"; then
+echo "configure:1350: 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
   rm -f conftestdata
@@ -1623,30 +1366,37 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
 
+case "$target" in
+NONE) lt_target="$host" ;;
+*) lt_target="$target" ;;
+esac
 
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$lt_dlopen" = yes && libtool_flags="$libtool_flags --enable-dlopen"
-test "$silent" = yes && libtool_flags="$libtool_flags --silent"
 test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
 test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 
+
+# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then
+  enableval="$enable_libtool_lock"
+  :
+fi
+
+test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
+
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case "$host" in
+case "$lt_target" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 1649 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:1650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 1399 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -1667,19 +1417,19 @@ case "$host" in
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:1671: checking whether the C compiler needs -belf" >&5
-if eval "test \"\${lt_cv_cc_needs_belf+set}\" = set"; then
+echo "configure:1421: 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
   cat > conftest.$ac_ext <<EOF
-#line 1676 "configure"
+#line 1426 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1433: \"$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
@@ -1698,161 +1448,9 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   fi
   ;;
 
-*-*-cygwin*)
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1706: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_prog_DLLTOOL+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_DLLTOOL"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1738: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_prog_DLLTOOL+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="false"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  DLLTOOL="false"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1773: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_prog_AS+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_AS"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1805: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_prog_AS+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="false"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  AS="false"
-fi
-fi
-
-
-  ;;
 
 esac
 
-# enable the --disable-libtool-lock switch
-
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
-  need_locks=$enableval
-else
-  need_locks=yes
-fi
-
-
-if test x"$need_locks" = xno; then
-  libtool_flags="$libtool_flags --disable-lock"
-fi
-
 
 # Save cache, so that ltconfig can load it
 cat > confcache <<\EOF
@@ -1905,16 +1503,17 @@ rm -f confcache
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
 CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
-DLLTOOL="$DLLTOOL" AS="$AS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 
 # Reload cache, that may have been modified by ltconfig
 if test -r "$cache_file"; then
   echo "loading cache $cache_file"
-      test -f "$cache_file" && . $cache_file
+  . $cache_file
 else
   echo "creating cache $cache_file"
   > $cache_file
@@ -2089,7 +1688,7 @@ for this_target in $target $canon_targets ; do
       arm-*-netbsd*)	                fmt=aout em=nbsd bfd_gas=yes ;;
       arm-*-oabi | thumb-*-oabi)        fmt=elf ;;
       arm-epoc-pe | thumb-epoc-pe)      fmt=coff em=epoc-pe ;;
-      arm-*-wince)         fmt=coff em=wince-pe bfd_gas=yes;;
+      arm-*-wince)          fmt=coff em=wince-pe bfd_gas=yes;;
       arm-*-pe | thumb-*-pe)            fmt=coff em=pe ;;
       arm-*-riscix*)	                fmt=aout em=riscix ;;
 
@@ -2757,8 +2356,8 @@ 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:2758: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
+echo "configure:2360: 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
   if test -n "$CC"; then
@@ -2787,8 +2386,8 @@ 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:2788: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
+echo "configure:2390: 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
   if test -n "$CC"; then
@@ -2834,12 +2433,12 @@ fi
 
   if test -z "$CC"; then
     case "`uname -s`" in
-    *win32* | *WIN32* | *CYGWIN*)
+    *win32* | *WIN32*)
       # 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:2839: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
+echo "configure:2441: 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
   if test -n "$CC"; then
@@ -2869,8 +2468,8 @@ fi
   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2871: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:2473: 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.
@@ -2881,12 +2480,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 2882 "configure"
+#line 2484 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:2887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2489: \"$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
@@ -2911,14 +2510,14 @@ echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
 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 $CPPFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2913: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+echo "configure:2515: 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:2918: checking whether we are using GNU C" >&5
-if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then
+echo "configure:2520: 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
   cat > conftest.c <<EOF
@@ -2926,7 +2525,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2927: \"$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:2529: \"$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
@@ -2945,8 +2544,8 @@ 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:2946: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"\${ac_cv_prog_cc_g+set}\" = set"; then
+echo "configure:2548: 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
   echo 'void f(){}' > conftest.c
@@ -2982,8 +2581,8 @@ 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:2983: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_prog_YACC+set}\" = set"; then
+echo "configure:2585: 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
   if test -n "$YACC"; then
@@ -3013,13 +2612,13 @@ done
 test -n "$YACC" || YACC="yacc"
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:3014: checking how to run the C preprocessor" >&5
+echo "configure:2616: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-if eval "test \"\${ac_cv_prog_CPP+set}\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     # This must be in double quotes, not single quotes, because CPP may get
@@ -3028,13 +2627,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 3029 "configure"
+#line 2631 "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:3035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2637: \"$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
   :
@@ -3045,13 +2644,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 3046 "configure"
+#line 2648 "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:3052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2654: \"$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
   :
@@ -3062,13 +2661,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 3063 "configure"
+#line 2665 "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:3069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2671: \"$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
   :
@@ -3098,8 +2697,8 @@ 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:3099: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_prog_LEX+set}\" = set"; then
+echo "configure:2701: 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
   if test -n "$LEX"; then
@@ -3131,8 +2730,8 @@ test -n "$LEX" || LEX=""$missing_dir/missing flex""
 # 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:3132: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_prog_LEX+set}\" = set"; then
+echo "configure:2734: 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
   if test -n "$LEX"; then
@@ -3165,15 +2764,15 @@ then
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:3166: checking for yywrap in -l$ac_lib" >&5
-ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-:%__p__%'`
-if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
+echo "configure:2768: 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
 else
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3174 "configure"
+#line 2776 "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
@@ -3184,7 +2783,7 @@ int main() {
 yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:3185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2787: \"$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
@@ -3207,8 +2806,8 @@ fi
 fi
 
 echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:3208: checking lex output file root" >&5
-if eval "test \"\${ac_cv_prog_lex_root+set}\" = set"; then
+echo "configure:2810: 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
   # The minimal lex program is just a single line: %%.  But some broken lexes
@@ -3228,8 +2827,8 @@ 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:3229: checking whether yytext is a pointer" >&5
-if eval "test \"\${ac_cv_prog_lex_yytext_pointer+set}\" = set"; then
+echo "configure:2831: 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
   # POSIX says lex can declare yytext either as a pointer or an array; the
@@ -3240,14 +2839,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
 ac_save_LIBS="$LIBS"
 LIBS="$LIBS $LEXLIB"
 cat > conftest.$ac_ext <<EOF
-#line 3241 "configure"
+#line 2843 "configure"
 #include "confdefs.h"
 `cat $LEX_OUTPUT_ROOT.c`
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2850: \"$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
@@ -3271,7 +2870,7 @@ fi
 
 ALL_LINGUAS=
 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:3272: checking for POSIXized ISC" >&5
+echo "configure:2874: 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
@@ -3292,12 +2891,12 @@ else
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3293: checking for ANSI C header files" >&5
-if eval "test \"\${ac_cv_header_stdc+set}\" = set"; then
+echo "configure:2895: 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 3298 "configure"
+#line 2900 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3305,7 +2904,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2908: \"$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*
@@ -3322,7 +2921,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 3323 "configure"
+#line 2925 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3340,7 +2939,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 3341 "configure"
+#line 2943 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3361,7 +2960,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 3362 "configure"
+#line 2964 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3372,7 +2971,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:3373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -3396,12 +2995,12 @@ EOF
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3397: checking for working const" >&5
-if eval "test \"\${ac_cv_c_const+set}\" = set"; then
+echo "configure:2999: 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 3402 "configure"
+#line 3004 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3450,7 +3049,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:3451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -3471,21 +3070,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:3472: checking for inline" >&5
-if eval "test \"\${ac_cv_c_inline+set}\" = set"; then
+echo "configure:3074: 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 3479 "configure"
+#line 3081 "configure"
 #include "confdefs.h"
 
 int main() {
-} $ac_kw int foo() {
+} $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:3486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -3511,12 +3110,12 @@ EOF
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3512: checking for off_t" >&5
-if eval "test \"\${ac_cv_type_off_t+set}\" = set"; then
+echo "configure:3114: 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 3517 "configure"
+#line 3119 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3527,31 +3126,29 @@ EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
-  eval "ac_cv_type_off_t=yes"
+  ac_cv_type_off_t=yes
 else
   rm -rf conftest*
-  eval "ac_cv_type_off_t=no"
+  ac_cv_type_off_t=no
 fi
 rm -f conftest*
 
 fi
-if eval "test \"`echo '$ac_cv_type_'off_t`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-  cat >> confdefs.h <<EOF
+echo "$ac_t""$ac_cv_type_off_t" 1>&6
+if test $ac_cv_type_off_t = no; then
+  cat >> confdefs.h <<\EOF
 #define off_t long
 EOF
 
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3547: checking for size_t" >&5
-if eval "test \"\${ac_cv_type_size_t+set}\" = set"; then
+echo "configure:3147: 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 3552 "configure"
+#line 3152 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3562,19 +3159,17 @@ EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
-  eval "ac_cv_type_size_t=yes"
+  ac_cv_type_size_t=yes
 else
   rm -rf conftest*
-  eval "ac_cv_type_size_t=no"
+  ac_cv_type_size_t=no
 fi
 rm -f conftest*
 
 fi
-if eval "test \"`echo '$ac_cv_type_'size_t`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-  cat >> confdefs.h <<EOF
+echo "$ac_t""$ac_cv_type_size_t" 1>&6
+if test $ac_cv_type_size_t = no; then
+  cat >> confdefs.h <<\EOF
 #define size_t unsigned
 EOF
 
@@ -3583,19 +3178,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:3584: checking for working alloca.h" >&5
-if eval "test \"\${ac_cv_header_alloca_h+set}\" = set"; then
+echo "configure:3182: 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 3589 "configure"
+#line 3187 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:3596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3194: \"$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
@@ -3616,12 +3211,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:3617: checking for alloca" >&5
-if eval "test \"\${ac_cv_func_alloca_works+set}\" = set"; then
+echo "configure:3215: 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 3622 "configure"
+#line 3220 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -3649,7 +3244,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:3650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3248: \"$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
@@ -3681,12 +3276,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:3682: checking whether alloca needs Cray hooks" >&5
-if eval "test \"\${ac_cv_os_cray+set}\" = set"; then
+echo "configure:3280: 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 3687 "configure"
+#line 3285 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -3711,12 +3306,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:3712: checking for $ac_func" >&5
-if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
+echo "configure:3310: 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 3717 "configure"
+#line 3315 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3725,7 +3320,6 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
-char (*f)();
 
 int main() {
 
@@ -3735,12 +3329,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-f = $ac_func;
+$ac_func();
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:3741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3338: \"$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
@@ -3767,15 +3361,15 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:3768: checking stack direction for C alloca" >&5
-if eval "test \"\${ac_cv_c_stack_direction+set}\" = set"; then
+echo "configure:3365: 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
   if test "$cross_compiling" = yes; then
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 3776 "configure"
+#line 3373 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -3794,7 +3388,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:3795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3392: \"$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
@@ -3819,17 +3413,17 @@ for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3820: checking for $ac_hdr" >&5
-if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
+echo "configure:3417: 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 3825 "configure"
+#line 3422 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3427: \"$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*
@@ -3858,12 +3452,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3859: checking for $ac_func" >&5
-if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
+echo "configure:3456: 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 3864 "configure"
+#line 3461 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3872,7 +3466,6 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
-char (*f)();
 
 int main() {
 
@@ -3882,12 +3475,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-f = $ac_func;
+$ac_func();
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:3888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3484: \"$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
@@ -3912,15 +3505,15 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:3913: checking for working mmap" >&5
-if eval "test \"\${ac_cv_func_mmap_fixed_mapped+set}\" = set"; then
+echo "configure:3509: 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
   if test "$cross_compiling" = yes; then
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 3921 "configure"
+#line 3517 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -4060,7 +3653,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:4061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3657: \"$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
@@ -4088,17 +3681,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:4089: checking for $ac_hdr" >&5
-if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
+echo "configure:3685: 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 4094 "configure"
+#line 3690 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3695: \"$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*
@@ -4128,12 +3721,12 @@ done
 __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4129: checking for $ac_func" >&5
-if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
+echo "configure:3725: 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 4134 "configure"
+#line 3730 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4142,7 +3735,6 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
-char (*f)();
 
 int main() {
 
@@ -4152,12 +3744,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-f = $ac_func;
+$ac_func();
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:4158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3753: \"$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
@@ -4186,12 +3778,12 @@ done
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4187: checking for $ac_func" >&5
-if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
+echo "configure:3782: 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 4192 "configure"
+#line 3787 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4200,7 +3792,6 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
-char (*f)();
 
 int main() {
 
@@ -4210,12 +3801,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-f = $ac_func;
+$ac_func();
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:4216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3810: \"$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
@@ -4249,19 +3840,19 @@ EOF
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:4250: checking for LC_MESSAGES" >&5
-if eval "test \"\${am_cv_val_LC_MESSAGES+set}\" = set"; then
+echo "configure:3844: 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 4255 "configure"
+#line 3849 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:4262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3856: \"$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
@@ -4282,7 +3873,7 @@ EOF
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:4283: checking whether NLS is requested" >&5
+echo "configure:3877: 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"
@@ -4302,7 +3893,7 @@ fi
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:4303: checking whether included gettext is requested" >&5
+echo "configure:3897: 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"
@@ -4321,17 +3912,17 @@ fi
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:4322: checking for libintl.h" >&5
-if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
+echo "configure:3916: 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 4327 "configure"
+#line 3921 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4332: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3926: \"$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*
@@ -4348,19 +3939,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:4349: checking for gettext in libc" >&5
-if eval "test \"\${gt_cv_func_gettext_libc+set}\" = set"; then
+echo "configure:3943: 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 4354 "configure"
+#line 3948 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:4361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3955: \"$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
@@ -4376,15 +3967,15 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6
 
 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:4377: checking for bindtextdomain in -lintl" >&5
-ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-:%__p__%'`
-if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
+echo "configure:3971: 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
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4385 "configure"
+#line 3979 "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
@@ -4395,7 +3986,7 @@ int main() {
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:4396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3990: \"$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
@@ -4411,19 +4002,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:4412: checking for gettext in libintl" >&5
-if eval "test \"\${gt_cv_func_gettext_libintl+set}\" = set"; then
+echo "configure:4006: 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 4417 "configure"
+#line 4011 "configure"
 #include "confdefs.h"
 
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:4424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4018: \"$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
@@ -4451,8 +4042,8 @@ 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:4452: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_path_MSGFMT+set}\" = set"; then
+echo "configure:4046: 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
   case "$MSGFMT" in
@@ -4485,12 +4076,12 @@ fi
 		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4486: checking for $ac_func" >&5
-if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
+echo "configure:4080: 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 4491 "configure"
+#line 4085 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4499,7 +4090,6 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
-char (*f)();
 
 int main() {
 
@@ -4509,12 +4099,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-f = $ac_func;
+$ac_func();
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:4515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4108: \"$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
@@ -4541,8 +4131,8 @@ 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:4542: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_path_GMSGFMT+set}\" = set"; then
+echo "configure:4135: 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
   case "$GMSGFMT" in
@@ -4577,8 +4167,8 @@ 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:4578: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_path_XGETTEXT+set}\" = set"; then
+echo "configure:4171: 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
   case "$XGETTEXT" in
@@ -4609,7 +4199,7 @@ else
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 4610 "configure"
+#line 4203 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4617,7 +4207,7 @@ extern int _nl_msg_cat_cntr;
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:4618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -4649,8 +4239,8 @@ 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:4650: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_path_MSGFMT+set}\" = set"; then
+echo "configure:4243: 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
   case "$MSGFMT" in
@@ -4683,8 +4273,8 @@ 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:4684: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_path_GMSGFMT+set}\" = set"; then
+echo "configure:4277: 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
   case "$GMSGFMT" in
@@ -4719,8 +4309,8 @@ 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:4720: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_path_XGETTEXT+set}\" = set"; then
+echo "configure:4313: 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
   case "$XGETTEXT" in
@@ -4809,7 +4399,7 @@ fi
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:4810: checking for catalogs to be installed" >&5
+echo "configure:4403: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -4837,17 +4427,17 @@ echo "configure:4810: checking for catalogs to be installed" >&5
       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:4838: checking for linux/version.h" >&5
-if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
+echo "configure:4431: 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 4843 "configure"
+#line 4436 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4441: \"$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*
@@ -4910,7 +4500,7 @@ fi
   
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:4911: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:4504: 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"
@@ -4933,12 +4523,12 @@ fi
   
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:4934: checking for Cygwin environment" >&5
-if eval "test \"\${ac_cv_cygwin+set}\" = set"; then
+echo "configure:4527: 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 4939 "configure"
+#line 4532 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4949,7 +4539,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:4950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -4959,25 +4549,26 @@ else
   ac_cv_cygwin=no
 fi
 rm -f conftest*
+rm -f conftest*
 fi
 
 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:4966: checking for mingw32 environment" >&5
-if eval "test \"\${ac_cv_mingw32+set}\" = set"; then
+echo "configure:4560: 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 4971 "configure"
+#line 4565 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:4978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -4987,57 +4578,29 @@ else
   ac_cv_mingw32=no
 fi
 rm -f conftest*
+rm -f conftest*
 fi
 
 echo "$ac_t""$ac_cv_mingw32" 1>&6
 MINGW32=
 test "$ac_cv_mingw32" = yes && MINGW32=yes
-echo $ac_n "checking for EMX OS/2 environment""... $ac_c" 1>&6
-echo "configure:4994: checking for EMX OS/2 environment" >&5
-if eval "test \"\${ac_cv_emxos2+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4999 "configure"
-#include "confdefs.h"
-
-int main() {
-return __EMX__;
-; return 0; }
-EOF
-if { (eval echo configure:5006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_emxos2=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_emxos2=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_emxos2" 1>&6
-EMXOS2=
-test "$ac_cv_emxos2" = yes && EMXOS2=yes
-
 
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:5025: checking for executable suffix" >&5
-if eval "test \"\${ac_cv_exeext+set}\" = set"; then
+echo "configure:4591: checking for executable suffix" >&5
+if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then
+  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
   ac_cv_exeext=.exe
 else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:5035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:4601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.C | *.o | *.obj | *.xcoff) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -5059,17 +4622,17 @@ for ac_hdr in string.h stdlib.h memory.h strings.h unistd.h stdarg.h varargs.h e
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5060: checking for $ac_hdr" >&5
-if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
+echo "configure:4626: 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 5065 "configure"
+#line 4631 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4636: \"$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*
@@ -5099,7 +4662,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:5100: checking whether compiling a cross-assembler" >&5
+echo "configure:4666: checking whether compiling a cross-assembler" >&5
 if test "${host}" = "${target}"; then
   cross_gas=no
 else
@@ -5114,19 +4677,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:5115: checking for working alloca.h" >&5
-if eval "test \"\${ac_cv_header_alloca_h+set}\" = set"; then
+echo "configure:4681: 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 5120 "configure"
+#line 4686 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:5127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4693: \"$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
@@ -5147,12 +4710,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:5148: checking for alloca" >&5
-if eval "test \"\${ac_cv_func_alloca_works+set}\" = set"; then
+echo "configure:4714: 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 5153 "configure"
+#line 4719 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -5180,7 +4743,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:5181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4747: \"$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
@@ -5212,12 +4775,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:5213: checking whether alloca needs Cray hooks" >&5
-if eval "test \"\${ac_cv_os_cray+set}\" = set"; then
+echo "configure:4779: 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 5218 "configure"
+#line 4784 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -5242,12 +4805,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:5243: checking for $ac_func" >&5
-if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
+echo "configure:4809: 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 5248 "configure"
+#line 4814 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5256,7 +4819,6 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
-char (*f)();
 
 int main() {
 
@@ -5266,12 +4828,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-f = $ac_func;
+$ac_func();
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:5272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4837: \"$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
@@ -5298,15 +4860,15 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:5299: checking stack direction for C alloca" >&5
-if eval "test \"\${ac_cv_c_stack_direction+set}\" = set"; then
+echo "configure:4864: 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
   if test "$cross_compiling" = yes; then
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 5307 "configure"
+#line 4872 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -5325,7 +4887,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:5326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4891: \"$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
@@ -5347,21 +4909,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:5348: checking for inline" >&5
-if eval "test \"\${ac_cv_c_inline+set}\" = set"; then
+echo "configure:4913: 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 5355 "configure"
+#line 4920 "configure"
 #include "confdefs.h"
 
 int main() {
-} $ac_kw int foo() {
+} $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:5362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -5391,12 +4953,12 @@ esac
 for ac_func in unlink remove
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5392: checking for $ac_func" >&5
-if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
+echo "configure:4957: 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 5397 "configure"
+#line 4962 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5405,7 +4967,6 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
-char (*f)();
 
 int main() {
 
@@ -5415,12 +4976,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-f = $ac_func;
+$ac_func();
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:5421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4985: \"$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
@@ -5449,12 +5010,12 @@ done
 for ac_func in sbrk
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5450: checking for $ac_func" >&5
-if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
+echo "configure:5014: 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 5455 "configure"
+#line 5019 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5463,7 +5024,6 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
-char (*f)();
 
 int main() {
 
@@ -5473,12 +5033,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-f = $ac_func;
+$ac_func();
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:5479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5042: \"$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
@@ -5507,12 +5067,12 @@ done
 # 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:5508: checking for working assert macro" >&5
-if eval "test \"\${gas_cv_assert_ok+set}\" = set"; then
+echo "configure:5071: 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 5513 "configure"
+#line 5076 "configure"
 #include "confdefs.h"
 #include <assert.h>
 #include <stdio.h>
@@ -5528,7 +5088,7 @@ assert (a == b
 
 ; return 0; }
 EOF
-if { (eval echo configure:5529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gas_cv_assert_ok=yes
 else
@@ -5569,12 +5129,12 @@ gas_test_headers="
 "
 
 echo $ac_n "checking whether declaration is required for strstr""... $ac_c" 1>&6
-echo "configure:5570: checking whether declaration is required for strstr" >&5
-if eval "test \"\${gas_cv_decl_needed_strstr+set}\" = set"; then
+echo "configure:5133: 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 5575 "configure"
+#line 5138 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -5585,7 +5145,7 @@ x = (f) strstr;
 
 ; return 0; }
 EOF
-if { (eval echo configure:5586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5149: \"$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
@@ -5606,12 +5166,12 @@ fi
 
 
 echo $ac_n "checking whether declaration is required for malloc""... $ac_c" 1>&6
-echo "configure:5607: checking whether declaration is required for malloc" >&5
-if eval "test \"\${gas_cv_decl_needed_malloc+set}\" = set"; then
+echo "configure:5170: 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 5612 "configure"
+#line 5175 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -5622,7 +5182,7 @@ x = (f) malloc;
 
 ; return 0; }
 EOF
-if { (eval echo configure:5623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5186: \"$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
@@ -5643,12 +5203,12 @@ fi
 
 
 echo $ac_n "checking whether declaration is required for free""... $ac_c" 1>&6
-echo "configure:5644: checking whether declaration is required for free" >&5
-if eval "test \"\${gas_cv_decl_needed_free+set}\" = set"; then
+echo "configure:5207: 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 5649 "configure"
+#line 5212 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -5659,7 +5219,7 @@ x = (f) free;
 
 ; return 0; }
 EOF
-if { (eval echo configure:5660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5223: \"$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
@@ -5680,12 +5240,12 @@ fi
 
 
 echo $ac_n "checking whether declaration is required for sbrk""... $ac_c" 1>&6
-echo "configure:5681: checking whether declaration is required for sbrk" >&5
-if eval "test \"\${gas_cv_decl_needed_sbrk+set}\" = set"; then
+echo "configure:5244: 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 5686 "configure"
+#line 5249 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -5696,7 +5256,7 @@ x = (f) sbrk;
 
 ; return 0; }
 EOF
-if { (eval echo configure:5697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5260: \"$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
@@ -5717,12 +5277,12 @@ fi
 
 
 echo $ac_n "checking whether declaration is required for environ""... $ac_c" 1>&6
-echo "configure:5718: checking whether declaration is required for environ" >&5
-if eval "test \"\${gas_cv_decl_needed_environ+set}\" = set"; then
+echo "configure:5281: 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 5723 "configure"
+#line 5286 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -5733,7 +5293,7 @@ x = (f) environ;
 
 ; return 0; }
 EOF
-if { (eval echo configure:5734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5297: \"$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
@@ -5757,12 +5317,12 @@ fi
 # for it?
 
 echo $ac_n "checking whether declaration is required for errno""... $ac_c" 1>&6
-echo "configure:5758: checking whether declaration is required for errno" >&5
-if eval "test \"\${gas_cv_decl_needed_errno+set}\" = set"; then
+echo "configure:5321: 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 5763 "configure"
+#line 5326 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_ERRNO_H
@@ -5777,7 +5337,7 @@ x = (f) errno;
 
 ; return 0; }
 EOF
-if { (eval echo configure:5778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5341: \"$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
@@ -5889,7 +5449,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13.1"
+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -5960,12 +5520,7 @@ s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@RANLIB@%$RANLIB%g
 s%@CC@%$CC%g
-s%@LD@%$LD%g
-s%@NM@%$NM%g
-s%@USE_SYMBOL_UNDERSCORE@%$USE_SYMBOL_UNDERSCORE%g
 s%@LN_S@%$LN_S%g
-s%@DLLTOOL@%$DLLTOOL%g
-s%@AS@%$AS%g
 s%@LIBTOOL@%$LIBTOOL%g
 s%@GDBINIT@%$GDBINIT%g
 s%@cgen_cpu_prefix@%$cgen_cpu_prefix%g
@@ -6239,5 +5794,5 @@ exit 0
 EOF
 chmod +x $CONFIG_STATUS
 rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1
+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in
index e9868c7..6ac93da 100644
--- a/gas/doc/Makefile.in
+++ b/gas/doc/Makefile.in
@@ -82,7 +82,6 @@ INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-LD = @LD@
 LEX = @LEX@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
@@ -90,7 +89,7 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NM = @NM@
+OBJDUMP = @OBJDUMP@
 OPCODES_LIB = @OPCODES_LIB@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
@@ -98,7 +97,6 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 YACC = @YACC@
 atof = @atof@
diff --git a/gas/po/POTFILES.in b/gas/po/POTFILES.in
index 9f67f27..0e420b3 100644
--- a/gas/po/POTFILES.in
+++ b/gas/po/POTFILES.in
@@ -13,6 +13,7 @@ bit_fix.h
 cgen.h
 cond.c
 cond.c
+config/e-i386aout.c
 config/e-i386coff.c
 config/e-i386elf.c
 config/e-mipsecoff.c
@@ -49,12 +50,16 @@ config/tc-d10v.c
 config/tc-d10v.h
 config/tc-d30v.c
 config/tc-d30v.h
+config/tc-fr30.c
+config/tc-fr30.h
 config/tc-h8300.c
 config/tc-h8300.h
 config/tc-h8500.c
 config/tc-h8500.h
 config/tc-hppa.c
 config/tc-hppa.h
+config/tc-i370.c
+config/tc-i370.h
 config/tc-i386.c
 config/tc-i386.h
 config/tc-i860.c
@@ -77,6 +82,8 @@ config/tc-mn10300.c
 config/tc-mn10300.h
 config/tc-ns32k.c
 config/tc-ns32k.h
+config/tc-pj.c
+config/tc-pj.h
 config/tc-ppc.c
 config/tc-ppc.h
 config/tc-sh.c
diff --git a/gas/po/gas.pot b/gas/po/gas.pot
index ef40ee1..4d04cea 100644
--- a/gas/po/gas.pot
+++ b/gas/po/gas.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-06-03 03:00-0700\n"
+"POT-Creation-Date: 2000-02-27 11:37-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,221 +14,329 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: app.c:448 app.c:462
+#: app.c:466 app.c:480
 msgid "end of file in comment"
 msgstr ""
 
-#: app.c:541
+#: app.c:559
 msgid "end of file in string: inserted '\"'"
 msgstr ""
 
-#: app.c:607
+#: app.c:625
 #, c-format
 msgid "Unknown escape '\\%c' in string: Ignored"
 msgstr ""
 
-#: app.c:616
+#: app.c:634
 msgid "End of file in string: '\"' inserted"
 msgstr ""
 
-#: app.c:736
+#: app.c:754
 msgid "end of file not at end of a line; newline inserted"
 msgstr ""
 
-#: app.c:882
+#: app.c:911
 msgid "end of file in multiline comment"
 msgstr ""
 
-#: app.c:931
+#: app.c:960
 msgid "end of file after a one-character quote; \\0 inserted"
 msgstr ""
 
-#: app.c:939
+#: app.c:968
 msgid "end of file in escape character"
 msgstr ""
 
-#: app.c:951
+#: app.c:980
 msgid "Missing close quote: (assumed)"
 msgstr ""
 
-#: app.c:1010 app.c:1064 app.c:1133
+#: app.c:1043 app.c:1097 app.c:1166
 msgid "end of file in comment; newline inserted"
 msgstr ""
 
-#: app.c:1074
+#: app.c:1107
 msgid "EOF in Comment: Newline inserted"
 msgstr ""
 
-#: as.c:121
+#: as.c:148
+msgid "missing emulation mode name"
+msgstr ""
+
+#: as.c:163
+#, c-format
+msgid "unrecognized emulation name `%s'"
+msgstr ""
+
+#: as.c:210
 #, c-format
 msgid "GNU assembler version %s (%s) using BFD version %s"
 msgstr ""
 
-#: as.c:124
+#: as.c:213
 #, c-format
 msgid "GNU assembler version %s (%s)"
 msgstr ""
 
-#: as.c:133
+#: as.c:222
 #, c-format
 msgid "Usage: %s [option...] [asmfile...]\n"
 msgstr ""
 
-#: as.c:135
+#: as.c:224
 msgid ""
 "Options:\n"
-"  -a[sub-option...]\tturn on listings\n"
-"    Sub-options [default hls]:\n"
-"    c   omit false conditionals\n"
-"    d   omit debugging directives\n"
-"    h   include high-level source\n"
-"    l   include assembly\n"
-"    m   include macro expansions\n"
-"    n   omit forms processing\n"
-"    s   include symbols\n"
-"    L   include line debug statistics (if applicable)\n"
-"    =file set listing file name (must be last sub-option)\n"
-msgstr ""
-
-#: as.c:149
+"  -a[sub-option...]\t  turn on listings\n"
+"                      \t  Sub-options [default hls]:\n"
+"                      \t  c      omit false conditionals\n"
+"                      \t  d      omit debugging directives\n"
+"                      \t  h      include high-level source\n"
+"                      \t  l      include assembly\n"
+"                      \t  m      include macro expansions\n"
+"                      \t  n      omit forms processing\n"
+"                      \t  s      include symbols\n"
+"                      \t  L      include line debug statistics (if "
+"applicable)\n"
+"                      \t  =FILE  list to FILE (must be last sub-option)\n"
+msgstr ""
+
+#: as.c:238
+msgid "  -D                      produce assembler debugging messages\n"
+msgstr ""
+
+#: as.c:240
+msgid "  --defsym SYM=VAL        define symbol SYM to given value\n"
+msgstr ""
+
+#: as.c:256
+#, c-format
+msgid "                          emulate output (default %s)\n"
+msgstr ""
+
+#: as.c:260
+msgid "  -f                      skip whitespace and comment preprocessing\n"
+msgstr ""
+
+#: as.c:262
+msgid "  --gstabs                generate stabs debugging information\n"
+msgstr ""
+
+#: as.c:264
+msgid "  --gdwarf2               generate DWARF2 debugging information\n"
+msgstr ""
+
+#: as.c:266
+msgid "  --help                  show this message and exit\n"
+msgstr ""
+
+#: as.c:268
+msgid ""
+"  -I DIR                  add DIR to search list for .include directives\n"
+msgstr ""
+
+#: as.c:270
+msgid "  -J                      don't warn about signed overflow\n"
+msgstr ""
+
+#: as.c:272
 msgid ""
-"  -D\t\t          produce assembler debugging messages\n"
-"  --defsym SYM=VAL        define symbol SYM to given value\n"
-"  -f\t\t          skip whitespace and comment preprocessing\n"
-"  --gstabs\t          generate stabs debugging information\n"
-"  --help\t\t  show this message and exit\n"
-"  -I DIR\t\t  add DIR to search list for .include directives\n"
-"  -J\t\t          don't warn about signed overflow\n"
-"  -K\t\t          warn when differences altered for long displacements\n"
-"  -L,--keep-locals        keep local symbols (e.g. starting with `L')\n"
-msgstr ""
-
-#: as.c:160
+"  -K                      warn when differences altered for long "
+"displacements\n"
+msgstr ""
+
+#: as.c:274
+msgid "  -L,--keep-locals        keep local symbols (e.g. starting with `L')\n"
+msgstr ""
+
+#: as.c:276
+msgid "  -M,--mri                assemble in MRI compatibility mode\n"
+msgstr ""
+
+#: as.c:278
+msgid ""
+"  --MD FILE               write dependency information in FILE (default "
+"none)\n"
+msgstr ""
+
+#: as.c:280
+msgid "  -nocpp                  ignored\n"
+msgstr ""
+
+#: as.c:282
+msgid ""
+"  -o OBJFILE              name the object-file output OBJFILE (default "
+"a.out)\n"
+msgstr ""
+
+#: as.c:284
+msgid "  -R                      fold data section into text section\n"
+msgstr ""
+
+#: as.c:286
+msgid ""
+"  --statistics            print various measured statistics from execution\n"
+msgstr ""
+
+#: as.c:288
+msgid "  --strip-local-absolute  strip local absolute symbols\n"
+msgstr ""
+
+#: as.c:290
+msgid ""
+"  --traditional-format    Use same format as native assembler when possible\n"
+msgstr ""
+
+#: as.c:292
+msgid "  --version               print assembler version number and exit\n"
+msgstr ""
+
+#: as.c:294
+msgid "  -W  --no-warn           suppress warnings\n"
+msgstr ""
+
+#: as.c:296
+msgid "  --warn                  don't suppress warnings\n"
+msgstr ""
+
+#: as.c:298
+msgid "  --fatal-warnings        treat warnings as errors\n"
+msgstr ""
+
+#: as.c:300
 msgid ""
-"  -M,--mri\t          assemble in MRI compatibility mode\n"
-"  --MD FILE\t          write dependency information in FILE (default none)\n"
-"  -nocpp\t\t  ignored\n"
-"  -o OBJFILE\t          name the object-file output OBJFILE (default a.out)\n"
-"  -R\t\t          fold data section into text section\n"
-"  --statistics\t          print various measured statistics from execution\n"
-"  --strip-local-absolute  strip local absolute symbols\n"
-"  --traditional-format\t  Use same format as native assembler when possible\n"
-"  --version\t\t  print assembler version number and exit\n"
-"  -W\t\t\t  suppress warnings\n"
-"  --itbl INSTTBL\t  extend instruction set to include instructions\n"
-"\t\t\t  matching the specifications defined in file INSTTBL\n"
-"  -w\t\t\t  ignored\n"
-"  -X\t\t\t  ignored\n"
-"  -Z\t\t\t  generate object file even after errors\n"
-msgstr ""
-
-#: as.c:177
+"  --itbl INSTTBL          extend instruction set to include instructions\n"
+"                          matching the specifications defined in file "
+"INSTTBL\n"
+msgstr ""
+
+#: as.c:303
+msgid "  -w                      ignored\n"
+msgstr ""
+
+#: as.c:305
+msgid "  -X                      ignored\n"
+msgstr ""
+
+#: as.c:307
+msgid "  -Z                      generate object file even after errors\n"
+msgstr ""
+
+#: as.c:309
 msgid ""
-"  --listing-lhs-width\t  set the width in words of the output data column "
+"  --listing-lhs-width     set the width in words of the output data column "
 "of\n"
-"\t\t\t  the listing\n"
-"  --listing-lhs-width2\t  set the width in words of the continuation lines\n"
-"\t\t\t  of the output data column; ignored if smaller than\n"
-"\t\t\t  the width of the first line\n"
-"  --listing-rhs-width\t  set the max width in characters of the lines from\n"
-"\t\t\t  the source file\n"
-"  --listing-cont-lines\t  set the maximum number of continuation lines used\n"
-"\t\t\t  for the output data column of the listing\n"
+"                          the listing\n"
 msgstr ""
 
-#: as.c:190 gasp.c:3588
+#: as.c:312
 msgid ""
-"\n"
-"Report bugs to bug-gnu-utils@gnu.org\n"
+"  --listing-lhs-width2    set the width in words of the continuation lines\n"
+"                          of the output data column; ignored if smaller "
+"than\n"
+"                          the width of the first line\n"
 msgstr ""
 
-#: as.c:227
-msgid "missing emulation mode name"
+#: as.c:316
+msgid ""
+"  --listing-rhs-width     set the max width in characters of the lines from\n"
+"                          the source file\n"
 msgstr ""
 
-#: as.c:242
-#, c-format
-msgid "unrecognized emulation name `%s'"
+#: as.c:319
+msgid ""
+"  --listing-cont-lines    set the maximum number of continuation lines used\n"
+"                          for the output data column of the listing\n"
+msgstr ""
+
+#: as.c:325 gasp.c:3589
+msgid ""
+"\n"
+"Report bugs to bug-gnu-utils@gnu.org\n"
 msgstr ""
 
 #. This output is intended to follow the GNU standards document.
-#: as.c:462
+#: as.c:515
 #, c-format
 msgid "GNU assembler %s\n"
 msgstr ""
 
-#: as.c:463
+#: as.c:516
 msgid "Copyright 1997 Free Software Foundation, Inc.\n"
 msgstr ""
 
-#: as.c:464 gasp.c:3682
+#: as.c:517 gasp.c:3683
 msgid ""
 "This program is free software; you may redistribute it under the terms of\n"
 "the GNU General Public License.  This program has absolutely no warranty.\n"
 msgstr ""
 
-#: as.c:467
+#: as.c:520
 #, c-format
 msgid "This assembler was configured for a target of `%s'.\n"
 msgstr ""
 
-#: as.c:474
+#: as.c:527
 msgid "multiple emulation names specified"
 msgstr ""
 
-#: as.c:476
+#: as.c:529
 msgid "emulations not handled in this configuration"
 msgstr ""
 
-#: as.c:481
+#: as.c:534
 #, c-format
 msgid "alias = %s\n"
 msgstr ""
 
-#: as.c:482
+#: as.c:535
 #, c-format
 msgid "canonical = %s\n"
 msgstr ""
 
-#: as.c:483
+#: as.c:536
 #, c-format
 msgid "cpu-type = %s\n"
 msgstr ""
 
-#: as.c:485
+#: as.c:538
 #, c-format
 msgid "format = %s\n"
 msgstr ""
 
-#: as.c:488
+#: as.c:541
 #, c-format
 msgid "bfd-target = %s\n"
 msgstr ""
 
-#: as.c:501
+#: as.c:554
 msgid "bad defsym; format is --defsym name=value"
 msgstr ""
 
-#: as.c:521
+#: as.c:574
 msgid "No file name following -t option\n"
 msgstr ""
 
-#: as.c:537
+#: as.c:590
 #, c-format
 msgid "Failed to read instruction table %s\n"
 msgstr ""
 
-#: as.c:641
+#: as.c:704
 #, c-format
 msgid "invalid listing option `%c'"
 msgstr ""
 
-#: as.c:863
+#: as.c:898
+#, c-format
+msgid "%d warnings, treating warnings as errors"
+msgstr ""
+
+#: as.c:929
 #, c-format
 msgid "%s: total time in assembly: %ld.%06ld\n"
 msgstr ""
 
-#: as.c:866
+#: as.c:932
 #, c-format
 msgid "%s: data size %ld\n"
 msgstr ""
@@ -239,7 +347,7 @@ msgstr ""
 #.
 #: atof-generic.c:438 config/tc-a29k.c:544 config/tc-i860.c:335
 #: config/tc-i860.c:708 config/tc-m68k.c:3124 config/tc-m68k.c:3153
-#: config/tc-sparc.c:2157
+#: config/tc-sparc.c:2452
 msgid "failed sanity check."
 msgstr ""
 
@@ -255,246 +363,272 @@ msgstr ""
 msgid "bad format for ifc or ifnc"
 msgstr ""
 
-#: cond.c:257
-msgid "\".endif\" without \".if\""
-msgstr ""
-
-#: cond.c:287
-msgid ".else without matching .if - ignored"
+#: cond.c:258
+msgid "\".elseif\" without matching \".if\" - ignored"
 msgstr ""
 
-#: cond.c:292
-msgid "duplicate \"else\" - ignored"
+#: cond.c:263
+msgid "\".elseif\" after \".else\" - ignored"
 msgstr ""
 
-#: cond.c:295
+#: cond.c:266 cond.c:375
 msgid "here is the previous \"else\""
 msgstr ""
 
-#: cond.c:298
+#: cond.c:269 cond.c:378
 msgid "here is the previous \"if\""
 msgstr ""
 
-#: cond.c:343
+#: cond.c:302
+msgid "non-constant expression in \".elseif\" statement"
+msgstr ""
+
+#: cond.c:337
+msgid "\".endif\" without \".if\""
+msgstr ""
+
+#: cond.c:367
+msgid ".else without matching .if - ignored"
+msgstr ""
+
+#: cond.c:372
+msgid "duplicate \"else\" - ignored"
+msgstr ""
+
+#: cond.c:423
 msgid ".ifeqs syntax error"
 msgstr ""
 
-#: cond.c:430
+#: cond.c:506
 msgid "end of macro inside conditional"
 msgstr ""
 
-#: cond.c:432
+#: cond.c:508
 msgid "end of file inside conditional"
 msgstr ""
 
-#: cond.c:435
+#: cond.c:511
 msgid "here is the start of the unterminated conditional"
 msgstr ""
 
-#: cond.c:439
+#: cond.c:515
 msgid "here is the \"else\" of the unterminated conditional"
 msgstr ""
 
-#: config/obj-aout.c:161
+#: config/obj-aout.c:163
 #, c-format
 msgid "Attempt to put a common symbol into set %s"
 msgstr ""
 
-#: config/obj-aout.c:165
+#: config/obj-aout.c:167
 #, c-format
 msgid "Attempt to put an undefined symbol into set %s"
 msgstr ""
 
-#: config/obj-aout.c:196 config/obj-elf.c:1540 ecoff.c:3667
+#: config/obj-aout.c:198 config/obj-coff.c:1204 config/obj-elf.c:1675
+#: ecoff.c:3668
 #, c-format
 msgid "Symbol `%s' can not be both weak and common"
 msgstr ""
 
-#: config/obj-aout.c:254 config/obj-coff.c:1770
+#: config/obj-aout.c:256 config/obj-coff.c:1916
 msgid "unresolved relocation"
 msgstr ""
 
-#: config/obj-aout.c:256 config/obj-coff.c:1772
+#: config/obj-aout.c:258 config/obj-coff.c:1918
 #, c-format
 msgid "bad relocation: symbol `%s' not in symbol table"
 msgstr ""
 
-#: config/obj-aout.c:343
+#: config/obj-aout.c:345
 #, c-format
 msgid "%s: bad type for weak symbol"
 msgstr ""
 
-#: config/obj-aout.c:457 config/obj-coff.c:2704 write.c:1801
+#: config/obj-aout.c:462 config/obj-coff.c:2849 write.c:1805
 #, c-format
 msgid "%s: global symbols not supported in common sections"
 msgstr ""
 
-#: config/obj-aout.c:524
+#: config/obj-aout.c:529
 #, c-format
 msgid "Local symbol %s never defined."
 msgstr ""
 
-#: config/obj-aout.c:612
+#: config/obj-aout.c:617
 msgid "subsegment index too high"
 msgstr ""
 
-#: config/obj-bout.c:312 config/obj-vms.c:566
+#: config/obj-bout.c:313 config/obj-vms.c:566
 #, c-format
 msgid "Local symbol %s never defined"
 msgstr ""
 
-#: config/obj-coff.c:133
+#: config/obj-coff.c:149
 #, c-format
 msgid "Inserting \"%s\" into structure table failed: %s"
 msgstr ""
 
-#: config/obj-coff.c:453 config/obj-coff.c:2117
+#. Zero is used as an end marker in the file.
+#: config/obj-coff.c:444
+msgid "Line numbers must be positive integers\n"
+msgstr ""
+
+#: config/obj-coff.c:477 config/obj-coff.c:2263
 msgid ".ln pseudo-op inside .def/.endef: ignored."
 msgstr ""
 
-#: config/obj-coff.c:513 config/obj-coff.c:2174
+#: config/obj-coff.c:520 ecoff.c:3304
+msgid ".loc outside of .text"
+msgstr ""
+
+#: config/obj-coff.c:527
+msgid ".loc pseudo-op inside .def/.endef: ignored."
+msgstr ""
+
+#: config/obj-coff.c:615 config/obj-coff.c:2320
 msgid ".def pseudo-op used inside of .def/.endef: ignored."
 msgstr ""
 
-#: config/obj-coff.c:559 config/obj-coff.c:2227
+#: config/obj-coff.c:661 config/obj-coff.c:2373
 msgid ".endef pseudo-op used outside of .def/.endef: ignored."
 msgstr ""
 
-#: config/obj-coff.c:593
+#: config/obj-coff.c:699
 #, c-format
 msgid "`%s' symbol without preceding function"
 msgstr ""
 
-#: config/obj-coff.c:635 config/obj-coff.c:2302
+#: config/obj-coff.c:753 config/obj-coff.c:2448
 #, c-format
 msgid "unexpected storage class %d"
 msgstr ""
 
-#: config/obj-coff.c:737 config/obj-coff.c:2409
+#: config/obj-coff.c:866 config/obj-coff.c:2555
 msgid ".dim pseudo-op used outside of .def/.endef: ignored."
 msgstr ""
 
-#: config/obj-coff.c:757 config/obj-coff.c:2429
+#: config/obj-coff.c:886 config/obj-coff.c:2575
 msgid "badly formed .dim directive ignored"
 msgstr ""
 
-#: config/obj-coff.c:808 config/obj-coff.c:2492
+#: config/obj-coff.c:937 config/obj-coff.c:2638
 msgid ".size pseudo-op used outside of .def/.endef ignored."
 msgstr ""
 
-#: config/obj-coff.c:824 config/obj-coff.c:2508
+#: config/obj-coff.c:953 config/obj-coff.c:2654
 msgid ".scl pseudo-op used outside of .def/.endef ignored."
 msgstr ""
 
-#: config/obj-coff.c:842 config/obj-coff.c:2526
+#: config/obj-coff.c:971 config/obj-coff.c:2672
 msgid ".tag pseudo-op used outside of .def/.endef ignored."
 msgstr ""
 
-#: config/obj-coff.c:861 config/obj-coff.c:2544
+#: config/obj-coff.c:990 config/obj-coff.c:2690
 #, c-format
 msgid "tag not found for .tag %s"
 msgstr ""
 
-#: config/obj-coff.c:876 config/obj-coff.c:2559
+#: config/obj-coff.c:1005 config/obj-coff.c:2705
 msgid ".type pseudo-op used outside of .def/.endef ignored."
 msgstr ""
 
-#: config/obj-coff.c:898 config/obj-coff.c:2581
+#: config/obj-coff.c:1027 config/obj-coff.c:2727
 msgid ".val pseudo-op used outside of .def/.endef ignored."
 msgstr ""
 
-#: config/obj-coff.c:1029 config/obj-coff.c:2777
+#: config/obj-coff.c:1165 config/obj-coff.c:2922
 msgid "mismatched .eb"
 msgstr ""
 
-#: config/obj-coff.c:1048 config/obj-coff.c:2817
+#: config/obj-coff.c:1183 config/obj-coff.c:2962
 msgid "C_EFCN symbol out of scope"
 msgstr ""
 
 #. STYP_INFO
 #. STYP_LIB
 #. STYP_OVER
-#: config/obj-coff.c:1257
+#: config/obj-coff.c:1405
 #, c-format
 msgid "unsupported section attribute '%c'"
 msgstr ""
 
-#: config/obj-coff.c:1262 config/obj-coff.c:3520 config/tc-ppc.c:3784
+#: config/obj-coff.c:1410 config/obj-coff.c:3668 config/tc-ppc.c:3791
 #, c-format
 msgid "unknown section attribute '%c'"
 msgstr ""
 
-#: config/obj-coff.c:1284 config/tc-ppc.c:3802 read.c:2499
+#: config/obj-coff.c:1432 config/tc-ppc.c:3809 read.c:2495
 #, c-format
 msgid "error setting flags for \"%s\": %s"
 msgstr ""
 
-#: config/obj-coff.c:1403
+#: config/obj-coff.c:1558
 #, c-format
 msgid "0x%lx: \"%s\" type = %ld, class = %d, segment = %d\n"
 msgstr ""
 
-#: config/obj-coff.c:1597 config/obj-ieee.c:69
+#: config/obj-coff.c:1743 config/obj-ieee.c:69
 msgid "Out of step\n"
 msgstr ""
 
-#: config/obj-coff.c:2032
+#: config/obj-coff.c:2178
 msgid "bfd_coff_swap_scnhdr_out failed"
 msgstr ""
 
-#: config/obj-coff.c:2259
+#: config/obj-coff.c:2405
 msgid "`.bf' symbol without preceding function\n"
 msgstr ""
 
-#: config/obj-coff.c:3220 config/obj-ieee.c:522 output-file.c:52
+#: config/obj-coff.c:3365 config/obj-ieee.c:522 output-file.c:52
 #: output-file.c:119
 #, c-format
 msgid "FATAL: Can't create %s"
 msgstr ""
 
-#: config/obj-coff.c:3394
+#: config/obj-coff.c:3542
 #, c-format
 msgid "Can't close %s: %s"
 msgstr ""
 
-#: config/obj-coff.c:3428
+#: config/obj-coff.c:3576
 #, c-format
 msgid "Too many new sections; can't add \"%s\""
 msgstr ""
 
-#: config/obj-coff.c:3838 config/tc-m88k.c:1260 config/tc-sparc.c:3016
+#: config/obj-coff.c:3986 config/tc-m88k.c:1260 config/tc-sparc.c:3344
 msgid "Expected comma after name"
 msgstr ""
 
-#: config/obj-coff.c:3844 read.c:1955
+#: config/obj-coff.c:3992 read.c:1948
 msgid "Missing size expression"
 msgstr ""
 
-#: config/obj-coff.c:3850
+#: config/obj-coff.c:3998
 #, c-format
 msgid "lcomm length (%d.) <0! Ignored."
 msgstr ""
 
-#: config/obj-coff.c:3878 read.c:2181
+#: config/obj-coff.c:4026 read.c:2179
 #, c-format
 msgid "Symbol %s already defined"
 msgstr ""
 
-#: config/obj-coff.c:3972 config/tc-i960.c:3274
+#: config/obj-coff.c:4120 config/tc-i960.c:3255
 #, c-format
 msgid "No 'bal' entry point for leafproc %s"
 msgstr ""
 
-#: config/obj-coff.c:4051 write.c:2495
+#: config/obj-coff.c:4199 write.c:2507
 #, c-format
 msgid "Negative of non-absolute symbol %s"
 msgstr ""
 
-#: config/obj-coff.c:4072 write.c:2509
+#: config/obj-coff.c:4220 write.c:2521
 msgid "callj to difference of 2 symbols"
 msgstr ""
 
-#: config/obj-coff.c:4118
+#: config/obj-coff.c:4266
 #, c-format
 msgid "Can't emit reloc {- %s-seg symbol \"%s\"} @ file address %ld."
 msgstr ""
@@ -502,150 +636,154 @@ msgstr ""
 #. This is a COBR instruction.  They have only a 13-bit
 #. displacement and are only to be used for local branches:
 #. flag as error, don't generate relocation.
-#: config/obj-coff.c:4208 config/tc-i960.c:3294 write.c:2653
+#: config/obj-coff.c:4356 config/tc-i960.c:3275 write.c:2665
 msgid "can't use COBR format with external label"
 msgstr ""
 
-#: config/obj-coff.c:4288
+#: config/obj-coff.c:4436
 #, c-format
 msgid "Value of %ld too large for field of %d bytes at 0x%lx"
 msgstr ""
 
-#: config/obj-coff.c:4302 write.c:2762
+#: config/obj-coff.c:4450 write.c:2764
 #, c-format
 msgid "Signed .word overflow; switch may be too large; %ld at 0x%lx"
 msgstr ""
 
-#: config/obj-ecoff.c:239
+#: config/obj-ecoff.c:240
 msgid "Can't set GP value"
 msgstr ""
 
-#: config/obj-ecoff.c:246
+#: config/obj-ecoff.c:247
 msgid "Can't set register masks"
 msgstr ""
 
-#: config/obj-elf.c:276 config/tc-sparc.c:3157 config/tc-v850.c:263
+#: config/obj-elf.c:299 config/tc-sparc.c:3485 config/tc-v850.c:263
 msgid "Expected comma after symbol-name"
 msgstr ""
 
-#: config/obj-elf.c:283 config/tc-arc.c:778 config/tc-sparc.c:3164
+#: config/obj-elf.c:306 config/tc-arc.c:779 config/tc-sparc.c:3492
 #, c-format
 msgid ".COMMon length (%d.) <0! Ignored."
 msgstr ""
 
-#: config/obj-elf.c:293 config/tc-alpha.c:3430 config/tc-sparc.c:3174
+#: config/obj-elf.c:316 config/tc-alpha.c:4320 config/tc-sparc.c:3502
 #: config/tc-v850.c:285
 msgid "Ignoring attempt to re-define symbol"
 msgstr ""
 
-#: config/obj-elf.c:301 config/tc-arc.c:796 config/tc-sparc.c:3182
+#: config/obj-elf.c:324 config/tc-arc.c:797 config/tc-sparc.c:3510
 #: config/tc-v850.c:295
 #, c-format
 msgid "Length of .comm \"%s\" is already %ld. Not changed to %d."
 msgstr ""
 
-#: config/obj-elf.c:324 config/tc-arc.c:815 config/tc-v850.c:322
+#: config/obj-elf.c:347 config/tc-arc.c:816 config/tc-v850.c:322
 msgid "Common alignment negative; 0 assumed"
 msgstr ""
 
-#: config/obj-elf.c:343 config/tc-m32r.c:664 config/tc-ppc.c:1395
+#: config/obj-elf.c:366 config/tc-m32r.c:1262 config/tc-ppc.c:1396
 #: config/tc-v850.c:385
 msgid "Common alignment not a power of 2"
 msgstr ""
 
-#: config/obj-elf.c:406 config/tc-arc.c:875 config/tc-sparc.c:3306
+#: config/obj-elf.c:429 config/tc-arc.c:876 config/tc-sparc.c:3634
 #: config/tc-v850.c:563
 #, c-format
 msgid "bad .common segment %s"
 msgstr ""
 
-#: config/obj-elf.c:591
-msgid "Missing section name"
+#: config/obj-elf.c:658
+#, c-format
+msgid "Setting incorrect section type for %s"
 msgstr ""
 
-#: config/obj-elf.c:656
-msgid "Bad .section directive: want a,w,x in string"
+#: config/obj-elf.c:668
+#, c-format
+msgid "Setting incorrect section attributes for %s"
 msgstr ""
 
-#: config/obj-elf.c:705
-msgid "Unrecognized section type"
+#: config/obj-elf.c:726
+msgid "Unrecognized .section attribute: want a,w,x"
 msgstr ""
 
-#: config/obj-elf.c:719
-msgid "Bad .section directive - character following name is not '#'"
+#: config/obj-elf.c:766
+msgid "Unrecognized section attribute"
 msgstr ""
 
-#: config/obj-elf.c:751
-msgid "Unrecognized section attribute"
+#: config/obj-elf.c:788
+msgid "Unrecognized section type"
 msgstr ""
 
-#: config/obj-elf.c:772
-#, c-format
-msgid "Setting incorrect section type for %s"
+#: config/obj-elf.c:839
+msgid "Missing section name"
 msgstr ""
 
-#: config/obj-elf.c:782
-#, c-format
-msgid "Setting incorrect section attributes for %s"
+#: config/obj-elf.c:905
+msgid "Bad .section directive - character following name is not '#'"
 msgstr ""
 
-#: config/obj-elf.c:907
+#: config/obj-elf.c:1006
 msgid ".previous without corresponding .section; ignored"
 msgstr ""
 
-#: config/obj-elf.c:956
+#: config/obj-elf.c:1033
+msgid ".popsection without corresponding .pushsection; ignored"
+msgstr ""
+
+#: config/obj-elf.c:1085
 #, c-format
 msgid "multiple .symver directives for symbol `%s'"
 msgstr ""
 
-#: config/obj-elf.c:965
+#: config/obj-elf.c:1094
 msgid "expected comma after name in .symver"
 msgstr ""
 
-#: config/obj-elf.c:986
+#: config/obj-elf.c:1115
 #, c-format
 msgid "missing version name in `%s' for symbol `%s'"
 msgstr ""
 
-#: config/obj-elf.c:1193 config/obj-som.c:148 config/obj-som.c:193
+#: config/obj-elf.c:1324 config/obj-som.c:148 config/obj-som.c:193
 msgid "Expected quoted string"
 msgstr ""
 
-#: config/obj-elf.c:1214
+#: config/obj-elf.c:1345
 #, c-format
 msgid "expected comma after name `%s' in .size directive"
 msgstr ""
 
-#: config/obj-elf.c:1223
+#: config/obj-elf.c:1354
 msgid "missing expression in .size directive"
 msgstr ""
 
-#: config/obj-elf.c:1290
+#: config/obj-elf.c:1421
 #, c-format
 msgid "ignoring unrecognized symbol type \"%s\""
 msgstr ""
 
-#: config/obj-elf.c:1464
+#: config/obj-elf.c:1599
 msgid ".size expression too complicated to fix up"
 msgstr ""
 
-#: config/obj-elf.c:1495
+#: config/obj-elf.c:1630
 #, c-format
 msgid ""
 "invalid attempt to declare external version name as default in symbol `%s'"
 msgstr ""
 
-#: config/obj-elf.c:1625
+#: config/obj-elf.c:1760
 #, c-format
 msgid "Failed to set up debugging information: %s"
 msgstr ""
 
-#: config/obj-elf.c:1641
+#: config/obj-elf.c:1780
 #, c-format
 msgid "Can't start writing .mdebug section: %s"
 msgstr ""
 
-#: config/obj-elf.c:1649
+#: config/obj-elf.c:1788
 #, c-format
 msgid "Could not write .mdebug section: %s"
 msgstr ""
@@ -818,26 +956,26 @@ msgstr ""
 msgid "unhandled stab type %d"
 msgstr ""
 
-#: config/tc-a29k.c:160 config/tc-sparc.c:3358
+#: config/tc-a29k.c:160 config/tc-sparc.c:3686
 msgid "Unknown segment type"
 msgstr ""
 
 #. Probably a memory allocation problem?  Give up now.
-#: config/tc-a29k.c:330 config/tc-hppa.c:1336 config/tc-i860.c:202
-#: config/tc-mips.c:1016 config/tc-mips.c:1058 config/tc-sparc.c:715
+#: config/tc-a29k.c:330 config/tc-hppa.c:1387 config/tc-i860.c:202
+#: config/tc-mips.c:1062 config/tc-mips.c:1104 config/tc-sparc.c:779
 msgid "Broken assembler.  No assembly attempted."
 msgstr ""
 
-#: config/tc-a29k.c:375 config/tc-arc.c:534 config/tc-d10v.c:481
-#: config/tc-d30v.c:540 config/tc-h8300.c:305 config/tc-h8500.c:297
-#: config/tc-mcore.c:509 config/tc-mn10200.c:936 config/tc-mn10300.c:992
-#: config/tc-ppc.c:1850 config/tc-sh.c:478 config/tc-tic80.c:291
+#: config/tc-a29k.c:375 config/tc-arc.c:535 config/tc-d10v.c:507
+#: config/tc-d30v.c:553 config/tc-h8300.c:305 config/tc-h8500.c:297
+#: config/tc-mcore.c:656 config/tc-mn10200.c:935 config/tc-mn10300.c:1294
+#: config/tc-ppc.c:1852 config/tc-sh.c:628 config/tc-tic80.c:291
 #: config/tc-v850.c:2033 config/tc-w65.c:257 config/tc-z8k.c:341
 msgid "missing operand"
 msgstr ""
 
-#: config/tc-a29k.c:415 config/tc-hppa.c:1450 config/tc-i860.c:407
-#: config/tc-i860.c:423 config/tc-sparc.c:1191 config/tc-sparc.c:1197
+#: config/tc-a29k.c:415 config/tc-hppa.c:1533 config/tc-i860.c:407
+#: config/tc-i860.c:423 config/tc-sparc.c:1342 config/tc-sparc.c:1348
 #, c-format
 msgid "Unknown opcode: `%s'"
 msgstr ""
@@ -888,33 +1026,33 @@ msgstr ""
 msgid "Invalid register in & expression"
 msgstr ""
 
-#: config/tc-alpha.c:722
+#: config/tc-alpha.c:834
 #, c-format
 msgid "internal error: can't hash opcode `%s': %s"
 msgstr ""
 
-#: config/tc-alpha.c:756
+#: config/tc-alpha.c:868
 #, c-format
 msgid "internal error: can't hash macro `%s': %s"
 msgstr ""
 
-#: config/tc-alpha.c:832 config/tc-i960.c:2736
+#: config/tc-alpha.c:951 config/tc-i960.c:2738
 msgid "syntax error"
 msgstr ""
 
-#: config/tc-alpha.c:905 config/tc-arm.c:4982 config/tc-h8300.c:1413
-#: config/tc-h8500.c:1222 config/tc-hppa.c:2684 config/tc-i860.c:813
-#: config/tc-m68k.c:4125 config/tc-m88k.c:1106 config/tc-ns32k.c:1588
-#: config/tc-sparc.c:2433 config/tc-z8k.c:1355
+#: config/tc-alpha.c:1025 config/tc-arm.c:5169 config/tc-h8300.c:1413
+#: config/tc-h8500.c:1222 config/tc-hppa.c:3904 config/tc-i860.c:813
+#: config/tc-m68k.c:4125 config/tc-m88k.c:1106 config/tc-ns32k.c:1589
+#: config/tc-sparc.c:2731 config/tc-z8k.c:1355
 msgid "Bad call to MD_ATOF()"
 msgstr ""
 
-#: config/tc-alpha.c:955
+#: config/tc-alpha.c:1075
 #, c-format
 msgid "Unknown CPU identifier `%s'"
 msgstr ""
 
-#: config/tc-alpha.c:999
+#: config/tc-alpha.c:1119
 msgid ""
 "Alpha options:\n"
 "-32addr\t\t\ttreat addresses as 32-bit values\n"
@@ -925,886 +1063,970 @@ msgid ""
 "\t\t\tthese variants include PALcode opcodes\n"
 msgstr ""
 
-#: config/tc-alpha.c:1009
+#: config/tc-alpha.c:1129
 msgid ""
 "VMS options:\n"
 "-+\t\t\thash encode (don't truncate) names longer than 64 characters\n"
 "-H\t\t\tshow new symbol after hash truncation\n"
 msgstr ""
 
-#: config/tc-alpha.c:1165
+#: config/tc-alpha.c:1298
 #, c-format
 msgid "unhandled relocation type %s"
 msgstr ""
 
-#: config/tc-alpha.c:1178
+#: config/tc-alpha.c:1311
 msgid "non-absolute expression in constant field"
 msgstr ""
 
-#: config/tc-alpha.c:1192
+#: config/tc-alpha.c:1325
 #, c-format
 msgid "type %d reloc done?\n"
 msgstr ""
 
-#: config/tc-alpha.c:1243 config/tc-alpha.c:1250 config/tc-mips.c:7329
+#: config/tc-alpha.c:1376 config/tc-alpha.c:1383 config/tc-mips.c:7362
 msgid "Used $at without \".set noat\""
 msgstr ""
 
-#: config/tc-alpha.c:1408
+#: config/tc-alpha.c:1561
 #, c-format
 msgid "cannot represent `%s' relocation in object file"
 msgstr ""
 
-#: config/tc-alpha.c:1415
+#: config/tc-alpha.c:1568
 #, c-format
 msgid "internal error? cannot generate `%s' relocation"
 msgstr ""
 
-#: config/tc-alpha.c:1469
+#: config/tc-alpha.c:1622
 #, c-format
 msgid "frame reg expected, using $%d."
 msgstr ""
 
-#: config/tc-alpha.c:1794
+#: config/tc-alpha.c:1747
+#, c-format
+msgid "No !literal!%d was found"
+msgstr ""
+
+#. only support one relocation op per insn
+#: config/tc-alpha.c:1935
+msgid "More than one relocation op per insn"
+msgstr ""
+
+#: config/tc-alpha.c:1952
+msgid "No relocation operand"
+msgstr ""
+
+#: config/tc-alpha.c:1958
+#, c-format
+msgid "No !sequence-number after !%s"
+msgstr ""
+
+#: config/tc-alpha.c:1971
+#, c-format
+msgid "Unknown relocation operand: !%s"
+msgstr ""
+
+#: config/tc-alpha.c:1984
+#, c-format
+msgid "Bad sequence number: !%s!%s"
+msgstr ""
+
+#: config/tc-alpha.c:2335
 #, c-format
 msgid "operand out of range (%s not between %d and %d)"
 msgstr ""
 
-#: config/tc-alpha.c:1891 config/tc-arc.c:547 config/tc-d10v.c:570
-#: config/tc-d30v.c:623 config/tc-mn10200.c:991 config/tc-mn10300.c:1058
-#: config/tc-ppc.c:1816 config/tc-ppc.c:1923 config/tc-ppc.c:1935
+#: config/tc-alpha.c:2434 config/tc-arc.c:548 config/tc-d10v.c:596
+#: config/tc-d30v.c:636 config/tc-mn10200.c:990 config/tc-mn10300.c:1365
+#: config/tc-ppc.c:1818 config/tc-ppc.c:1926 config/tc-ppc.c:1938
 #: config/tc-v850.c:1819 config/tc-v850.c:1842 config/tc-v850.c:2055
 msgid "too many fixups"
 msgstr ""
 
-#: config/tc-alpha.c:2016 config/tc-alpha.c:2074
+#: config/tc-alpha.c:2645 config/tc-alpha.c:2714
 #, c-format
 msgid "inappropriate arguments for opcode `%s'"
 msgstr ""
 
-#: config/tc-alpha.c:2018 config/tc-alpha.c:2076
+#: config/tc-alpha.c:2647 config/tc-alpha.c:2716
 #, c-format
 msgid "opcode `%s' not supported for target %s"
 msgstr ""
 
-#: config/tc-alpha.c:2022 config/tc-alpha.c:2079
+#: config/tc-alpha.c:2651 config/tc-alpha.c:2719
 #, c-format
 msgid "unknown opcode `%s'"
 msgstr ""
 
-#: config/tc-alpha.c:2131
+#: config/tc-alpha.c:2691 config/tc-alpha.c:2758 config/tc-alpha.c:3269
+#: config/tc-alpha.c:3329 config/tc-alpha.c:3381 config/tc-alpha.c:3456
+#: config/tc-alpha.c:3541 config/tc-alpha.c:3667 config/tc-alpha.c:3844
+#: config/tc-alpha.c:3901 config/tc-alpha.c:4011 config/tc-alpha.c:4118
+#: config/tc-alpha.c:4195
+#, c-format
+msgid "Cannot use !%s!%d with %s"
+msgstr ""
+
+#: config/tc-alpha.c:2779
 msgid "can not resolve expression"
 msgstr ""
 
-#: config/tc-alpha.c:2269 config/tc-alpha.c:2446
+#: config/tc-alpha.c:2921 config/tc-alpha.c:3113
 msgid "overflow in literal (.lita) table"
 msgstr ""
 
-#: config/tc-alpha.c:2276 config/tc-alpha.c:2298 config/tc-alpha.c:2459
-#: config/tc-alpha.c:2681 config/tc-alpha.c:2728 config/tc-alpha.c:2776
-#: config/tc-alpha.c:2865 config/tc-alpha.c:3066 config/tc-alpha.c:3167
+#: config/tc-alpha.c:2928 config/tc-alpha.c:2951 config/tc-alpha.c:3126
+#: config/tc-alpha.c:3470 config/tc-alpha.c:3548 config/tc-alpha.c:3596
+#: config/tc-alpha.c:3696 config/tc-alpha.c:3921 config/tc-alpha.c:4033
 msgid "macro requires $at register while noat in effect"
 msgstr ""
 
-#: config/tc-alpha.c:2278 config/tc-alpha.c:2300 config/tc-alpha.c:2461
+#: config/tc-alpha.c:2930 config/tc-alpha.c:2953 config/tc-alpha.c:3128
 msgid "macro requires $at while $at in use"
 msgstr ""
 
-#: config/tc-alpha.c:2408 expr.c:86 read.c:3125
+#: config/tc-alpha.c:3075 expr.c:86 read.c:3151
 msgid "bignum invalid; zero assumed"
 msgstr ""
 
-#: config/tc-alpha.c:2410 expr.c:88 read.c:3127 read.c:3457 read.c:4353
+#: config/tc-alpha.c:3077 expr.c:88 read.c:3153 read.c:3489 read.c:4387
 msgid "floating point number invalid; zero assumed"
 msgstr ""
 
-#: config/tc-alpha.c:2415
+#: config/tc-alpha.c:3082
 msgid "can't handle expression"
 msgstr ""
 
-#: config/tc-alpha.c:2452
+#: config/tc-alpha.c:3119
 msgid "overflow in literal (.lit8) table"
 msgstr ""
 
-#: config/tc-alpha.c:3401 config/tc-ppc.c:1344 config/tc-ppc.c:3548
-#: read.c:1377
+#: config/tc-alpha.c:3291
+#, c-format
+msgid "bad instruction format for lda !%s!%d"
+msgstr ""
+
+#: config/tc-alpha.c:4291 config/tc-ppc.c:1345 config/tc-ppc.c:3555
+#: read.c:1368
 #, c-format
 msgid ".COMMon length (%ld.) <0! Ignored."
 msgstr ""
 
-#: config/tc-alpha.c:3439 config/tc-alpha.c:3448 config/tc-ppc.c:3585
-#: read.c:1398
+#: config/tc-alpha.c:4329 config/tc-alpha.c:4338 config/tc-ppc.c:3592
+#: read.c:1389
 #, c-format
 msgid "Length of .comm \"%s\" is already %ld. Not changed to %ld."
 msgstr ""
 
-#: config/tc-alpha.c:3550 ecoff.c:3108
+#: config/tc-alpha.c:4440 ecoff.c:3109
 msgid ".ent directive has no name"
 msgstr ""
 
-#: config/tc-alpha.c:3558
+#: config/tc-alpha.c:4448
 msgid "nested .ent directives"
 msgstr ""
 
-#: config/tc-alpha.c:3594 ecoff.c:3056
+#: config/tc-alpha.c:4484 ecoff.c:3057
 msgid ".end directive has no name"
 msgstr ""
 
-#: config/tc-alpha.c:3603
+#: config/tc-alpha.c:4493
 msgid ".end directive names different symbol than .ent"
 msgstr ""
 
-#: config/tc-alpha.c:3678
+#: config/tc-alpha.c:4568
 #, c-format
 msgid "Invalid argument %d to .prologue."
 msgstr ""
 
-#: config/tc-alpha.c:3706
+#: config/tc-alpha.c:4596
 msgid "ECOFF debugging is disabled."
 msgstr ""
 
-#: config/tc-alpha.c:3727
+#: config/tc-alpha.c:4617
 msgid "Unknown section directive"
 msgstr ""
 
-#: config/tc-alpha.c:3764
+#: config/tc-alpha.c:4654
 msgid ".ent directive has no symbol"
 msgstr ""
 
-#: config/tc-alpha.c:3792
+#: config/tc-alpha.c:4682
 msgid "Bad .frame directive 1./2. param"
 msgstr ""
 
-#: config/tc-alpha.c:3804
+#: config/tc-alpha.c:4694
 msgid "Bad .frame directive 3./4. param"
 msgstr ""
 
-#: config/tc-alpha.c:3829
+#: config/tc-alpha.c:4719
 msgid ".pdesc directive not in link (.link) section"
 msgstr ""
 
-#: config/tc-alpha.c:3837
+#: config/tc-alpha.c:4727
 msgid ".pdesc has no matching .ent"
 msgstr ""
 
-#: config/tc-alpha.c:3847
+#: config/tc-alpha.c:4738
 msgid ".pdesc directive has no entry symbol"
 msgstr ""
 
-#: config/tc-alpha.c:3859
+#: config/tc-alpha.c:4751
 msgid "No comma after .pdesc <entryname>"
 msgstr ""
 
-#: config/tc-alpha.c:3882
+#: config/tc-alpha.c:4774
 msgid "unknown procedure kind"
 msgstr ""
 
-#: config/tc-alpha.c:3977
+#: config/tc-alpha.c:4869
 msgid ".name directive not in link (.link) section"
 msgstr ""
 
-#: config/tc-alpha.c:3985
+#: config/tc-alpha.c:4877
 msgid ".name directive has no symbol"
 msgstr ""
 
-#: config/tc-alpha.c:4020
+#: config/tc-alpha.c:4912
 msgid "No symbol after .linkage"
 msgstr ""
 
-#: config/tc-alpha.c:4049
+#: config/tc-alpha.c:4941
 msgid "No symbol after .code_address"
 msgstr ""
 
-#: config/tc-alpha.c:4084 ecoff.c:3273
+#: config/tc-alpha.c:4976 ecoff.c:3274
 msgid "Bad .mask directive"
 msgstr ""
 
-#: config/tc-alpha.c:4106 ecoff.c:3204
+#: config/tc-alpha.c:4998 ecoff.c:3205
 msgid "Bad .fmask directive"
 msgstr ""
 
-#: config/tc-alpha.c:4277 read.c:2144 read.c:2696 stabs.c:460
+#: config/tc-alpha.c:5169 config/tc-arm.c:1328 read.c:2142 read.c:2722
+#: stabs.c:460
 #, c-format
 msgid "Expected comma after name \"%s\""
 msgstr ""
 
-#. symbolP->sy_other = (signed char) temp;
-#: config/tc-alpha.c:4288
+#. *symbol_get_obj (symbolP) = (signed char) temp;
+#: config/tc-alpha.c:5180
 #, c-format
 msgid "unhandled: .proc %s,%d"
 msgstr ""
 
-#: config/tc-alpha.c:4323
+#: config/tc-alpha.c:5215
 #, c-format
 msgid "Tried to .set unrecognized mode `%s'"
 msgstr ""
 
 #. not fatal, but it might not work in the end
-#: config/tc-alpha.c:4340
+#: config/tc-alpha.c:5232
 msgid "File overrides no-base-register option."
 msgstr ""
 
-#: config/tc-alpha.c:4357
+#: config/tc-alpha.c:5249
 #, c-format
 msgid "Bad base register, using $%d."
 msgstr ""
 
-#: config/tc-alpha.c:4379
+#: config/tc-alpha.c:5271
 #, c-format
 msgid "Alignment too large: %d. assumed"
 msgstr ""
 
-#: config/tc-alpha.c:4383 config/tc-d30v.c:2163
+#: config/tc-alpha.c:5275 config/tc-d30v.c:2182
 msgid "Alignment negative: 0 assumed"
 msgstr ""
 
-#: config/tc-alpha.c:4696
+#: config/tc-alpha.c:5588
 #, c-format
 msgid "Chose GP value of %lx\n"
 msgstr ""
 
-#: config/tc-arc.c:136
+#: config/tc-arc.c:137
 msgid ""
 "ARC options:\n"
 "-EB\t\t\tgenerate big endian output\n"
 "-EL\t\t\tgenerate little endian output\n"
 msgstr ""
 
-#: config/tc-arc.c:154 config/tc-arc.c:177 config/tc-arc.c:921
-#: config/tc-hppa.c:1298 config/tc-hppa.c:5054 config/tc-hppa.c:5060
-#: config/tc-hppa.c:5066 config/tc-mn10300.c:721 config/tc-mn10300.c:1646
+#: config/tc-arc.c:155 config/tc-arc.c:178 config/tc-arc.c:922
+#: config/tc-hppa.c:1347 config/tc-hppa.c:6734 config/tc-hppa.c:6740
+#: config/tc-hppa.c:6746 config/tc-hppa.c:6752 config/tc-mn10300.c:883
+#: config/tc-mn10300.c:1993
 msgid "could not set architecture and machine"
 msgstr ""
 
-#: config/tc-arc.c:174
+#: config/tc-arc.c:175
 msgid "virtual memory exhausted"
 msgstr ""
 
-#: config/tc-arc.c:253 config/tc-mn10200.c:1354 config/tc-mn10300.c:1565
-#: config/tc-ppc.c:1101 config/tc-v850.c:1618
+#: config/tc-arc.c:254 config/tc-mn10200.c:1354 config/tc-mn10300.c:1904
+#: config/tc-ppc.c:1102 config/tc-v850.c:1618
 #, c-format
 msgid "operand out of range (%s not between %ld and %ld)"
 msgstr ""
 
-#: config/tc-arc.c:388
+#: config/tc-arc.c:389
 #, c-format
 msgid "unknown syntax format character `%c'"
 msgstr ""
 
-#: config/tc-arc.c:487
+#: config/tc-arc.c:488
 msgid "too many suffixes"
 msgstr ""
 
-#: config/tc-arc.c:532 config/tc-d10v.c:479 config/tc-d30v.c:538
-#: config/tc-mn10200.c:933 config/tc-mn10300.c:989 config/tc-ppc.c:1848
+#: config/tc-arc.c:533 config/tc-d10v.c:505 config/tc-d30v.c:551
+#: config/tc-mn10200.c:932 config/tc-mn10300.c:1291 config/tc-ppc.c:1850
 #: config/tc-tic80.c:287 config/tc-v850.c:2030
 msgid "illegal operand"
 msgstr ""
 
-#: config/tc-arc.c:619 config/tc-mn10200.c:1032 config/tc-mn10300.c:1128
-#: config/tc-ppc.c:1972 config/tc-v850.c:2108
+#: config/tc-arc.c:620 config/tc-mn10200.c:1031 config/tc-mn10300.c:1435
+#: config/tc-ppc.c:1975 config/tc-v850.c:2108
 #, c-format
 msgid "junk at end of line: `%s'"
 msgstr ""
 
-#: config/tc-arc.c:659
+#: config/tc-arc.c:660
 msgid "8 byte instruction in delay slot"
 msgstr ""
 
-#: config/tc-arc.c:661
+#: config/tc-arc.c:662
 msgid "8 byte jump instruction with delay slot"
 msgstr ""
 
-#: config/tc-arc.c:669
+#: config/tc-arc.c:670
 msgid "conditional branch follows set of flags"
 msgstr ""
 
-#: config/tc-arc.c:748 config/tc-arm.c:6039
+#: config/tc-arc.c:749 config/tc-arm.c:6329
 #, c-format
 msgid "bad instruction `%s'"
 msgstr ""
 
-#: config/tc-arc.c:771
+#: config/tc-arc.c:772
 msgid "expected comma after symbol-name"
 msgstr ""
 
-#: config/tc-arc.c:788
+#: config/tc-arc.c:789
 msgid "ignoring attempt to re-define symbol"
 msgstr ""
 
-#: config/tc-arc.c:803
+#: config/tc-arc.c:804
 msgid "expected comma after common length"
 msgstr ""
 
-#: config/tc-arc.c:896
+#: config/tc-arc.c:897
 msgid ".cpu command must appear before any instructions"
 msgstr ""
 
-#: config/tc-arc.c:915
+#: config/tc-arc.c:916
 msgid ".cpu conflicts with previous value"
 msgstr ""
 
-#: config/tc-arc.c:926
+#: config/tc-arc.c:927
 msgid "bad .cpu op"
 msgstr ""
 
-#: config/tc-arc.c:950 config/tc-ppc.c:2621
+#: config/tc-arc.c:951 config/tc-ppc.c:2623
 msgid "missing rename string"
 msgstr ""
 
-#: config/tc-arc.c:962
+#: config/tc-arc.c:963
 msgid "invalid symbol to rename to"
 msgstr ""
 
-#: config/tc-arc.c:1009 config/tc-d10v.c:274 config/tc-d30v.c:353
-#: config/tc-mips.c:8736 config/tc-mn10200.c:356 config/tc-ppc.c:4369
-#: config/tc-sh.c:1187 config/tc-v850.c:1276
+#: config/tc-arc.c:1010 config/tc-d10v.c:284 config/tc-d30v.c:366
+#: config/tc-mips.c:8769 config/tc-mn10200.c:355 config/tc-pj.c:365
+#: config/tc-ppc.c:4384 config/tc-sh.c:1736 config/tc-v850.c:1276
 msgid "bad call to md_atof"
 msgstr ""
 
-#: config/tc-arc.c:1096
+#: config/tc-arc.c:1097
 #, c-format
 msgid "missing ')' in %-op"
 msgstr ""
 
-#: config/tc-arc.c:1130
+#: config/tc-arc.c:1131
 msgid "expression too complex for %%st"
 msgstr ""
 
-#: config/tc-arc.c:1324 config/tc-arm.c:2937 config/tc-d10v.c:1448
-#: config/tc-d30v.c:1810 config/tc-mips.c:3196 config/tc-mips.c:4128
-#: config/tc-mips.c:4913 config/tc-mips.c:5459 config/tc-ppc.c:4704
-#: config/tc-v850.c:2339
+#: config/tc-arc.c:1326 config/tc-arm.c:3146 config/tc-d10v.c:1475
+#: config/tc-d30v.c:1828 config/tc-mips.c:3252 config/tc-mips.c:4184
+#: config/tc-mips.c:4969 config/tc-mips.c:5515 config/tc-ppc.c:4720
+#: config/tc-v850.c:2338
 msgid "expression too complex"
 msgstr ""
 
-#: config/tc-arc.c:1390 config/tc-ppc.c:4807 config/tc-v850.c:2383
+#: config/tc-arc.c:1392 config/tc-ppc.c:4823 config/tc-v850.c:2382
 msgid "unresolved expression that must be resolved"
 msgstr ""
 
-#: config/tc-arc.c:1454 config/tc-sparc.c:2881
+#: config/tc-arc.c:1457 config/tc-sparc.c:3193
 #, c-format
 msgid "internal error: can't export reloc type %d (`%s')"
 msgstr ""
 
-#: config/tc-arm.c:983
+#: config/tc-arm.c:1025
 msgid "Literal Pool Overflow"
 msgstr ""
 
-#: config/tc-arm.c:1103
+#: config/tc-arm.c:1168
 msgid "Invalid syntax for .req directive."
 msgstr ""
 
-#: config/tc-arm.c:1139
-msgid "Nothing to put in the pool\n"
-msgstr ""
-
-#: config/tc-arm.c:1151
-msgid "Inserting implicit pool at change of section"
-msgstr ""
-
-#: config/tc-arm.c:1183 config/tc-mips.c:9851 read.c:2038
+#: config/tc-arm.c:1240 config/tc-mips.c:9924 read.c:2031
 #, c-format
 msgid "Alignment too large: %d. assumed."
 msgstr ""
 
-#: config/tc-arm.c:1186 read.c:2043
+#: config/tc-arm.c:1243 read.c:2036
 msgid "Alignment negative. 0 assumed."
 msgstr ""
 
-#: config/tc-arm.c:1251
+#: config/tc-arm.c:1377 config/tc-m32r.c:411 read.c:2781 read.c:4858
+#, c-format
+msgid "symbol `%s' already defined"
+msgstr ""
+
+#: config/tc-arm.c:1447
 msgid "selected processor does not support THUMB opcodes"
 msgstr ""
 
-#: config/tc-arm.c:1263
+#: config/tc-arm.c:1459
 msgid "selected processor does not support ARM opcodes"
 msgstr ""
 
-#: config/tc-arm.c:1272
+#: config/tc-arm.c:1468
 #, c-format
 msgid "invalid instruction size selected (%d)"
 msgstr ""
 
-#: config/tc-arm.c:1307
+#: config/tc-arm.c:1503
 #, c-format
 msgid "invalid operand to .code directive (%d) (expecting 16 or 32)"
 msgstr ""
 
-#: config/tc-arm.c:1319
+#: config/tc-arm.c:1514
 msgid "Garbage following instruction"
 msgstr ""
 
 #. In the few cases where we might be able to accept something else
-#. this error can be overridden
-#: config/tc-arm.c:1367
+#. this error can be overridden.
+#: config/tc-arm.c:1564
 #, c-format
 msgid "Register expected, not '%.100s'"
 msgstr ""
 
 #. In the few cases where we might be able to accept something else
-#. this error can be overridden
-#: config/tc-arm.c:1393
+#. this error can be overridden.
+#: config/tc-arm.c:1590
 msgid "<psr(f)> expected"
 msgstr ""
 
-#: config/tc-arm.c:1424
+#: config/tc-arm.c:1620
 msgid "Illegal co-processor number"
 msgstr ""
 
-#: config/tc-arm.c:1431
+#: config/tc-arm.c:1627
 msgid "Bad or missing co-processor number"
 msgstr ""
 
-#: config/tc-arm.c:1456
+#: config/tc-arm.c:1651
 msgid "bad or missing expression"
 msgstr ""
 
-#: config/tc-arm.c:1462
+#: config/tc-arm.c:1657
 msgid "immediate co-processor expression too large"
 msgstr ""
 
 #. In the few cases where we might be able to accept something else
-#. this error can be overridden
-#: config/tc-arm.c:1487
+#. this error can be overridden.
+#: config/tc-arm.c:1682
 msgid "Co-processor register expected"
 msgstr ""
 
 #. In the few cases where we might be able to accept something else
-#. this error can be overridden
-#: config/tc-arm.c:1511
+#. this error can be overridden.
+#: config/tc-arm.c:1706
 msgid "Floating point register expected"
 msgstr ""
 
-#: config/tc-arm.c:1529
+#: config/tc-arm.c:1723
 msgid "immediate expression expected"
 msgstr ""
 
-#: config/tc-arm.c:1544
+#: config/tc-arm.c:1738
 msgid "co-processor address must be word aligned"
 msgstr ""
 
-#: config/tc-arm.c:1550
+#: config/tc-arm.c:1744
 msgid "offset too large"
 msgstr ""
 
-#: config/tc-arm.c:1600
+#: config/tc-arm.c:1792
 msgid "pc may not be used in post-increment"
 msgstr ""
 
-#: config/tc-arm.c:1616 config/tc-arm.c:2727
+#: config/tc-arm.c:1808 config/tc-arm.c:2938
 msgid "pre-indexed expression expected"
 msgstr ""
 
-#: config/tc-arm.c:1630 config/tc-arm.c:2740 config/tc-arm.c:3089
+#: config/tc-arm.c:1821 config/tc-arm.c:2950 config/tc-arm.c:3292
 msgid "missing ]"
 msgstr ""
 
-#: config/tc-arm.c:1641
+#: config/tc-arm.c:1831
 msgid "pc may not be used with write-back"
 msgstr ""
 
-#: config/tc-arm.c:1696
+#: config/tc-arm.c:1885
 msgid "<psr> expected"
 msgstr ""
 
-#: config/tc-arm.c:1758 config/tc-arm.c:2378
+#: config/tc-arm.c:1946 config/tc-arm.c:2560
 msgid "Register or shift expression expected"
 msgstr ""
 
-#: config/tc-arm.c:1772 config/tc-arm.c:2090 config/tc-arm.c:2345
-#: config/tc-arm.c:2365
+#: config/tc-arm.c:1960 config/tc-arm.c:2275 config/tc-arm.c:2527
+#: config/tc-arm.c:2547
 msgid "Invalid constant"
 msgstr ""
 
-#: config/tc-arm.c:1783
+#: config/tc-arm.c:1971
 msgid "Error: unrecognised syntax for second argument to msr instruction"
 msgstr ""
 
-#: config/tc-arm.c:1833
+#: config/tc-arm.c:2020
 msgid "rdhi, rdlo and rm must all be different"
 msgstr ""
 
-#: config/tc-arm.c:1890
+#: config/tc-arm.c:2076
 msgid "rd and rm should be different in mul"
 msgstr ""
 
-#: config/tc-arm.c:1947
+#: config/tc-arm.c:2132
 msgid "rd and rm should be different in mla"
 msgstr ""
 
-#: config/tc-arm.c:2074
+#: config/tc-arm.c:2259
 msgid "bad_segment"
 msgstr ""
 
-#: config/tc-arm.c:2121 config/tc-arm.c:2199
+#: config/tc-arm.c:2305 config/tc-arm.c:2382
 msgid "Shift expression expected"
 msgstr ""
 
-#: config/tc-arm.c:2163
+#: config/tc-arm.c:2346
 msgid "Invalid immediate shift"
 msgstr ""
 
-#: config/tc-arm.c:2192
+#: config/tc-arm.c:2375
 msgid "shift requires register or #expression"
 msgstr ""
 
-#: config/tc-arm.c:2193
+#: config/tc-arm.c:2376
 msgid "shift requires #expression"
 msgstr ""
 
-#: config/tc-arm.c:2336 config/tc-arm.c:2770
+#: config/tc-arm.c:2518 config/tc-arm.c:2979
 msgid "Constant expression expected"
 msgstr ""
 
-#: config/tc-arm.c:2432
+#: config/tc-arm.c:2613
 msgid "Invalid floating point immediate expression"
 msgstr ""
 
-#: config/tc-arm.c:2435
+#: config/tc-arm.c:2616
 msgid "Floating point register or immediate expression expected"
 msgstr ""
 
-#: config/tc-arm.c:2574
+#: config/tc-arm.c:2785
 msgid "address offset too large"
 msgstr ""
 
-#: config/tc-arm.c:2645
+#: config/tc-arm.c:2857
 msgid "Processor does not support halfwords or signed bytes"
 msgstr ""
 
-#: config/tc-arm.c:2667
+#: config/tc-arm.c:2878
 msgid "Address expected"
 msgstr ""
 
-#: config/tc-arm.c:2698 config/tc-arm.c:2712 config/tc-arm.c:2750
-msgid "destination register same as write-back base\n"
+#: config/tc-arm.c:2908 config/tc-arm.c:2922 config/tc-arm.c:2959
+#, c-format
+msgid "%s register same as write-back base"
+msgstr ""
+
+#: config/tc-arm.c:2909 config/tc-arm.c:2923 config/tc-arm.c:2960
+msgid "destination"
+msgstr ""
+
+#: config/tc-arm.c:2909 config/tc-arm.c:2923 config/tc-arm.c:2960
+msgid "source"
 msgstr ""
 
-#: config/tc-arm.c:2790
+#: config/tc-arm.c:2999
 msgid "literal pool insertion failed"
 msgstr ""
 
-#: config/tc-arm.c:2826
+#: config/tc-arm.c:3037
 msgid "Pre-increment instruction with translate"
 msgstr ""
 
-#: config/tc-arm.c:2868
+#: config/tc-arm.c:3078
 msgid "Bad range in register list"
 msgstr ""
 
-#: config/tc-arm.c:2876 config/tc-arm.c:2885 config/tc-arm.c:2927
+#: config/tc-arm.c:3086 config/tc-arm.c:3095 config/tc-arm.c:3136
 #, c-format
 msgid "Warning: Duplicated register (r%d) in register list"
 msgstr ""
 
-#: config/tc-arm.c:2888
+#: config/tc-arm.c:3098
 msgid "Warning: Register range not in ascending order"
 msgstr ""
 
-#: config/tc-arm.c:2900
+#: config/tc-arm.c:3109
 msgid "Missing `}'"
 msgstr ""
 
-#: config/tc-arm.c:2916
+#: config/tc-arm.c:3125
 msgid "invalid register mask"
 msgstr ""
 
-#: config/tc-arm.c:2977
+#: config/tc-arm.c:3184
 msgid "r15 not allowed as base register"
 msgstr ""
 
-#: config/tc-arm.c:3047 config/tc-arm.c:3061
+#: config/tc-arm.c:3252 config/tc-arm.c:3266
 msgid "r15 not allowed in swap"
 msgstr ""
 
-#: config/tc-arm.c:3158
-msgid "Use of r15 in bx has undefined behaviour"
-msgstr ""
-
-#: config/tc-arm.c:3417 config/tc-v850.c:1921 config/tc-v850.c:1942
+#: config/tc-arm.c:3619 config/tc-v850.c:1921 config/tc-v850.c:1942
 msgid "constant expression expected"
 msgstr ""
 
-#: config/tc-arm.c:3423
+#: config/tc-arm.c:3625
 msgid "Constant value required for number of registers"
 msgstr ""
 
-#: config/tc-arm.c:3431
+#: config/tc-arm.c:3633
 msgid "number of registers must be in the range [1:4]"
 msgstr ""
 
-#: config/tc-arm.c:3493
+#: config/tc-arm.c:3693
 msgid "R15 not allowed as base register with write-back"
 msgstr ""
 
-#: config/tc-arm.c:3745
+#: config/tc-arm.c:3940
 msgid "lo register required"
 msgstr ""
 
-#: config/tc-arm.c:3753
+#: config/tc-arm.c:3948
 msgid "hi register required"
 msgstr ""
 
-#: config/tc-arm.c:3823
+#: config/tc-arm.c:4017
 msgid "dest and source1 must be the same register"
 msgstr ""
 
-#: config/tc-arm.c:3830
+#: config/tc-arm.c:4024
 msgid "subtract valid only on lo regs"
 msgstr ""
 
-#: config/tc-arm.c:3854
+#: config/tc-arm.c:4048
 msgid "invalid Hi register with immediate"
 msgstr ""
 
-#: config/tc-arm.c:3881 config/tc-arm.c:3914 config/tc-arm.c:3924
+#: config/tc-arm.c:4075 config/tc-arm.c:4108 config/tc-arm.c:4118
 msgid "immediate value out of range"
 msgstr ""
 
-#: config/tc-arm.c:3892
+#: config/tc-arm.c:4086
 msgid "invalid immediate value for stack adjust"
 msgstr ""
 
-#: config/tc-arm.c:3903
+#: config/tc-arm.c:4097
 msgid "invalid immediate for address calculation"
 msgstr ""
 
-#: config/tc-arm.c:3990
+#: config/tc-arm.c:4184
 msgid "source1 and dest must be same register"
 msgstr ""
 
-#: config/tc-arm.c:4025
+#: config/tc-arm.c:4219
 msgid "Invalid immediate for shift"
 msgstr ""
 
-#: config/tc-arm.c:4104
+#: config/tc-arm.c:4298
 msgid "only lo regs allowed with immediate"
 msgstr ""
 
-#: config/tc-arm.c:4123
+#: config/tc-arm.c:4317
 msgid "invalid immediate"
 msgstr ""
 
-#: config/tc-arm.c:4178
+#: config/tc-arm.c:4371
 msgid "expected ']'"
 msgstr ""
 
-#: config/tc-arm.c:4245
+#: config/tc-arm.c:4437
 msgid "byte or halfword not valid for base register"
 msgstr ""
 
-#: config/tc-arm.c:4250
+#: config/tc-arm.c:4442
 msgid "R15 based store not allowed"
 msgstr ""
 
-#: config/tc-arm.c:4255
+#: config/tc-arm.c:4447
 msgid "Invalid base register for register offset"
 msgstr ""
 
-#: config/tc-arm.c:4273
+#: config/tc-arm.c:4465
 msgid "invalid offset"
 msgstr ""
 
-#: config/tc-arm.c:4284
+#: config/tc-arm.c:4476
 msgid "invalid base register in load/store"
 msgstr ""
 
-#: config/tc-arm.c:4308 config/tc-arm.c:5469 config/tc-arm.c:5478
-#: config/tc-arm.c:5485 config/tc-arm.c:5492 config/tc-arm.c:5499
+#: config/tc-arm.c:4500
 msgid "Invalid offset"
 msgstr ""
 
-#: config/tc-arm.c:4386
+#: config/tc-arm.c:4574
 msgid "dest and source1 one must be the same register"
 msgstr ""
 
-#: config/tc-arm.c:4394
+#: config/tc-arm.c:4582
 msgid "Rs and Rd must be different in MUL"
 msgstr ""
 
-#: config/tc-arm.c:4539
+#: config/tc-arm.c:4726
 msgid ""
 "Inserted missing '!': load/store multiple always writes back base register"
 msgstr ""
 
-#: config/tc-arm.c:4555 config/tc-arm.c:4657
+#: config/tc-arm.c:4742 config/tc-arm.c:4842
 msgid "Expression too complex"
 msgstr ""
 
-#: config/tc-arm.c:4561
+#: config/tc-arm.c:4748
 msgid "only lo-regs valid in load/store multiple"
 msgstr ""
 
-#: config/tc-arm.c:4608
+#: config/tc-arm.c:4794
 msgid "Syntax: ldrs[b] Rd, [Rb, Ro]"
 msgstr ""
 
-#: config/tc-arm.c:4673
+#: config/tc-arm.c:4858
 msgid "invalid register list to push/pop instruction"
 msgstr ""
 
-#: config/tc-arm.c:4811
+#: config/tc-arm.c:4994
 msgid "Virtual memory exhausted"
 msgstr ""
 
-#: config/tc-arm.c:5203
+#: config/tc-arm.c:5396
 #, c-format
-msgid "invalid constant (%x) after fixup\n"
+msgid "invalid constant (%lx) after fixup"
 msgstr ""
 
-#: config/tc-arm.c:5215 config/tc-arm.c:5236
+#: config/tc-arm.c:5430
 #, c-format
-msgid "bad immediate value for offset (%d)"
+msgid "Unable to compute ADRL instructions for PC offset of 0x%x"
+msgstr ""
+
+#: config/tc-arm.c:5458
+#, c-format
+msgid "bad immediate value for offset (%ld)"
+msgstr ""
+
+#: config/tc-arm.c:5479 config/tc-arm.c:5501
+msgid "invalid literal constant: pool needs to be closer"
 msgstr ""
 
-#: config/tc-arm.c:5234 config/tc-arm.c:5257
-msgid "invalid literal constant: pool needs to be closer\n"
+#: config/tc-arm.c:5481
+#, c-format
+msgid "bad immediate value for half-word offset (%ld)"
 msgstr ""
 
-#: config/tc-arm.c:5274
+#: config/tc-arm.c:5518
 msgid "shift expression is too large"
 msgstr ""
 
-#: config/tc-arm.c:5292 config/tc-arm.c:5301
+#: config/tc-arm.c:5536 config/tc-arm.c:5545
 msgid "Invalid swi expression"
 msgstr ""
 
-#: config/tc-arm.c:5311
+#: config/tc-arm.c:5555
 msgid "Invalid expression in load/store multiple"
 msgstr ""
 
-#: config/tc-arm.c:5339 config/tc-arm.c:5355 config/tc-mips.c:9678
+#: config/tc-arm.c:5584 config/tc-arm.c:5600 config/tc-mips.c:9751
 msgid "Branch out of range"
 msgstr ""
 
-#: config/tc-arm.c:5374
+#: config/tc-arm.c:5622
 msgid "Branch with link out of range"
 msgstr ""
 
-#: config/tc-arm.c:5441
+#: config/tc-arm.c:5689
 msgid "Illegal value for co-processor offset"
 msgstr ""
 
-#: config/tc-arm.c:5464
+#: config/tc-arm.c:5712
 #, c-format
 msgid "Invalid offset, target not word aligned (0x%08X)"
 msgstr ""
 
-#: config/tc-arm.c:5535
+#: config/tc-arm.c:5717 config/tc-arm.c:5726 config/tc-arm.c:5733
+#: config/tc-arm.c:5740 config/tc-arm.c:5747
+#, c-format
+msgid "Invalid offset, value too big (0x%08X)"
+msgstr ""
+
+#: config/tc-arm.c:5784
 msgid "Invalid immediate for stack address calculation"
 msgstr ""
 
-#: config/tc-arm.c:5544
+#: config/tc-arm.c:5793
 #, c-format
-msgid "Invalid immediate for address calculation (value = 0x%08X)"
+msgid "Invalid immediate for address calculation (value = 0x%08lX)"
 msgstr ""
 
-#: config/tc-arm.c:5553
+#: config/tc-arm.c:5803
 msgid "Invalid 8bit immediate"
 msgstr ""
 
-#: config/tc-arm.c:5561
+#: config/tc-arm.c:5811
 msgid "Invalid 3bit immediate"
 msgstr ""
 
-#: config/tc-arm.c:5577
+#: config/tc-arm.c:5827
 #, c-format
-msgid "Invalid immediate: %d is too large"
+msgid "Invalid immediate: %ld is too large"
 msgstr ""
 
-#: config/tc-arm.c:5591
+#: config/tc-arm.c:5842
 #, c-format
-msgid "Illegal Thumb shift value: %d"
+msgid "Illegal Thumb shift value: %ld"
 msgstr ""
 
-#: config/tc-arm.c:5605
+#: config/tc-arm.c:5856
 #, c-format
-msgid "Bad relocation fixup type (%d)\n"
+msgid "Bad relocation fixup type (%d)"
 msgstr ""
 
-#: config/tc-arm.c:5674
-msgid "Literal referenced across section boundry (Implicit dump?)"
+#: config/tc-arm.c:5926
+msgid "Literal referenced across section boundary (Implicit dump?)"
 msgstr ""
 
-#: config/tc-arm.c:5693
+#: config/tc-arm.c:5939
 #, c-format
 msgid "Internal_relocation (type %d) not fixed up (IMMEDIATE)"
 msgstr ""
 
-#: config/tc-arm.c:5699
+#: config/tc-arm.c:5945
+msgid "ADRL used for a symbol not defined in the same file"
+msgstr ""
+
+#: config/tc-arm.c:5951
 #, c-format
 msgid "Internal_relocation (type %d) not fixed up (OFFSET_IMM)"
 msgstr ""
 
-#: config/tc-arm.c:5722
+#: config/tc-arm.c:5971 config/tc-mcore.c:2110 config/tc-ns32k.c:2283
+msgid "<unknown>"
+msgstr ""
+
+#: config/tc-arm.c:5974
 #, c-format
 msgid "Can not represent %s relocation in this object file format (%d)"
 msgstr ""
 
-#: config/tc-arm.c:5740 config/tc-mips.c:11166 config/tc-sh.c:2282
+#: config/tc-arm.c:5995 config/tc-mips.c:11241 config/tc-sh.c:2859
 #, c-format
 msgid "Can not represent %s relocation in this object file format"
 msgstr ""
 
-#: config/tc-arm.c:5753
+#: config/tc-arm.c:6013
 msgid "md_estimate_size_before_relax\n"
 msgstr ""
 
-#: config/tc-arm.c:5823
+#: config/tc-arm.c:6088
 #, c-format
 msgid "No operator -- statement `%s'\n"
 msgstr ""
 
-#: config/tc-arm.c:5873 config/tc-arm.c:5925
+#: config/tc-arm.c:6106
+msgid "selected processor does not support this opcode"
+msgstr ""
+
+#: config/tc-arm.c:6150
 #, c-format
-msgid "Opcode `%s' must have suffix from <%s>\n"
+msgid "Opcode `%s' must have suffix from list: <%s>"
 msgstr ""
 
-#: config/tc-arm.c:5898
+#: config/tc-arm.c:6180
 msgid "Warning: Use of the 'nv' conditional is deprecated\n"
 msgstr ""
 
-#: config/tc-arm.c:6017
+#: config/tc-arm.c:6197
+#, c-format
+msgid "Opcode `%s' is unconditional\n"
+msgstr ""
+
+#: config/tc-arm.c:6222
+#, c-format
+msgid "Opcode `%s' must have suffix from <%s>\n"
+msgstr ""
+
+#: config/tc-arm.c:6308
 #, c-format
 msgid "register '%s' does not exist\n"
 msgstr ""
 
-#: config/tc-arm.c:6023
+#: config/tc-arm.c:6313
 #, c-format
 msgid "ignoring redefinition of register alias '%s'"
 msgstr ""
 
-#: config/tc-arm.c:6028
+#: config/tc-arm.c:6318
 #, c-format
 msgid ""
 "ignoring redefinition of register alias '%s' to non-existant register '%s'"
 msgstr ""
 
-#: config/tc-arm.c:6032
+#: config/tc-arm.c:6322
 msgid "ignoring incomplete .req pseuso op"
 msgstr ""
 
-#: config/tc-arm.c:6208
+#: config/tc-arm.c:6502
 #, c-format
 msgid "Unrecognised APCS switch -m%s"
 msgstr ""
 
-#: config/tc-arm.c:6334 config/tc-arm.c:6345 config/tc-arm.c:6356
-#: config/tc-arm.c:6361
+#: config/tc-arm.c:6634 config/tc-arm.c:6645 config/tc-arm.c:6656
+#: config/tc-arm.c:6667 config/tc-arm.c:6672
 #, c-format
 msgid "Invalid architecture variant -m%s"
 msgstr ""
 
-#: config/tc-arm.c:6368
+#: config/tc-arm.c:6679
 #, c-format
 msgid "Invalid processor variant -m%s"
 msgstr ""
 
-#: config/tc-arm.c:6390
+#: config/tc-arm.c:6703
 msgid ""
 " ARM Specific Assembler Options:\n"
 "  -m[arm][<processor name>] select processor variant\n"
-"  -m[arm]v[2|2a|3|3m|4|4t]  select architecture variant\n"
+"  -m[arm]v[2|2a|3|3m|4|4t|5[t][e]] select architecture variant\n"
 "  -mthumb                   only allow Thumb instructions\n"
 "  -mthumb-interwork         mark the assembled code as supporting "
 "interworking\n"
@@ -1815,145 +2037,145 @@ msgid ""
 "  -mno-fpu                  don't allow any floating-point instructions.\n"
 msgstr ""
 
-#: config/tc-arm.c:6401
+#: config/tc-arm.c:6714
 msgid "  -k                        generate PIC code.\n"
 msgstr ""
 
-#: config/tc-arm.c:6405
+#: config/tc-arm.c:6718
 msgid ""
 "  -mapcs-32, -mapcs-26      specify which ARM Procedure Calling Standard to "
 "use\n"
 msgstr ""
 
-#: config/tc-arm.c:6408
+#: config/tc-arm.c:6721
 msgid "  -mapcs-float              floating point args are passed in FP regs\n"
 msgstr ""
 
-#: config/tc-arm.c:6411
+#: config/tc-arm.c:6724
 msgid ""
 "  -mapcs-reentrant          the code is position independent/reentrant\n"
 msgstr ""
 
-#: config/tc-arm.c:6416
+#: config/tc-arm.c:6729
 msgid "  -moabi                    support the old ELF ABI\n"
 msgstr ""
 
-#: config/tc-arm.c:6421
+#: config/tc-arm.c:6734
 msgid ""
 "  -EB                       assemble code for a big endian cpu\n"
 "  -EL                       assemble code for a little endian cpu\n"
 msgstr ""
 
-#: config/tc-arm.c:6594
+#: config/tc-arm.c:6883
 #, c-format
 msgid "%s: unexpected function type: %d"
 msgstr ""
 
-#: config/tc-d10v.c:218
+#: config/tc-d10v.c:228
 msgid ""
 "D10V options:\n"
 "-O                      optimize.  Will do some operations in parallel.\n"
 msgstr ""
 
-#: config/tc-d10v.c:521 config/tc-d10v.c:603 config/tc-d30v.c:639
+#: config/tc-d10v.c:547 config/tc-d10v.c:629 config/tc-d30v.c:652
 #, c-format
 msgid "operand out of range: %d"
 msgstr ""
 
-#: config/tc-d10v.c:664
+#: config/tc-d10v.c:690
 msgid "Instruction must be executed in parallel with another instruction."
 msgstr ""
 
-#: config/tc-d10v.c:716
+#: config/tc-d10v.c:742
 msgid "Instruction must be executed in parallel"
 msgstr ""
 
-#: config/tc-d10v.c:719
+#: config/tc-d10v.c:745
 msgid "Long instructions may not be combined."
 msgstr ""
 
-#: config/tc-d10v.c:759
+#: config/tc-d10v.c:785
 msgid "One of these instructions may not be executed in parallel."
 msgstr ""
 
-#: config/tc-d10v.c:764 config/tc-d30v.c:843
+#: config/tc-d10v.c:790 config/tc-d30v.c:860
 msgid "Two IU instructions may not be executed in parallel"
 msgstr ""
 
-#: config/tc-d10v.c:766 config/tc-d10v.c:774 config/tc-d10v.c:789
-#: config/tc-d10v.c:802 config/tc-d30v.c:844 config/tc-d30v.c:853
+#: config/tc-d10v.c:792 config/tc-d10v.c:800 config/tc-d10v.c:815
+#: config/tc-d10v.c:828 config/tc-d30v.c:861 config/tc-d30v.c:870
 msgid "Swapping instruction order"
 msgstr ""
 
-#: config/tc-d10v.c:772 config/tc-d30v.c:850
+#: config/tc-d10v.c:798 config/tc-d30v.c:867
 msgid "Two MU instructions may not be executed in parallel"
 msgstr ""
 
-#: config/tc-d10v.c:793 config/tc-d30v.c:869
+#: config/tc-d10v.c:819 config/tc-d30v.c:886
 msgid "IU instruction may not be in the left container"
 msgstr ""
 
-#: config/tc-d10v.c:806 config/tc-d30v.c:882
+#: config/tc-d10v.c:832 config/tc-d30v.c:899
 msgid "MU instruction may not be in the right container"
 msgstr ""
 
-#: config/tc-d10v.c:810 config/tc-d30v.c:890
+#: config/tc-d10v.c:836 config/tc-d30v.c:907
 msgid "unknown execution type passed to write_2_short()"
 msgstr ""
 
-#: config/tc-d10v.c:1023 config/tc-d10v.c:1037 config/tc-h8300.c:1279
-#: config/tc-h8500.c:1122 config/tc-mcore.c:842 config/tc-sh.c:1040
-#: config/tc-z8k.c:1223
+#: config/tc-d10v.c:1049 config/tc-d10v.c:1063 config/tc-h8300.c:1279
+#: config/tc-h8500.c:1122 config/tc-mcore.c:989 config/tc-pj.c:274
+#: config/tc-sh.c:1349 config/tc-z8k.c:1223
 msgid "can't find opcode "
 msgstr ""
 
-#: config/tc-d10v.c:1050 config/tc-d10v.c:1068 config/tc-d30v.c:1368
+#: config/tc-d10v.c:1076 config/tc-d10v.c:1094 config/tc-d30v.c:1385
 msgid "Unable to mix instructions as specified"
 msgstr ""
 
-#: config/tc-d10v.c:1116 config/tc-d30v.c:1503
+#: config/tc-d10v.c:1142 config/tc-d30v.c:1520
 #, c-format
 msgid "unknown opcode: %s"
 msgstr ""
 
-#: config/tc-d10v.c:1197 config/tc-d10v.c:1343 config/tc-tic80.c:537
+#: config/tc-d10v.c:1223 config/tc-d10v.c:1369 config/tc-tic80.c:537
 msgid "bad opcode or operands"
 msgstr ""
 
-#: config/tc-d10v.c:1246 config/tc-m68k.c:4232
+#: config/tc-d10v.c:1272 config/tc-m68k.c:4232
 msgid "value out of range"
 msgstr ""
 
-#: config/tc-d10v.c:1318
+#: config/tc-d10v.c:1344
 msgid "illegal operand - register name found where none expected"
 msgstr ""
 
-#: config/tc-d10v.c:1354 config/tc-tic80.c:548
+#: config/tc-d10v.c:1380 config/tc-tic80.c:548
 msgid "Register number must be EVEN"
 msgstr ""
 
-#: config/tc-d10v.c:1385 config/tc-d30v.c:1754 config/tc-mn10200.c:1234
-#: config/tc-mn10300.c:1425 config/tc-ppc.c:5004 config/tc-v850.c:2254
+#: config/tc-d10v.c:1412 config/tc-d30v.c:1772 config/tc-mn10200.c:1233
+#: config/tc-mn10300.c:1761 config/tc-ppc.c:5020 config/tc-v850.c:2255
 #, c-format
 msgid "reloc %d not supported by object file format"
 msgstr ""
 
-#: config/tc-d10v.c:1498
+#: config/tc-d10v.c:1525
 #, c-format
 msgid "line %d: rep or repi must include at least 4 instructions"
 msgstr ""
 
-#: config/tc-d10v.c:1517 config/tc-d30v.c:1935
+#: config/tc-d10v.c:1544 config/tc-d30v.c:1953
 #, c-format
 msgid "line %d: unknown relocation type: 0x%x"
 msgstr ""
 
-#: config/tc-d30v.c:184
+#: config/tc-d30v.c:191
 #, c-format
 msgid "Register name %s conflicts with symbol of the same name"
 msgstr ""
 
-#: config/tc-d30v.c:276
+#: config/tc-d30v.c:289
 msgid ""
 "\n"
 "D30V options:\n"
@@ -1966,116 +2188,133 @@ msgid ""
 "-C                      Opposite of -C.  -c is the default.\n"
 msgstr ""
 
-#: config/tc-d30v.c:450
+#: config/tc-d30v.c:463
 msgid "unexpected 12-bit reloc type"
 msgstr ""
 
-#: config/tc-d30v.c:457
+#: config/tc-d30v.c:470
 msgid "unexpected 18-bit reloc type"
 msgstr ""
 
-#: config/tc-d30v.c:701
+#: config/tc-d30v.c:714
 #, c-format
 msgid "%s NOP inserted"
 msgstr ""
 
-#: config/tc-d30v.c:702
+#: config/tc-d30v.c:715
 msgid "sequential"
 msgstr ""
 
-#: config/tc-d30v.c:702
+#: config/tc-d30v.c:715
 msgid "parallel"
 msgstr ""
 
-#: config/tc-d30v.c:839
+#: config/tc-d30v.c:856
 msgid "Instructions may not be executed in parallel"
 msgstr ""
 
-#: config/tc-d30v.c:852 config/tc-d30v.c:859 config/tc-d30v.c:875
-#: config/tc-d30v.c:884
+#: config/tc-d30v.c:869 config/tc-d30v.c:876 config/tc-d30v.c:892
+#: config/tc-d30v.c:901
 #, c-format
 msgid "Executing %s in IU may not work"
 msgstr ""
 
-#: config/tc-d30v.c:871
+#: config/tc-d30v.c:888
 #, c-format
 msgid "special left instruction `%s' kills instruction `%s' in right container"
 msgstr ""
 
-#: config/tc-d30v.c:1250 config/tc-d30v.c:1267
+#: config/tc-d30v.c:1267 config/tc-d30v.c:1284
 msgid "Cannot assemble instruction"
 msgstr ""
 
-#: config/tc-d30v.c:1252
+#: config/tc-d30v.c:1269
 msgid "First opcode is long.  Unable to mix instructions as specified."
 msgstr ""
 
-#: config/tc-d30v.c:1320
+#: config/tc-d30v.c:1337
 msgid "word of NOPs added between word multiply and load"
 msgstr ""
 
-#: config/tc-d30v.c:1322
+#: config/tc-d30v.c:1339
 msgid "word of NOPs added between word multiply and 16-bit multiply"
 msgstr ""
 
-#: config/tc-d30v.c:1352
+#: config/tc-d30v.c:1369
 msgid "Instruction uses long version, so it cannot be mixed as specified"
 msgstr ""
 
-#: config/tc-d30v.c:1436 config/tc-d30v.c:1473
+#: config/tc-d30v.c:1453 config/tc-d30v.c:1490
 #, c-format
 msgid "unknown condition code: %s"
 msgstr ""
 
-#: config/tc-d30v.c:1466
+#: config/tc-d30v.c:1483
 #, c-format
 msgid "cmpu doesn't support condition code %s"
 msgstr ""
 
-#: config/tc-d30v.c:1514
+#: config/tc-d30v.c:1531
 #, c-format
 msgid "operands for opcode `%s' do not match any valid format"
 msgstr ""
 
-#: config/tc-d30v.c:1727
+#: config/tc-d30v.c:1744
 msgid "Odd numbered register used as target of multi-register instruction"
 msgstr ""
 
-#: config/tc-d30v.c:1824
+#: config/tc-d30v.c:1842
 #, c-format
 msgid "line %d: unable to place address of symbol '%s' into a byte"
 msgstr ""
 
-#: config/tc-d30v.c:1827
+#: config/tc-d30v.c:1845
 #, c-format
 msgid "line %d: unable to place value %x into a byte"
 msgstr ""
 
-#: config/tc-d30v.c:1835
+#: config/tc-d30v.c:1853
 #, c-format
 msgid "line %d: unable to place address of symbol '%s' into a short"
 msgstr ""
 
-#: config/tc-d30v.c:1838
+#: config/tc-d30v.c:1856
 #, c-format
 msgid "line %d: unable to place value %x into a short"
 msgstr ""
 
-#: config/tc-d30v.c:1846
+#: config/tc-d30v.c:1864
 #, c-format
 msgid "line %d: unable to place address of symbol '%s' into a quad"
 msgstr ""
 
-#: config/tc-d30v.c:2016
+#: config/tc-d30v.c:2034
 #, c-format
 msgid "value too large to fit in %d bits"
 msgstr ""
 
-#: config/tc-d30v.c:2159
+#: config/tc-d30v.c:2178
 #, c-format
 msgid "Alignment too large: %d assumed"
 msgstr ""
 
+#: config/tc-fr30.c:84
+msgid " FR30 specific command line options:\n"
+msgstr ""
+
+#: config/tc-fr30.c:143
+#, c-format
+msgid "Instruction %s not allowed in a delay slot."
+msgstr ""
+
+#: config/tc-fr30.c:380 config/tc-m32r.c:1530
+msgid "Addend to unresolved symbol not on word boundary."
+msgstr ""
+
+#: config/tc-fr30.c:538 config/tc-i960.c:786 config/tc-m32r.c:1837
+msgid "Bad call to md_atof()"
+msgstr ""
+
 #: config/tc-h8300.c:254 config/tc-h8300.c:262
 msgid "Reg not valid for H8/300"
 msgstr ""
@@ -2148,8 +2387,8 @@ msgstr ""
 msgid "invalid operands"
 msgstr ""
 
-#: config/tc-h8300.c:1290 config/tc-h8500.c:1129 config/tc-mips.c:7932
-#: config/tc-sh.c:1047 config/tc-w65.c:759 config/tc-z8k.c:1235
+#: config/tc-h8300.c:1290 config/tc-h8500.c:1129 config/tc-mips.c:7965
+#: config/tc-sh.c:1578 config/tc-w65.c:759 config/tc-z8k.c:1235
 msgid "unknown opcode"
 msgstr ""
 
@@ -2157,12 +2396,12 @@ msgstr ""
 msgid "mismatch between opcode size and operand size"
 msgstr ""
 
-#: config/tc-h8300.c:1348 config/tc-h8500.c:1157 config/tc-sh.c:1144
+#: config/tc-h8300.c:1348 config/tc-h8500.c:1157 config/tc-sh.c:1692
 #: config/tc-w65.c:791 config/tc-z8k.c:1290
 msgid "call to tc_crawl_symbol_chain \n"
 msgstr ""
 
-#: config/tc-h8300.c:1362 config/tc-h8500.c:1171 config/tc-sh.c:1151
+#: config/tc-h8300.c:1362 config/tc-h8500.c:1171 config/tc-sh.c:1699
 #: config/tc-w65.c:805 config/tc-z8k.c:1304
 msgid "call to tc_headers_hook \n"
 msgstr ""
@@ -2207,654 +2446,714 @@ msgstr ""
 msgid "@Rn needs word register"
 msgstr ""
 
-#: config/tc-h8500.c:845 config/tc-sh.c:844
+#: config/tc-h8500.c:845 config/tc-sh.c:1145
 #, c-format
 msgid "unhandled %d\n"
 msgstr ""
 
-#: config/tc-h8500.c:873 config/tc-sh.c:865
+#: config/tc-h8500.c:873 config/tc-sh.c:1167
 #, c-format
 msgid "operand must be absolute in range %d..%d"
 msgstr ""
 
-#: config/tc-h8500.c:963 config/tc-sh.c:986
+#: config/tc-h8500.c:963 config/tc-sh.c:1293
 #, c-format
 msgid "failed for %d\n"
 msgstr ""
 
-#: config/tc-h8500.c:1145 config/tc-sh.c:1082 config/tc-w65.c:779
+#: config/tc-h8500.c:1145 config/tc-sh.c:1388 config/tc-sh.c:1626
+#: config/tc-w65.c:779
 msgid "invalid operands for opcode"
 msgstr ""
 
-#: config/tc-hppa.c:1096
+#: config/tc-hppa.c:1140
 msgid "Missing .exit\n"
 msgstr ""
 
-#: config/tc-hppa.c:1099
+#: config/tc-hppa.c:1143
 msgid "Missing .procend\n"
 msgstr ""
 
-#: config/tc-hppa.c:1108
-msgid "Not in a space.\n"
-msgstr ""
-
-#: config/tc-hppa.c:1111
-msgid "Not in a subspace.\n"
-msgstr ""
-
-#: config/tc-hppa.c:1273
+#: config/tc-hppa.c:1322
 msgid "Invalid field selector.  Assuming F%%."
 msgstr ""
 
-#: config/tc-hppa.c:1304
+#: config/tc-hppa.c:1353
 msgid "-R option not supported on this target."
 msgstr ""
 
-#: config/tc-hppa.c:1318
+#: config/tc-hppa.c:1369 config/tc-sparc.c:736 config/tc-sparc.c:771
 #, c-format
 msgid "Internal error: can't hash `%s': %s\n"
 msgstr ""
 
-#: config/tc-hppa.c:1326 config/tc-i860.c:191 config/tc-sparc.c:704
+#: config/tc-hppa.c:1377 config/tc-i860.c:191
 #, c-format
 msgid "internal error: losing opcode: `%s' \"%s\"\n"
 msgstr ""
 
-#: config/tc-hppa.c:1388 config/tc-hppa.c:5183 config/tc-hppa.c:5235
+#: config/tc-hppa.c:1446 config/tc-hppa.c:6873 config/tc-hppa.c:6928
 msgid "Missing function name for .PROC (corrupted label chain)"
 msgstr ""
 
-#: config/tc-hppa.c:1391 config/tc-hppa.c:5238
+#: config/tc-hppa.c:1449 config/tc-hppa.c:6931
 msgid "Missing function name for .PROC"
 msgstr ""
 
-#: config/tc-hppa.c:1494 config/tc-hppa.c:3463
+#: config/tc-hppa.c:1570 config/tc-hppa.c:4715
 msgid "could not update architecture and machine"
 msgstr ""
 
-#: config/tc-hppa.c:1625
+#: config/tc-hppa.c:1783
 msgid "Invalid Indexed Load Completer."
 msgstr ""
 
-#: config/tc-hppa.c:1630
+#: config/tc-hppa.c:1788
 msgid "Invalid Indexed Load Completer Syntax."
 msgstr ""
 
-#: config/tc-hppa.c:1654
+#: config/tc-hppa.c:1824
 msgid "Invalid Short Load/Store Completer."
 msgstr ""
 
-#: config/tc-hppa.c:1681 config/tc-hppa.c:1686
+#: config/tc-hppa.c:1883 config/tc-hppa.c:1888
 msgid "Invalid Store Bytes Short Completer"
 msgstr ""
 
-#: config/tc-hppa.c:1696 config/tc-hppa.c:1728
+#: config/tc-hppa.c:2199 config/tc-hppa.c:2205
+msgid "Invalid left/right combination completer"
+msgstr ""
+
+#: config/tc-hppa.c:2254 config/tc-hppa.c:2261
+msgid "Invalid permutation completer"
+msgstr ""
+
+#: config/tc-hppa.c:2362
 #, c-format
-msgid "Invalid Compare/Subtract Condition: %c"
+msgid "Invalid Add Condition: %s"
 msgstr ""
 
-#: config/tc-hppa.c:1711
-msgid "Invalid Compare/Subtract Condition."
+#: config/tc-hppa.c:2373 config/tc-hppa.c:2383
+#, c-format
+msgid "Invalid Add and Branch Condition: %c"
 msgstr ""
 
-#: config/tc-hppa.c:1743
+#: config/tc-hppa.c:2404
 msgid "Invalid Compare/Subtract Condition"
 msgstr ""
 
-#: config/tc-hppa.c:1821 config/tc-hppa.c:1894
+#: config/tc-hppa.c:2444
 #, c-format
-msgid "Invalid Add Condition: %s"
+msgid "Invalid Bit Branch Condition: %c"
+msgstr ""
+
+#: config/tc-hppa.c:2530
+#, c-format
+msgid "Invalid Compare/Subtract Condition: %s"
 msgstr ""
 
-#: config/tc-hppa.c:1948 config/tc-hppa.c:2025
+#: config/tc-hppa.c:2542
+#, c-format
+msgid "Invalid Compare/Subtract Condition: %c"
+msgstr ""
+
+#: config/tc-hppa.c:2557
+msgid "Invalid Compare and Branch Condition."
+msgstr ""
+
+#: config/tc-hppa.c:2655
 msgid "Invalid Logical Instruction Condition."
 msgstr ""
 
-#: config/tc-hppa.c:2067
+#: config/tc-hppa.c:2711
 msgid "Invalid Shift/Extract/Deposit Condition."
 msgstr ""
 
-#: config/tc-hppa.c:2089
-#, c-format
-msgid "Invalid Bit Branch Condition: %c"
+#: config/tc-hppa.c:2823
+msgid "Invalid Unit Instruction Condition."
 msgstr ""
 
-#: config/tc-hppa.c:2202 config/tc-hppa.c:2235 config/tc-hppa.c:2272
+#: config/tc-hppa.c:3096 config/tc-hppa.c:3129 config/tc-hppa.c:3166
+#: config/tc-hppa.c:3205
 msgid "Branch to unaligned address"
 msgstr ""
 
-#: config/tc-hppa.c:2335
+#: config/tc-hppa.c:3389
 msgid "Invalid SFU identifier"
 msgstr ""
 
-#: config/tc-hppa.c:2375
+#: config/tc-hppa.c:3439
 msgid "Invalid COPR identifier"
 msgstr ""
 
-#: config/tc-hppa.c:2500 config/tc-hppa.c:2521 config/tc-hppa.c:2541
-#: config/tc-hppa.c:2561 config/tc-hppa.c:2581
-msgid "Invalid register for single precision fmpyadd or fmpysub"
+#: config/tc-hppa.c:3568
+msgid "Invalid Floating Point Operand Format."
 msgstr ""
 
-#: config/tc-hppa.c:2605
-msgid "Invalid Floating Point Operand Format."
+#: config/tc-hppa.c:3706 config/tc-hppa.c:3730 config/tc-hppa.c:3753
+#: config/tc-hppa.c:3776 config/tc-hppa.c:3799
+msgid "Invalid register for single precision fmpyadd or fmpysub"
 msgstr ""
 
-#: config/tc-hppa.c:2628
+#: config/tc-hppa.c:3848
 #, c-format
 msgid "Invalid operands %s"
 msgstr ""
 
-#: config/tc-hppa.c:3163
+#: config/tc-hppa.c:4415
 msgid "Unknown relocation encountered in md_apply_fix."
 msgstr ""
 
-#: config/tc-hppa.c:3173
+#: config/tc-hppa.c:4425
 #, c-format
 msgid "no hppa_fixup entry for this fixup (fixP = 0x%x, type = 0x%x)\n"
 msgstr ""
 
-#: config/tc-hppa.c:3315 config/tc-hppa.c:3340
+#: config/tc-hppa.c:4567 config/tc-hppa.c:4592
 #, c-format
 msgid "Undefined register: '%s'."
 msgstr ""
 
-#: config/tc-hppa.c:3378
+#: config/tc-hppa.c:4630
 #, c-format
 msgid "Non-absolute symbol: '%s'."
 msgstr ""
 
-#: config/tc-hppa.c:3393
+#: config/tc-hppa.c:4645
 #, c-format
 msgid "Undefined absolute constant: '%s'."
 msgstr ""
 
-#: config/tc-hppa.c:3502
+#: config/tc-hppa.c:4754
 #, c-format
 msgid "Invalid FP Compare Condition: %s"
 msgstr ""
 
-#: config/tc-hppa.c:3543
+#: config/tc-hppa.c:4810
+#, c-format
+msgid "Invalid FTEST completer: %s"
+msgstr ""
+
+#: config/tc-hppa.c:4877 config/tc-hppa.c:4915
 #, c-format
 msgid "Invalid FP Operand Format: %3s"
 msgstr ""
 
-#: config/tc-hppa.c:3624
+#: config/tc-hppa.c:4994
 msgid "Bad segment in expression."
 msgstr ""
 
-#: config/tc-hppa.c:3675
+#: config/tc-hppa.c:5053
 msgid "Bad segment (should be absolute)."
 msgstr ""
 
-#: config/tc-hppa.c:3774
+#: config/tc-hppa.c:5152
 #, c-format
 msgid "Invalid argument location: %s\n"
 msgstr ""
 
-#: config/tc-hppa.c:3805
+#: config/tc-hppa.c:5183
 #, c-format
 msgid "Invalid argument description: %d"
 msgstr ""
 
-#: config/tc-hppa.c:3828
+#: config/tc-hppa.c:5206
 #, c-format
 msgid "Invalid Nullification: (%c)"
 msgstr ""
 
-#: config/tc-hppa.c:4301
+#: config/tc-hppa.c:5950
 #, c-format
 msgid "Invalid .CALL argument: %s"
 msgstr ""
 
-#: config/tc-hppa.c:4420
+#: config/tc-hppa.c:6082
 msgid ".callinfo is not within a procedure definition"
 msgstr ""
 
-#: config/tc-hppa.c:4440
+#: config/tc-hppa.c:6102
 #, c-format
 msgid "FRAME parameter must be a multiple of 8: %d\n"
 msgstr ""
 
-#: config/tc-hppa.c:4459
+#: config/tc-hppa.c:6121
 msgid "Value for ENTRY_GR must be in the range 3..18\n"
 msgstr ""
 
-#: config/tc-hppa.c:4471
+#: config/tc-hppa.c:6133
 msgid "Value for ENTRY_FR must be in the range 12..21\n"
 msgstr ""
 
-#: config/tc-hppa.c:4481
+#: config/tc-hppa.c:6143
 msgid "Value for ENTRY_SR must be 3\n"
 msgstr ""
 
-#: config/tc-hppa.c:4537
+#: config/tc-hppa.c:6199
 #, c-format
 msgid "Invalid .CALLINFO argument: %s"
 msgstr ""
 
-#: config/tc-hppa.c:4627
+#: config/tc-hppa.c:6293
 msgid "The .ENTER pseudo-op is not supported"
 msgstr ""
 
-#: config/tc-hppa.c:4641
+#: config/tc-hppa.c:6309
 msgid "Misplaced .entry. Ignored."
 msgstr ""
 
-#: config/tc-hppa.c:4645
+#: config/tc-hppa.c:6313
 msgid "Missing .callinfo."
 msgstr ""
 
-#: config/tc-hppa.c:4693
+#: config/tc-hppa.c:6361
 msgid ".REG must use a label"
 msgstr ""
 
-#: config/tc-hppa.c:4695
+#: config/tc-hppa.c:6363
 msgid ".EQU must use a label"
 msgstr ""
 
-#: config/tc-hppa.c:4746
+#: config/tc-hppa.c:6416
 msgid ".EXIT must appear within a procedure"
 msgstr ""
 
-#: config/tc-hppa.c:4750
+#: config/tc-hppa.c:6420
 msgid "Missing .callinfo"
 msgstr ""
 
-#: config/tc-hppa.c:4754
+#: config/tc-hppa.c:6424
 msgid "No .ENTRY for this .EXIT"
 msgstr ""
 
-#: config/tc-hppa.c:4781
+#: config/tc-hppa.c:6451
 #, c-format
 msgid "Cannot define export symbol: %s\n"
 msgstr ""
 
-#: config/tc-hppa.c:4834
+#: config/tc-hppa.c:6504
 #, c-format
 msgid "Using ENTRY rather than CODE in export directive for %s"
 msgstr ""
 
-#: config/tc-hppa.c:4935
+#: config/tc-hppa.c:6613
 #, c-format
 msgid "Undefined .EXPORT/.IMPORT argument (ignored): %s"
 msgstr ""
 
-#: config/tc-hppa.c:5017
+#: config/tc-hppa.c:6695
 msgid "Missing label name on .LABEL"
 msgstr ""
 
-#: config/tc-hppa.c:5022
+#: config/tc-hppa.c:6700
 msgid "extra .LABEL arguments ignored."
 msgstr ""
 
-#: config/tc-hppa.c:5037
+#: config/tc-hppa.c:6717
 msgid "The .LEAVE pseudo-op is not supported"
 msgstr ""
 
-#: config/tc-hppa.c:5070
+#: config/tc-hppa.c:6756
 msgid "Unrecognized .LEVEL argument\n"
 msgstr ""
 
-#: config/tc-hppa.c:5104
+#: config/tc-hppa.c:6792
 #, c-format
 msgid "Cannot define static symbol: %s\n"
 msgstr ""
 
-#: config/tc-hppa.c:5137
+#: config/tc-hppa.c:6827
 msgid "Nested procedures"
 msgstr ""
 
-#: config/tc-hppa.c:5147
+#: config/tc-hppa.c:6837
 msgid "Cannot allocate unwind descriptor\n"
 msgstr ""
 
-#: config/tc-hppa.c:5242
+#: config/tc-hppa.c:6935
 msgid "misplaced .procend"
 msgstr ""
 
-#: config/tc-hppa.c:5245
+#: config/tc-hppa.c:6938
 msgid "Missing .callinfo for this procedure"
 msgstr ""
 
-#: config/tc-hppa.c:5248
+#: config/tc-hppa.c:6941
 msgid "Missing .EXIT for a .ENTRY"
 msgstr ""
 
-#: config/tc-hppa.c:5348
+#: config/tc-hppa.c:6980
+msgid "Not in a space.\n"
+msgstr ""
+
+#: config/tc-hppa.c:6983
+msgid "Not in a subspace.\n"
+msgstr ""
+
+#: config/tc-hppa.c:7073
 msgid "Invalid .SPACE argument"
 msgstr ""
 
-#: config/tc-hppa.c:5396
+#: config/tc-hppa.c:7121
 msgid "Can't change spaces within a procedure definition. Ignored"
 msgstr ""
 
-#: config/tc-hppa.c:5523
+#: config/tc-hppa.c:7248
 #, c-format
 msgid "Undefined space: '%s' Assuming space number = 0."
 msgstr ""
 
-#: config/tc-hppa.c:5565
+#: config/tc-hppa.c:7272
 msgid "Must be in a space before changing or declaring subspaces.\n"
 msgstr ""
 
-#: config/tc-hppa.c:5569
+#: config/tc-hppa.c:7276
 msgid "Can't change subspaces within a procedure definition. Ignored"
 msgstr ""
 
-#: config/tc-hppa.c:5605
+#: config/tc-hppa.c:7311
 msgid "Parameters of an existing subspace can't be modified"
 msgstr ""
 
-#: config/tc-hppa.c:5658
+#: config/tc-hppa.c:7362
 msgid "Alignment must be a power of 2"
 msgstr ""
 
-#: config/tc-hppa.c:5700
+#: config/tc-hppa.c:7404
 msgid "FIRST not supported as a .SUBSPACE argument"
 msgstr ""
 
-#: config/tc-hppa.c:5702
+#: config/tc-hppa.c:7406
 msgid "Invalid .SUBSPACE argument"
 msgstr ""
 
-#: config/tc-hppa.c:5742
-msgid "Ignoring subspace decl due to ELF BFD bugs."
-msgstr ""
-
-#: config/tc-hppa.c:5905
+#: config/tc-hppa.c:7589
 #, c-format
 msgid "Internal error: Unable to find containing space for %s."
 msgstr ""
 
-#: config/tc-hppa.c:5946
+#: config/tc-hppa.c:7630
 #, c-format
 msgid "Out of memory: could not allocate new space chain entry: %s\n"
 msgstr ""
 
-#: config/tc-hppa.c:6032
+#: config/tc-hppa.c:7716
 #, c-format
 msgid "Out of memory: could not allocate new subspace chain entry: %s\n"
 msgstr ""
 
-#: config/tc-hppa.c:6688
+#: config/tc-hppa.c:8383
 #, c-format
 msgid "Symbol '%s' could not be created."
 msgstr ""
 
-#: config/tc-hppa.c:6692
+#: config/tc-hppa.c:8387
 msgid "No memory for symbol name."
 msgstr ""
 
-#: config/tc-i386.c:502
+#: config/tc-i386.c:509
 msgid "same type of prefix used twice"
 msgstr ""
 
-#: config/tc-i386.c:536
+#: config/tc-i386.c:552
 msgid "Bad argument to syntax directive."
 msgstr ""
 
-#: config/tc-i386.c:619 config/tc-m68k.c:3750
+#: config/tc-i386.c:636 config/tc-m68k.c:3750
 #, c-format
 msgid "Internal Error:  Can't hash %s: %s"
 msgstr ""
 
-#: config/tc-i386.c:851
+#: config/tc-i386.c:866
 msgid "Unknown"
 msgstr ""
 
-#: config/tc-i386.c:899 config/tc-i386.c:4360 config/tc-m68k.c:772
+#: config/tc-i386.c:914 config/tc-i386.c:4407 config/tc-m68k.c:772
 #, c-format
 msgid "Can not do %d byte pc-relative relocation"
 msgstr ""
 
-#: config/tc-i386.c:909 config/tc-i386.c:4374 config/tc-m68k.c:779
+#: config/tc-i386.c:924 config/tc-i386.c:4421 config/tc-m68k.c:779
 #, c-format
 msgid "Can not do %d byte relocation"
 msgstr ""
 
-#: config/tc-i386.c:1010 config/tc-i386.c:1096
+#: config/tc-i386.c:1030 config/tc-i386.c:1113
 #, c-format
 msgid "no such 386 instruction: `%s'"
 msgstr ""
 
-#: config/tc-i386.c:1019
+#: config/tc-i386.c:1039
 #, c-format
 msgid "invalid character %s in mnemonic"
 msgstr ""
 
-#: config/tc-i386.c:1026
+#: config/tc-i386.c:1046
 msgid "expecting prefix; got nothing"
 msgstr ""
 
-#: config/tc-i386.c:1028
+#: config/tc-i386.c:1048
 msgid "expecting mnemonic; got nothing"
 msgstr ""
 
-#: config/tc-i386.c:1046
+#: config/tc-i386.c:1066
 #, c-format
 msgid "redundant %s prefix"
 msgstr ""
 
-#: config/tc-i386.c:1105
+#: config/tc-i386.c:1122
 #, c-format
 msgid "expecting string instruction after `%s'"
 msgstr ""
 
-#: config/tc-i386.c:1128
+#: config/tc-i386.c:1145
 #, c-format
 msgid "invalid character %s before operand %d"
 msgstr ""
 
-#: config/tc-i386.c:1142
+#: config/tc-i386.c:1159
 #, c-format
 msgid "unbalanced parenthesis in operand %d."
 msgstr ""
 
-#: config/tc-i386.c:1145
+#: config/tc-i386.c:1162
 #, c-format
 msgid "unbalanced brackets in operand %d."
 msgstr ""
 
-#: config/tc-i386.c:1154
+#: config/tc-i386.c:1171
 #, c-format
 msgid "invalid character %s in operand %d"
 msgstr ""
 
-#: config/tc-i386.c:1181
+#: config/tc-i386.c:1198
 #, c-format
 msgid "spurious operands; (%d operands/instruction max)"
 msgstr ""
 
-#: config/tc-i386.c:1202
+#: config/tc-i386.c:1219
 msgid "expecting operand after ','; got nothing"
 msgstr ""
 
-#: config/tc-i386.c:1207
+#: config/tc-i386.c:1224
 msgid "expecting operand before ','; got nothing"
 msgstr ""
 
 #. we found no match
-#: config/tc-i386.c:1434
+#: config/tc-i386.c:1461
 #, c-format
 msgid "suffix or operands invalid for `%s'"
 msgstr ""
 
+#: config/tc-i386.c:1469
+#, c-format
+msgid "Indirect %s without `*'"
+msgstr ""
+
 #. Warn them that a data or address size prefix doesn't affect
 #. assembly of the next line of code.
-#: config/tc-i386.c:1443
+#: config/tc-i386.c:1476
 #, c-format
 msgid "stand-alone `%s' prefix"
 msgstr ""
 
-#: config/tc-i386.c:1467 config/tc-i386.c:1482
+#: config/tc-i386.c:1511 config/tc-i386.c:1526
 msgid "`%s' operand %d must use `%%es' segment"
 msgstr ""
 
-#: config/tc-i386.c:1548 config/tc-i386.c:1589 config/tc-i386.c:1616
+#: config/tc-i386.c:1593 config/tc-i386.c:1634 config/tc-i386.c:1661
 msgid "using `%%%s' instead of `%%%s' due to `%c' suffix"
 msgstr ""
 
-#: config/tc-i386.c:1561 config/tc-i386.c:1578 config/tc-i386.c:1605
+#: config/tc-i386.c:1606 config/tc-i386.c:1623 config/tc-i386.c:1650
 msgid "`%%%s' not allowed with `%s%c'"
 msgstr ""
 
-#: config/tc-i386.c:1645 config/tc-i386.c:1665
+#: config/tc-i386.c:1694 config/tc-i386.c:1714
 msgid "no instruction mnemonic suffix given; can't determine immediate size"
 msgstr ""
 
-#: config/tc-i386.c:1690
+#: config/tc-i386.c:1739
 msgid ""
 "no instruction mnemonic suffix given and no register operands; can't size "
 "instruction"
 msgstr ""
 
 #. reversed arguments on faddp, fsubp, etc.
-#: config/tc-i386.c:1803
+#: config/tc-i386.c:1841
 msgid "translating to `%s %%%s,%%%s'"
 msgstr ""
 
 #. extraneous `l' suffix on fp insn
-#: config/tc-i386.c:1810
+#: config/tc-i386.c:1848
 msgid "translating to `%s %%%s'"
 msgstr ""
 
-#: config/tc-i386.c:2022
+#: config/tc-i386.c:2063
 msgid "you can't `pop %%cs'"
 msgstr ""
 
-#. UnixWare fsub no args is alias for fsubp, fadd -> faddp, etc
-#: config/tc-i386.c:2053
+#. UnixWare fsub no args is alias for fsubp, fadd -> faddp, etc.
+#: config/tc-i386.c:2094
 #, c-format
 msgid "translating to `%sp'"
 msgstr ""
 
-#: config/tc-i386.c:2084 config/tc-i386.c:2187 config/tc-i386.c:2247
+#: config/tc-i386.c:2143 config/tc-i386.c:2205 config/tc-i386.c:2247
 msgid "skipping prefixes on this instruction"
 msgstr ""
 
-#: config/tc-i386.c:2104 config/tc-i386.c:2211 config/tc-i386.c:2260
+#: config/tc-i386.c:2262
 msgid "16-bit jump out of range"
 msgstr ""
 
-#: config/tc-i386.c:2206
+#: config/tc-i386.c:2271
 #, c-format
-msgid "`%s' only takes byte displacement; %ld shortened to %d"
+msgid "can't handle non absolute segment in `%s'"
 msgstr ""
 
-#: config/tc-i386.c:2269
+#: config/tc-i386.c:2379 config/tc-i386.c:2429
 #, c-format
-msgid "can't handle non absolute segment in `%s'"
+msgid "%ld shortened to %ld"
 msgstr ""
 
-#: config/tc-i386.c:2527
+#: config/tc-i386.c:2499
 msgid "Only 1 or 2 immediate operands are allowed"
 msgstr ""
 
-#: config/tc-i386.c:2558 config/tc-i386.c:2788
+#: config/tc-i386.c:2531 config/tc-i386.c:2755
 msgid "GOT relocations not supported in 16 bit mode"
 msgstr ""
 
-#: config/tc-i386.c:2579 config/tc-i386.c:2809
+#: config/tc-i386.c:2552 config/tc-i386.c:2776
 msgid "Bad reloc specifier in expression"
 msgstr ""
 
-#: config/tc-i386.c:2597 config/tc-i386.c:2843
+#: config/tc-i386.c:2570 config/tc-i386.c:2810
 #, c-format
 msgid "Ignoring junk `%s' after expression"
 msgstr ""
 
 #. missing or bad expr becomes absolute 0
-#: config/tc-i386.c:2604
+#: config/tc-i386.c:2577
 #, c-format
 msgid "Missing or invalid immediate expression `%s' taken as 0"
 msgstr ""
 
-#: config/tc-i386.c:2639 config/tc-i386.c:2862
+#: config/tc-i386.c:2607 config/tc-i386.c:2853
+#, c-format
+msgid "Unimplemented segment %s in operand"
+msgstr ""
+
+#: config/tc-i386.c:2609 config/tc-i386.c:2855
 #, c-format
 msgid "Unimplemented segment type %d in operand"
 msgstr ""
 
-#: config/tc-i386.c:2682
+#: config/tc-i386.c:2653
 #, c-format
 msgid "expecting scale factor of 1, 2, 4, or 8: got `%s'"
 msgstr ""
 
-#: config/tc-i386.c:2688
+#: config/tc-i386.c:2659
 #, c-format
 msgid "scale factor of %d without an index register"
 msgstr ""
 
-#: config/tc-i386.c:3037 config/tc-i386.c:3043 config/tc-i386.c:3052
+#. missing or bad expr becomes absolute 0
+#: config/tc-i386.c:2821
+#, c-format
+msgid "Missing or invalid displacement expression `%s' taken as 0"
+msgstr ""
+
+#: config/tc-i386.c:3035 config/tc-i386.c:3041 config/tc-i386.c:3050
 #, c-format
 msgid "bad segment name `%s'"
 msgstr ""
 
-#: config/tc-i386.c:3218 config/tc-i386.c:3473
+#: config/tc-i386.c:3108
 #, c-format
-msgid "too many memory references for `%s'"
+msgid "`%s' is not a valid base/index expression"
 msgstr ""
 
-#: config/tc-i386.c:3329 config/tc-i386.c:3342 config/tc-i386.c:3654
-#: config/tc-i386.c:3667
+#: config/tc-i386.c:3112
 #, c-format
 msgid "`%s' is not a valid %s bit base/index expression"
 msgstr ""
 
-#: config/tc-i386.c:3426
+#: config/tc-i386.c:3133 config/tc-i386.c:3487
+#, c-format
+msgid "too many memory references for `%s'"
+msgstr ""
+
+#: config/tc-i386.c:3219 config/tc-i386.c:3354 config/tc-i386.c:3457
+#: config/tc-i386.c:3572 config/tc-i386.c:3608
+#, c-format
+msgid "bad register name `%s'"
+msgstr ""
+
+#: config/tc-i386.c:3433
 #, c-format
 msgid "bad memory operand `%s'"
 msgstr ""
 
-#: config/tc-i386.c:3441
+#: config/tc-i386.c:3448
 #, c-format
 msgid "Junk `%s' after register"
 msgstr ""
 
-#: config/tc-i386.c:3582
+#: config/tc-i386.c:3465
+msgid "Immediate operand illegal with absolute jump"
+msgstr ""
+
+#: config/tc-i386.c:3565
 #, c-format
 msgid "expecting `,' or `)' after index register in `%s'"
 msgstr ""
 
-#: config/tc-i386.c:3599
+#: config/tc-i386.c:3587
 #, c-format
 msgid "expecting `)' after scale factor in `%s'"
 msgstr ""
 
-#: config/tc-i386.c:3606
+#: config/tc-i386.c:3594
 #, c-format
 msgid "expecting index register or scale factor after `,'; got '%c'"
 msgstr ""
 
-#: config/tc-i386.c:3613
+#: config/tc-i386.c:3601
 #, c-format
 msgid "expecting `,' or `)' after base register in `%s'"
 msgstr ""
 
 #. it's not a memory operand; argh!
-#: config/tc-i386.c:3676
+#: config/tc-i386.c:3641
 #, c-format
 msgid "invalid char %s beginning operand %d `%s'"
 msgstr ""
 
-#: config/tc-i386.c:4095
+#: config/tc-i386.c:4099
 msgid "Bad call to md_atof ()"
 msgstr ""
 
-#: config/tc-i386.c:4156 config/tc-i386.c:4169
-#, c-format
-msgid "bad register name `%s'"
+#: config/tc-i386.c:4250
+msgid "  -m\t\t\t  do long jump\n"
 msgstr ""
 
-#: config/tc-i386.c:4223
-msgid "-m\t\t\tdo long jump\n"
+#: config/tc-i386.c:4253
+msgid ""
+"  -V\t\t\t  print assembler version number\n"
+"  -k\t\t\t  ignored\n"
+"  -Qy, -Qn\t\t  ignored\n"
+"  -q\t\t\t  ignored\n"
+"  -s\t\t\t  ignored\n"
 msgstr ""
 
-#: config/tc-i386.c:4263
+#: config/tc-i386.c:4307
 msgid "GOT already in symbol table"
 msgstr ""
 
-#: config/tc-i386.c:4409 config/tc-mcore.c:2130 config/tc-sh.c:2421
+#: config/tc-i386.c:4456 config/tc-mcore.c:2421 config/tc-pj.c:586
+#: config/tc-sh.c:2998
 #, c-format
 msgid "Cannot represent relocation type %s"
 msgstr ""
@@ -2863,7 +3162,7 @@ msgstr ""
 msgid "Unknown temporary pseudo register"
 msgstr ""
 
-#: config/tc-i860.c:183 config/tc-mips.c:1013 config/tc-sparc.c:696
+#: config/tc-i860.c:183 config/tc-mips.c:1059
 #, c-format
 msgid "internal error: can't hash `%s': %s\n"
 msgstr ""
@@ -2890,7 +3189,7 @@ msgstr ""
 msgid "Illegal operands"
 msgstr ""
 
-#: config/tc-i860.c:749 config/tc-sparc.c:2338
+#: config/tc-i860.c:749 config/tc-sparc.c:2634
 msgid "bad segment"
 msgstr ""
 
@@ -2972,10 +3271,6 @@ msgstr ""
 msgid "improper number of operands.  expecting %d, got %d"
 msgstr ""
 
-#: config/tc-i960.c:786 config/tc-m32r.c:1239
-msgid "Bad call to md_atof()"
-msgstr ""
-
 #: config/tc-i960.c:876
 #, c-format
 msgid "Fixup of %ld too large for field width of %d"
@@ -3074,115 +3369,202 @@ msgstr ""
 msgid "Redefining leafproc %s"
 msgstr ""
 
-#: config/tc-i960.c:2667
+#: config/tc-i960.c:2669
 msgid "should have two operands"
 msgstr ""
 
-#: config/tc-i960.c:2677
+#: config/tc-i960.c:2679
 msgid "'entry_num' must be absolute number in [0,31]"
 msgstr ""
 
-#: config/tc-i960.c:2686
+#: config/tc-i960.c:2688
 #, c-format
 msgid "Redefining entrynum for sysproc %s"
 msgstr ""
 
-#: config/tc-i960.c:2797
+#: config/tc-i960.c:2799
 msgid "architecture of opcode conflicts with that of earlier instruction(s)"
 msgstr ""
 
-#: config/tc-i960.c:2818
+#: config/tc-i960.c:2820
 msgid "big endian mode is not supported"
 msgstr ""
 
-#: config/tc-i960.c:2820
+#: config/tc-i960.c:2822
 #, c-format
 msgid "ignoring unrecognized .endian type `%s'"
 msgstr ""
 
-#: config/tc-i960.c:3123
+#: config/tc-i960.c:3104
 #, c-format
 msgid "leafproc symbol '%s' undefined"
 msgstr ""
 
-#: config/tc-i960.c:3133
+#: config/tc-i960.c:3114
 #, c-format
 msgid "Warning: making leafproc entries %s and %s both global\n"
 msgstr ""
 
-#: config/tc-i960.c:3242
+#: config/tc-i960.c:3223
 msgid "option --link-relax is only supported in b.out format"
 msgstr ""
 
-#: config/tc-i960.c:3285
+#: config/tc-i960.c:3266
 msgid "callj to difference of two symbols"
 msgstr ""
 
-#: config/tc-m32r.c:191
+#. Pretend that we do not recognise this option.
+#: config/tc-m32r.c:218
+msgid "Unrecognised option: -hidden"
+msgstr ""
+
+#: config/tc-m32r.c:251
 msgid " M32R specific command line options:\n"
 msgstr ""
 
-#: config/tc-m32r.c:194
+#: config/tc-m32r.c:253
+msgid "  -m32rx                  support the extended m32rx instruction set\n"
+msgstr ""
+
+#: config/tc-m32r.c:255
+msgid "  -O                      try to combine instructions in parallel\n"
+msgstr ""
+
+#: config/tc-m32r.c:258
+msgid ""
+"  -warn-explicit-parallel-conflicts     warn when parallel instructions\n"
+msgstr ""
+
+#: config/tc-m32r.c:260
+msgid "                                         violate contraints\n"
+msgstr ""
+
+#: config/tc-m32r.c:262
+msgid "  -no-warn-explicit-parallel-conflicts  do not warn when parallel\n"
+msgstr ""
+
+#: config/tc-m32r.c:264
+msgid ""
+"                                         instructions violate contraints\n"
+msgstr ""
+
+#: config/tc-m32r.c:266
+msgid ""
+"  -Wp                     synonym for -warn-explicit-parallel-conflicts\n"
+msgstr ""
+
+#: config/tc-m32r.c:268
+msgid ""
+"  -Wnp                    synonym for -no-warn-explicit-parallel-conflicts\n"
+msgstr ""
+
+#: config/tc-m32r.c:271
 msgid ""
 "  -warn-unmatched-high    warn when an (s)high reloc has no matching low "
 "reloc\n"
 msgstr ""
 
-#: config/tc-m32r.c:196
+#: config/tc-m32r.c:273
 msgid "  -no-warn-unmatched-high do not warn about missing low relocs\n"
 msgstr ""
 
-#: config/tc-m32r.c:198
+#: config/tc-m32r.c:275
 msgid "  -Wuh                    synonym for -warn-unmatched-high\n"
 msgstr ""
 
-#: config/tc-m32r.c:200
+#: config/tc-m32r.c:277
 msgid "  -Wnuh                   synonym for -no-warn-unmatched-high\n"
 msgstr ""
 
-#: config/tc-m32r.c:204
+#: config/tc-m32r.c:281
 msgid "  -relax                 create linker relaxable code\n"
 msgstr ""
 
-#: config/tc-m32r.c:206
+#: config/tc-m32r.c:283
 msgid "  -cpu-desc              provide runtime cpu description file\n"
 msgstr ""
 
-#: config/tc-m32r.c:331 read.c:2755 read.c:4824
+#: config/tc-m32r.c:678
+msgid "Instructions write to the same destination register."
+msgstr ""
+
+#: config/tc-m32r.c:686
+msgid "Instructions do not use parallel execution pipelines."
+msgstr ""
+
+#: config/tc-m32r.c:693
+msgid "Instructions share the same execution pipeline"
+msgstr ""
+
+#: config/tc-m32r.c:762 config/tc-m32r.c:848
 #, c-format
-msgid "symbol `%s' already defined"
+msgid "not a 16 bit instruction '%s'"
+msgstr ""
+
+#: config/tc-m32r.c:769 config/tc-m32r.c:855 config/tc-m32r.c:1010
+#, c-format
+msgid "unknown instruction '%s'"
+msgstr ""
+
+#: config/tc-m32r.c:777 config/tc-m32r.c:862 config/tc-m32r.c:1017
+#, c-format
+msgid "instruction '%s' is for the M32RX only"
+msgstr ""
+
+#: config/tc-m32r.c:785 config/tc-m32r.c:870
+#, c-format
+msgid "instruction '%s' cannot be executed in parallel."
+msgstr ""
+
+#: config/tc-m32r.c:832 config/tc-m32r.c:895 config/tc-m32r.c:1067
+msgid "internal error: lookup/get operands failed"
+msgstr ""
+
+#: config/tc-m32r.c:880
+#, c-format
+msgid "'%s': only the NOP instruction can be issued in parallel on the m32r"
+msgstr ""
+
+#: config/tc-m32r.c:909
+#, c-format
+msgid ""
+"%s: output of 1st instruction is the same as an input to 2nd instruction - "
+"is this intentional ?"
 msgstr ""
 
-#: config/tc-m32r.c:630 config/tc-ppc.c:1336 config/tc-ppc.c:3540 read.c:1368
+#: config/tc-m32r.c:913
+#, c-format
+msgid ""
+"%s: output of 2nd instruction is the same as an input to 1st instruction - "
+"is this intentional ?"
+msgstr ""
+
+#: config/tc-m32r.c:1228 config/tc-ppc.c:1337 config/tc-ppc.c:3547 read.c:1359
 msgid "Expected comma after symbol-name: rest of line ignored."
 msgstr ""
 
-#: config/tc-m32r.c:639
+#: config/tc-m32r.c:1237
 #, c-format
 msgid ".SCOMMon length (%ld.) <0! Ignored."
 msgstr ""
 
-#: config/tc-m32r.c:653 config/tc-ppc.c:1358 config/tc-ppc.c:2267
-#: config/tc-ppc.c:3564
+#: config/tc-m32r.c:1251 config/tc-ppc.c:1359 config/tc-ppc.c:2266
+#: config/tc-ppc.c:3571
 msgid "ignoring bad alignment"
 msgstr ""
 
-#: config/tc-m32r.c:679 config/tc-ppc.c:1369 config/tc-ppc.c:3576 read.c:1388
-#: read.c:2104
+#: config/tc-m32r.c:1277 config/tc-ppc.c:1370 config/tc-ppc.c:3583 read.c:1379
+#: read.c:2102
 #, c-format
 msgid "Ignoring attempt to re-define symbol `%s'."
 msgstr ""
 
-#: config/tc-m32r.c:688
+#: config/tc-m32r.c:1286
 #, c-format
 msgid "Length of .scomm \"%s\" is already %ld. Not changed to %ld."
 msgstr ""
 
-#: config/tc-m32r.c:932
-msgid "Addend to unresolved symbol not on word boundary."
-msgstr ""
-
-#: config/tc-m32r.c:1161
+#: config/tc-m32r.c:1759
 msgid "Unmatched high/shigh reloc"
 msgstr ""
 
@@ -3200,7 +3582,7 @@ msgstr ""
 msgid "Can not do %d byte pic relocation"
 msgstr ""
 
-#: config/tc-m68k.c:885 config/tc-mips.c:11148
+#: config/tc-m68k.c:885 config/tc-mips.c:11223
 #, c-format
 msgid "Cannot make %s relocation PC relative"
 msgstr ""
@@ -3627,7 +4009,7 @@ msgstr ""
 msgid "Relaxation should never occur"
 msgstr ""
 
-#: config/tc-m88k.c:1267 config/tc-sparc.c:3025 read.c:1961
+#: config/tc-m88k.c:1267 config/tc-sparc.c:3353 read.c:1954
 #, c-format
 msgid "BSS length (%d.) <0! Ignored."
 msgstr ""
@@ -3637,503 +4019,531 @@ msgstr ""
 msgid "Ignoring attempt to re-define symbol %s."
 msgstr ""
 
-#: config/tc-mcore.c:402
+#: config/tc-mcore.c:509
 #, c-format
 msgid "register expected, but saw '%.6s'"
 msgstr ""
 
-#: config/tc-mcore.c:486
+#: config/tc-mcore.c:593
 #, c-format
 msgid "control register expected, but saw '%.6s'"
 msgstr ""
 
-#: config/tc-mcore.c:645
+#: config/tc-mcore.c:631
+msgid "bad/missing psr specifier"
+msgstr ""
+
+#: config/tc-mcore.c:792
 msgid "more than 65K literal pools"
 msgstr ""
 
-#: config/tc-mcore.c:699
+#: config/tc-mcore.c:846
 msgid "missing ']'"
 msgstr ""
 
-#: config/tc-mcore.c:739
+#: config/tc-mcore.c:886
 msgid "operand must be a constant"
 msgstr ""
 
-#: config/tc-mcore.c:741
+#: config/tc-mcore.c:888
 #, c-format
 msgid "operand must be absolute in range %d..%d, not %d"
 msgstr ""
 
-#: config/tc-mcore.c:779
+#: config/tc-mcore.c:926
 msgid "operand must be a multiple of 4"
 msgstr ""
 
-#: config/tc-mcore.c:786
+#: config/tc-mcore.c:933
 msgid "operand must be a multiple of 2"
 msgstr ""
 
-#: config/tc-mcore.c:800 config/tc-mcore.c:1301 config/tc-mcore.c:1355
+#: config/tc-mcore.c:947 config/tc-mcore.c:1459 config/tc-mcore.c:1513
 msgid "base register expected"
 msgstr ""
 
-#: config/tc-mcore.c:849
+#: config/tc-mcore.c:996
 #, c-format
 msgid "unknown opcode \"%s\""
 msgstr ""
 
-#: config/tc-mcore.c:892
+#: config/tc-mcore.c:1039
 msgid "invalid register: r15 illegal"
 msgstr ""
 
-#: config/tc-mcore.c:951 config/tc-mcore.c:990 config/tc-mcore.c:1009
-#: config/tc-mcore.c:1028 config/tc-mcore.c:1055 config/tc-mcore.c:1084
-#: config/tc-mcore.c:1121 config/tc-mcore.c:1156 config/tc-mcore.c:1175
-#: config/tc-mcore.c:1194 config/tc-mcore.c:1226 config/tc-mcore.c:1248
-#: config/tc-mcore.c:1304 config/tc-mcore.c:1358 config/tc-mcore.c:1393
-#: config/tc-mcore.c:1447 config/tc-mcore.c:1469 config/tc-mcore.c:1492
+#: config/tc-mcore.c:1087 config/tc-mcore.c:1663
+msgid "M340 specific opcode used when assembling for M210"
+msgstr ""
+
+#: config/tc-mcore.c:1105 config/tc-mcore.c:1144 config/tc-mcore.c:1163
+#: config/tc-mcore.c:1182 config/tc-mcore.c:1209 config/tc-mcore.c:1238
+#: config/tc-mcore.c:1275 config/tc-mcore.c:1310 config/tc-mcore.c:1329
+#: config/tc-mcore.c:1348 config/tc-mcore.c:1380 config/tc-mcore.c:1405
+#: config/tc-mcore.c:1462 config/tc-mcore.c:1516 config/tc-mcore.c:1552
+#: config/tc-mcore.c:1610 config/tc-mcore.c:1632 config/tc-mcore.c:1655
 msgid "second operand missing"
 msgstr ""
 
-#: config/tc-mcore.c:966
+#: config/tc-mcore.c:1120
 msgid "destination register must be r1"
 msgstr ""
 
-#: config/tc-mcore.c:987
+#: config/tc-mcore.c:1141
 msgid "source register must be r1"
 msgstr ""
 
-#: config/tc-mcore.c:1050 config/tc-mcore.c:1107
+#: config/tc-mcore.c:1204 config/tc-mcore.c:1261
 msgid "immediate is not a power of two"
 msgstr ""
 
-#: config/tc-mcore.c:1078
+#: config/tc-mcore.c:1232
 msgid "translating bgeni to movi"
 msgstr ""
 
-#: config/tc-mcore.c:1115
+#: config/tc-mcore.c:1269
 msgid "translating mgeni to movi"
 msgstr ""
 
-#: config/tc-mcore.c:1147
+#: config/tc-mcore.c:1301
 msgid "translating bmaski to movi"
 msgstr ""
 
-#: config/tc-mcore.c:1221
+#: config/tc-mcore.c:1375
 #, c-format
 msgid "displacement too large (%d)"
 msgstr ""
 
-#: config/tc-mcore.c:1235
+#: config/tc-mcore.c:1389
 msgid "Invalid register: r0 and r15 illegal"
 msgstr ""
 
-#: config/tc-mcore.c:1262
+#: config/tc-mcore.c:1420
 msgid "bad starting register: r0 and r15 invalid"
 msgstr ""
 
-#: config/tc-mcore.c:1275
+#: config/tc-mcore.c:1433
 msgid "ending register must be r15"
 msgstr ""
 
-#: config/tc-mcore.c:1295
+#: config/tc-mcore.c:1453
 msgid "bad base register: must be r0"
 msgstr ""
 
-#: config/tc-mcore.c:1313
+#: config/tc-mcore.c:1471
 msgid "first register must be r4"
 msgstr ""
 
-#: config/tc-mcore.c:1324
+#: config/tc-mcore.c:1482
 msgid "last register must be r7"
 msgstr ""
 
-#: config/tc-mcore.c:1361
+#: config/tc-mcore.c:1519
 msgid "reg-reg expected"
 msgstr ""
 
-#: config/tc-mcore.c:1466
+#: config/tc-mcore.c:1629
 msgid "second operand must be 1"
 msgstr ""
 
-#: config/tc-mcore.c:1487
+#: config/tc-mcore.c:1650
 msgid "zero used as immediate value"
 msgstr ""
 
-#: config/tc-mcore.c:1498
+#: config/tc-mcore.c:1677
+msgid "duplicated psr bit specifier"
+msgstr ""
+
+#: config/tc-mcore.c:1683
+msgid "`af' must appear alone"
+msgstr ""
+
+#: config/tc-mcore.c:1690
 #, c-format
 msgid "unimplemented opcode \"%s\""
 msgstr ""
 
-#: config/tc-mcore.c:1568 config/tc-w65.c:856
+#: config/tc-mcore.c:1699
+#, c-format
+msgid "ignoring operands: %s "
+msgstr ""
+
+#: config/tc-mcore.c:1768 config/tc-w65.c:856
 msgid "Bad call to MD_NTOF()"
 msgstr ""
 
-#: config/tc-mcore.c:1631
+#: config/tc-mcore.c:1841
+#, c-format
+msgid "unrecognised cpu type '%s'"
+msgstr ""
+
+#: config/tc-mcore.c:1860
 msgid ""
 "MCORE specific options:\n"
 "  -{no-}jsri2bsr\t  {dis}able jsri to bsr transformation (def: dis)\n"
-"  -{no-}sifilter\t  {dis}able silicon filter behavior (def: dis)"
+"  -{no-}sifilter\t  {dis}able silicon filter behavior (def: dis)\n"
+"  -cpu=[210|340]          select CPU type\n"
+"  -EB                     assemble for a big endian system (default)\n"
+"  -EL                     assemble for a little endian system\n"
 msgstr ""
 
-#: config/tc-mcore.c:1647
+#: config/tc-mcore.c:1879
 msgid "failed sanity check: short_jump"
 msgstr ""
 
-#: config/tc-mcore.c:1658
+#: config/tc-mcore.c:1890
 msgid "failed sanity check: long_jump"
 msgstr ""
 
-#: config/tc-mcore.c:1685
+#: config/tc-mcore.c:1917
 #, c-format
 msgid "odd displacement at %x"
 msgstr ""
 
-#: config/tc-mcore.c:1839
+#: config/tc-mcore.c:2105
 msgid "unknown"
 msgstr ""
 
-#: config/tc-mcore.c:1844 config/tc-ns32k.c:2281
-msgid "<unknown>"
-msgstr ""
-
-#: config/tc-mcore.c:1870
+#: config/tc-mcore.c:2136
 #, c-format
 msgid "odd distance branch (0x%x bytes)"
 msgstr ""
 
-#: config/tc-mcore.c:1874
+#: config/tc-mcore.c:2140
 #, c-format
 msgid "pcrel for branch to %s too far (0x%x)"
 msgstr ""
 
-#: config/tc-mcore.c:1885
+#: config/tc-mcore.c:2159
 #, c-format
 msgid "pcrel for lrw/jmpi/jsri to %s too far (0x%x)"
 msgstr ""
 
-#: config/tc-mcore.c:1894
+#: config/tc-mcore.c:2170
 #, c-format
 msgid "pcrel for loopt too far (0x%x)"
 msgstr ""
 
-#: config/tc-mcore.c:2112
+#: config/tc-mcore.c:2402
 #, c-format
 msgid "Can not do %d byte %srelocation"
 msgstr ""
 
-#: config/tc-mcore.c:2114
+#: config/tc-mcore.c:2404
 msgid "pc-relative"
 msgstr ""
 
-#: config/tc-mips.c:960
+#: config/tc-mips.c:860
+msgid "-G not supported in this configuration."
+msgstr ""
+
+#: config/tc-mips.c:1005
 msgid "trap exception not supported at ISA 1"
 msgstr ""
 
-#: config/tc-mips.c:1000
+#: config/tc-mips.c:1046
 msgid "Could not set architecture and machine"
 msgstr ""
 
-#: config/tc-mips.c:1039
+#: config/tc-mips.c:1085
 #, c-format
 msgid "internal: can't hash `%s': %s"
 msgstr ""
 
-#: config/tc-mips.c:1047
+#: config/tc-mips.c:1093
 #, c-format
 msgid "internal error: bad mips16 opcode: %s %s\n"
 msgstr ""
 
-#: config/tc-mips.c:1216
+#: config/tc-mips.c:1262
 #, c-format
 msgid "returned from mips_ip(%s) insn_opcode = 0x%x\n"
 msgstr ""
 
-#: config/tc-mips.c:1739 config/tc-mips.c:11279
+#: config/tc-mips.c:1816 config/tc-mips.c:11354
 msgid "extended instruction in delay slot"
 msgstr ""
 
-#: config/tc-mips.c:1761 config/tc-mips.c:1768
+#: config/tc-mips.c:1838 config/tc-mips.c:1845
 #, c-format
 msgid "jump to misaligned address (0x%lx)"
 msgstr ""
 
-#: config/tc-mips.c:2419 config/tc-mips.c:2782
+#: config/tc-mips.c:2495 config/tc-mips.c:2838
 msgid "Macro instruction expanded into multiple instructions"
 msgstr ""
 
-#: config/tc-mips.c:2835
+#: config/tc-mips.c:2891
 msgid "unsupported large constant"
 msgstr ""
 
-#: config/tc-mips.c:2837
+#: config/tc-mips.c:2893
 #, c-format
 msgid "Instruction %s requires absolute expression"
 msgstr ""
 
-#: config/tc-mips.c:2983
+#: config/tc-mips.c:3039
 msgid "Number larger than 32 bits"
 msgstr ""
 
-#: config/tc-mips.c:3004
+#: config/tc-mips.c:3060
 msgid "Number larger than 64 bits"
 msgstr ""
 
-#: config/tc-mips.c:3270 config/tc-mips.c:3342 config/tc-mips.c:5021
-#: config/tc-mips.c:5072 config/tc-mips.c:5608 config/tc-mips.c:5671
+#: config/tc-mips.c:3326 config/tc-mips.c:3398 config/tc-mips.c:5077
+#: config/tc-mips.c:5128 config/tc-mips.c:5664 config/tc-mips.c:5727
 msgid "PIC code offset overflow (max 16 signed bits)"
 msgstr ""
 
-#: config/tc-mips.c:3581
+#: config/tc-mips.c:3637
 #, c-format
 msgid "Branch %s is always false (nop)"
 msgstr ""
 
-#: config/tc-mips.c:3586
+#: config/tc-mips.c:3642
 #, c-format
 msgid "Branch likely %s is always false"
 msgstr ""
 
-#: config/tc-mips.c:3593 config/tc-mips.c:3667 config/tc-mips.c:3770
-#: config/tc-mips.c:3825 config/tc-mips.c:6707 config/tc-mips.c:6716
-#: config/tc-mips.c:6724 config/tc-mips.c:6833
+#: config/tc-mips.c:3649 config/tc-mips.c:3723 config/tc-mips.c:3826
+#: config/tc-mips.c:3881 config/tc-mips.c:6764 config/tc-mips.c:6773
+#: config/tc-mips.c:6781 config/tc-mips.c:6890
 msgid "Unsupported large constant"
 msgstr ""
 
 #. result is always true
-#: config/tc-mips.c:3629
+#: config/tc-mips.c:3685
 #, c-format
 msgid "Branch %s is always true"
 msgstr ""
 
-#: config/tc-mips.c:3901 config/tc-mips.c:4008
+#: config/tc-mips.c:3957 config/tc-mips.c:4064
 msgid "Divide by zero."
 msgstr ""
 
-#: config/tc-mips.c:4592
+#: config/tc-mips.c:4648
 msgid "MIPS PIC call to register other than $25"
 msgstr ""
 
-#: config/tc-mips.c:4597 config/tc-mips.c:4709
+#: config/tc-mips.c:4653 config/tc-mips.c:4765
 msgid "No .cprestore pseudo-op used in PIC code"
 msgstr ""
 
-#: config/tc-mips.c:4782 config/tc-mips.c:4871 config/tc-mips.c:5359
-#: config/tc-mips.c:5400 config/tc-mips.c:5418 config/tc-mips.c:6046
-#: config/tc-mips.c:7054
+#: config/tc-mips.c:4838 config/tc-mips.c:4927 config/tc-mips.c:5415
+#: config/tc-mips.c:5456 config/tc-mips.c:5474 config/tc-mips.c:6103
 msgid "opcode not supported on this processor"
 msgstr ""
 
-#: config/tc-mips.c:5877 config/tc-mips.c:6601
+#: config/tc-mips.c:5934 config/tc-mips.c:6658
 msgid "Macro used $at after \".set noat\""
 msgstr ""
 
-#: config/tc-mips.c:6017 config/tc-mips.c:6035
+#: config/tc-mips.c:6074 config/tc-mips.c:6092
 msgid "rotate count too large"
 msgstr ""
 
-#: config/tc-mips.c:6086
+#: config/tc-mips.c:6143
 #, c-format
 msgid "Instruction %s: result is always false"
 msgstr ""
 
-#: config/tc-mips.c:6255
+#: config/tc-mips.c:6312
 #, c-format
 msgid "Instruction %s: result is always true"
 msgstr ""
 
-#: config/tc-mips.c:6394 config/tc-mips.c:6421 config/tc-mips.c:6493
-#: config/tc-mips.c:6518
+#: config/tc-mips.c:6451 config/tc-mips.c:6478 config/tc-mips.c:6550
+#: config/tc-mips.c:6575
 msgid "operand overflow"
 msgstr ""
 
 #. FIXME: Check if this is one of the itbl macros, since they
 #. are added dynamically.
-#: config/tc-mips.c:6597
+#: config/tc-mips.c:6654
 #, c-format
 msgid "Macro %s not implemented yet"
 msgstr ""
 
-#: config/tc-mips.c:6867
+#: config/tc-mips.c:6924
 #, c-format
 msgid "internal: bad mips opcode (mask error): %s %s"
 msgstr ""
 
-#: config/tc-mips.c:6919
+#: config/tc-mips.c:6976
 #, c-format
 msgid "internal: bad mips opcode (unknown operand type `%c'): %s %s"
 msgstr ""
 
-#: config/tc-mips.c:6926
+#: config/tc-mips.c:6983
 #, c-format
 msgid "internal: bad mips opcode (bits 0x%lx undefined): %s %s"
 msgstr ""
 
-#: config/tc-mips.c:7059
+#: config/tc-mips.c:7091
 #, c-format
-msgid "opcode requires -mips%d or greater"
+msgid "opcode not supported on this processor: %d (MIPS%d)"
 msgstr ""
 
-#: config/tc-mips.c:7127
+#: config/tc-mips.c:7161
 #, c-format
 msgid "Improper shift amount (%ld)"
 msgstr ""
 
-#: config/tc-mips.c:7154 config/tc-mips.c:8272 config/tc-mips.c:8387
+#: config/tc-mips.c:7188 config/tc-mips.c:8305 config/tc-mips.c:8420
 #, c-format
 msgid "Invalid value for `%s' (%lu)"
 msgstr ""
 
-#: config/tc-mips.c:7172
+#: config/tc-mips.c:7206
 #, c-format
 msgid "Illegal break code (%ld)"
 msgstr ""
 
-#: config/tc-mips.c:7186
+#: config/tc-mips.c:7220
 #, c-format
 msgid "Illegal lower break code (%ld)"
 msgstr ""
 
-#: config/tc-mips.c:7199
+#: config/tc-mips.c:7233
 #, c-format
 msgid "Illegal syscall code (%ld)"
 msgstr ""
 
-#: config/tc-mips.c:7211
+#: config/tc-mips.c:7245
 #, c-format
 msgid "Coproccesor code > 25 bits (%ld)"
 msgstr ""
 
-#: config/tc-mips.c:7225
+#: config/tc-mips.c:7259
 #, c-format
 msgid "Invalidate performance regster (%ld)"
 msgstr ""
 
-#: config/tc-mips.c:7261
+#: config/tc-mips.c:7295
 #, c-format
 msgid "Invalid register number (%d)"
 msgstr ""
 
-#: config/tc-mips.c:7422
+#: config/tc-mips.c:7455
 #, c-format
 msgid "Invalid float register number (%d)"
 msgstr ""
 
-#: config/tc-mips.c:7432
+#: config/tc-mips.c:7465
 #, c-format
 msgid "Float register should be even, was %d"
 msgstr ""
 
-#: config/tc-mips.c:7484 config/tc-mips.c:7716 config/tc-mips.c:7755
+#: config/tc-mips.c:7517 config/tc-mips.c:7749 config/tc-mips.c:7788
 msgid "absolute expression required"
 msgstr ""
 
-#: config/tc-mips.c:7545
+#: config/tc-mips.c:7578
 #, c-format
 msgid "Bad floating point constant: %s"
 msgstr ""
 
-#: config/tc-mips.c:7662
+#: config/tc-mips.c:7695
 msgid "Can't use floating point insn in this section"
 msgstr ""
 
-#: config/tc-mips.c:7718
+#: config/tc-mips.c:7751
 msgid "16 bit expression not in range 0..65535"
 msgstr ""
 
-#: config/tc-mips.c:7757
+#: config/tc-mips.c:7790
 msgid "16 bit expression not in range -32768..32767"
 msgstr ""
 
-#: config/tc-mips.c:7829
+#: config/tc-mips.c:7862
 msgid "lui expression not in range 0..65535"
 msgstr ""
 
-#: config/tc-mips.c:7853
+#: config/tc-mips.c:7886
 #, c-format
 msgid "invalid condition code register $fcc%d"
 msgstr ""
 
-#: config/tc-mips.c:7861
+#: config/tc-mips.c:7894
 #, c-format
 msgid "bad char = '%c'\n"
 msgstr ""
 
-#: config/tc-mips.c:7874 config/tc-mips.c:8412
+#: config/tc-mips.c:7907 config/tc-mips.c:8445
 msgid "illegal operands"
 msgstr ""
 
-#: config/tc-mips.c:7941
+#: config/tc-mips.c:7974
 msgid "unrecognized opcode"
 msgstr ""
 
-#: config/tc-mips.c:8050
+#: config/tc-mips.c:8083
 #, c-format
 msgid "invalid register number (%d)"
 msgstr ""
 
-#: config/tc-mips.c:8131
+#: config/tc-mips.c:8164
 msgid "used $at without \".set noat\""
 msgstr ""
 
-#: config/tc-mips.c:8306
+#: config/tc-mips.c:8339
 msgid "can't parse register list"
 msgstr ""
 
-#: config/tc-mips.c:8340 config/tc-mips.c:8370
+#: config/tc-mips.c:8373 config/tc-mips.c:8403
 msgid "invalid register list"
 msgstr ""
 
-#: config/tc-mips.c:8537
+#: config/tc-mips.c:8570
 msgid "extended operand requested but not required"
 msgstr ""
 
-#: config/tc-mips.c:8539
+#: config/tc-mips.c:8572
 msgid "invalid unextended operand value"
 msgstr ""
 
-#: config/tc-mips.c:8567
+#: config/tc-mips.c:8600
 msgid "operand value out of range for instruction"
 msgstr ""
 
-#: config/tc-mips.c:9008
+#: config/tc-mips.c:9051
 #, c-format
 msgid "ignoring invalid leading 'v' in -mcpu=%s switch"
 msgstr ""
 
-#: config/tc-mips.c:9014
+#: config/tc-mips.c:9057
 #, c-format
 msgid "invalid architecture -mcpu=%s"
 msgstr ""
 
-#: config/tc-mips.c:9064
+#: config/tc-mips.c:9107
 msgid "-G may not be used with embedded PIC code"
 msgstr ""
 
-#: config/tc-mips.c:9076
+#: config/tc-mips.c:9119
 msgid "-call_shared is supported only for ELF format"
 msgstr ""
 
-#: config/tc-mips.c:9082 config/tc-mips.c:10093 config/tc-mips.c:10261
+#: config/tc-mips.c:9125 config/tc-mips.c:10166 config/tc-mips.c:10334
 msgid "-G may not be used with SVR4 PIC code"
 msgstr ""
 
-#: config/tc-mips.c:9091
+#: config/tc-mips.c:9134
 msgid "-non_shared is supported only for ELF format"
 msgstr ""
 
-#: config/tc-mips.c:9107
+#: config/tc-mips.c:9150
 msgid "-G is not supported for this configuration"
 msgstr ""
 
-#: config/tc-mips.c:9112
+#: config/tc-mips.c:9155
 msgid "-G may not be used with SVR4 or embedded PIC code"
 msgstr ""
 
-#: config/tc-mips.c:9136
+#: config/tc-mips.c:9179
 msgid "No compiled in support for 64 bit object file format"
 msgstr ""
 
-#: config/tc-mips.c:9197
+#: config/tc-mips.c:9269
 msgid ""
 "MIPS options:\n"
 "-membedded-pic\t\tgenerate embedded position independent code\n"
@@ -4144,7 +4554,7 @@ msgid ""
 "\t\t\timplicitly with the gp register [default 8]\n"
 msgstr ""
 
-#: config/tc-mips.c:9205
+#: config/tc-mips.c:9277
 msgid ""
 "-mips1\t\t\tgenerate MIPS ISA I instructions\n"
 "-mips2\t\t\tgenerate MIPS ISA II instructions\n"
@@ -4153,20 +4563,20 @@ msgid ""
 "-mcpu=CPU\t\tgenerate code for CPU, where CPU is one of:\n"
 msgstr ""
 
-#: config/tc-mips.c:9231
+#: config/tc-mips.c:9303
 msgid ""
 "-mCPU\t\t\tequivalent to -mcpu=CPU.\n"
 "-no-mCPU\t\tdon't generate code specific to CPU.\n"
 "\t\t\tFor -mCPU and -no-mCPU, CPU must be one of:\n"
 msgstr ""
 
-#: config/tc-mips.c:9244
+#: config/tc-mips.c:9316
 msgid ""
 "-mips16\t\t\tgenerate mips16 instructions\n"
 "-no-mips16\t\tdo not generate mips16 instructions\n"
 msgstr ""
 
-#: config/tc-mips.c:9247
+#: config/tc-mips.c:9319
 msgid ""
 "-O0\t\t\tremove unneeded NOPs, do not swap branches\n"
 "-O\t\t\tremove unneeded NOPs and swap branches\n"
@@ -4174,7 +4584,7 @@ msgid ""
 "--break, --no-trap\tbreak exception on div by 0 and mult overflow\n"
 msgstr ""
 
-#: config/tc-mips.c:9253
+#: config/tc-mips.c:9325
 msgid ""
 "-KPIC, -call_shared\tgenerate SVR4 position independent code\n"
 "-non_shared\t\tdo not generate position independent code\n"
@@ -4183,372 +4593,401 @@ msgid ""
 "-64\t\t\tcreate 64 bit object file\n"
 msgstr ""
 
-#: config/tc-mips.c:9310
+#: config/tc-mips.c:9382
 #, c-format
 msgid "Unsupported reloc size %d"
 msgstr ""
 
-#: config/tc-mips.c:9413
+#: config/tc-mips.c:9485
 msgid "Unmatched %%hi reloc"
 msgstr ""
 
-#: config/tc-mips.c:9518
+#: config/tc-mips.c:9590
 msgid "Invalid PC relative reloc"
 msgstr ""
 
-#: config/tc-mips.c:9617 config/tc-sparc.c:2617 config/tc-sparc.c:2624
-#: config/tc-sparc.c:2631 config/tc-sparc.c:2638 config/tc-sparc.c:2645
-#: config/tc-sparc.c:2654 config/tc-sparc.c:2665 config/tc-sparc.c:2691
-#: config/tc-sparc.c:2714 write.c:972 write.c:1036
+#: config/tc-mips.c:9690 config/tc-sparc.c:2915 config/tc-sparc.c:2922
+#: config/tc-sparc.c:2929 config/tc-sparc.c:2936 config/tc-sparc.c:2943
+#: config/tc-sparc.c:2952 config/tc-sparc.c:2963 config/tc-sparc.c:2989
+#: config/tc-sparc.c:3017 write.c:971 write.c:1035
 msgid "relocation overflow"
 msgstr ""
 
-#: config/tc-mips.c:9633
+#: config/tc-mips.c:9706
 #, c-format
 msgid "Branch to odd address (%lx)"
 msgstr ""
 
-#: config/tc-mips.c:9788
+#: config/tc-mips.c:9861
 #, c-format
 msgid "%08lx  UNDEFINED\n"
 msgstr ""
 
-#: config/tc-mips.c:9854
+#: config/tc-mips.c:9927
 msgid "Alignment negative: 0 assumed."
 msgstr ""
 
-#: config/tc-mips.c:9942
+#: config/tc-mips.c:10015
 msgid "No read only data section in this object file format"
 msgstr ""
 
-#: config/tc-mips.c:9965
+#: config/tc-mips.c:10038
 msgid "Global pointers not supported; recompile -G 0"
 msgstr ""
 
-#: config/tc-mips.c:10051
+#: config/tc-mips.c:10124
 #, c-format
 msgid "%s: no such section"
 msgstr ""
 
-#: config/tc-mips.c:10088
+#: config/tc-mips.c:10161
 #, c-format
 msgid ".option pic%d not supported"
 msgstr ""
 
-#: config/tc-mips.c:10099
+#: config/tc-mips.c:10172
 #, c-format
 msgid "Unrecognized option \"%s\""
 msgstr ""
 
-#: config/tc-mips.c:10162
+#: config/tc-mips.c:10235
 msgid "`noreorder' must be set before `nomacro'"
 msgstr ""
 
-#: config/tc-mips.c:10197
+#: config/tc-mips.c:10270
 msgid "unknown ISA level"
 msgstr ""
 
-#: config/tc-mips.c:10220
+#: config/tc-mips.c:10293
 msgid ".set pop with no .set push"
 msgstr ""
 
-#: config/tc-mips.c:10244
+#: config/tc-mips.c:10317
 #, c-format
 msgid "Tried to set unrecognized symbol: %s\n"
 msgstr ""
 
-#: config/tc-mips.c:10294
+#: config/tc-mips.c:10367
 msgid ".cpload not in noreorder section"
 msgstr ""
 
-#: config/tc-mips.c:10376
+#: config/tc-mips.c:10449
 msgid "Unsupported use of .gpword"
 msgstr ""
 
-#: config/tc-mips.c:10513
+#: config/tc-mips.c:10586
 msgid "expected `$'"
 msgstr ""
 
-#: config/tc-mips.c:10521
+#: config/tc-mips.c:10594
 msgid "Bad register number"
 msgstr ""
 
-#: config/tc-mips.c:10537
+#: config/tc-mips.c:10610
 msgid "Unrecognized register name"
 msgstr ""
 
-#: config/tc-mips.c:10734
+#: config/tc-mips.c:10809
 msgid "unsupported PC relative reference to different section"
 msgstr ""
 
-#: config/tc-mips.c:10843
+#: config/tc-mips.c:10918
 msgid "unsupported relocation"
 msgstr ""
 
-#: config/tc-mips.c:10926
+#: config/tc-mips.c:11001
 msgid "AT used after \".set noat\" or macro used after \".set nomacro\""
 msgstr ""
 
-#: config/tc-mips.c:10989
+#: config/tc-mips.c:11064
 msgid "Double check fx_r_type in tc-mips.c:tc_gen_reloc"
 msgstr ""
 
-#: config/tc-mips.c:11470
+#: config/tc-mips.c:11575
 msgid "missing `.end' at end of assembly"
 msgstr ""
 
-#: config/tc-mips.c:11485
+#: config/tc-mips.c:11590
 msgid "Expected simple number."
 msgstr ""
 
-#: config/tc-mips.c:11511
+#: config/tc-mips.c:11616
 #, c-format
 msgid " *input_line_pointer == '%c' 0x%02x\n"
 msgstr ""
 
-#: config/tc-mips.c:11513
+#: config/tc-mips.c:11618
 msgid "Invalid number"
 msgstr ""
 
-#: config/tc-mips.c:11568
+#: config/tc-mips.c:11673
 msgid ".end not in text section"
 msgstr ""
 
-#: config/tc-mips.c:11572
+#: config/tc-mips.c:11677
 msgid ".end directive without a preceding .ent directive."
 msgstr ""
 
-#: config/tc-mips.c:11581
+#: config/tc-mips.c:11686
 msgid ".end symbol does not match .ent symbol."
 msgstr ""
 
-#: config/tc-mips.c:11584
+#: config/tc-mips.c:11689
 msgid ".end directive missing or unknown symbol"
 msgstr ""
 
-#: config/tc-mips.c:11659
+#: config/tc-mips.c:11764
 msgid ".ent or .aent not in text section."
 msgstr ""
 
-#: config/tc-mips.c:11662
+#: config/tc-mips.c:11767
 msgid "missing `.end'"
 msgstr ""
 
-#: config/tc-mips.c:11695 ecoff.c:3226
+#: config/tc-mips.c:11800 ecoff.c:3227
 msgid ".frame outside of .ent"
 msgstr ""
 
-#: config/tc-mips.c:11706 ecoff.c:3237
+#: config/tc-mips.c:11811 ecoff.c:3238
 msgid "Bad .frame directive"
 msgstr ""
 
-#: config/tc-mips.c:11736
+#: config/tc-mips.c:11841
 msgid ".mask/.fmask outside of .ent"
 msgstr ""
 
-#: config/tc-mips.c:11743
+#: config/tc-mips.c:11848
 msgid "Bad .mask/.fmask directive"
 msgstr ""
 
-#: config/tc-mn10200.c:314
+#: config/tc-mn10200.c:313
 msgid ""
 "MN10200 options:\n"
 "none yet\n"
 msgstr ""
 
-#: config/tc-mn10200.c:789 config/tc-mn10300.c:750 config/tc-ppc.c:1613
+#: config/tc-mn10200.c:788 config/tc-mn10300.c:912 config/tc-ppc.c:1614
 #: config/tc-v850.c:1691
 #, c-format
 msgid "Unrecognized opcode: `%s'"
 msgstr ""
 
-#: config/tc-mn10300.c:333
+#: config/tc-mn10300.c:495
 msgid ""
 "MN10300 options:\n"
 "none yet\n"
 msgstr ""
 
-#: config/tc-mn10300.c:768
+#: config/tc-mn10300.c:930
 msgid "Invalid opcode/operands"
 msgstr ""
 
-#: config/tc-mn10300.c:1099
+#: config/tc-mn10300.c:1406
 msgid "Invalid register specification."
 msgstr ""
 
-#: config/tc-ns32k.c:443
+#: config/tc-ns32k.c:444
 msgid "Invalid syntax in PC-relative addressing mode"
 msgstr ""
 
-#: config/tc-ns32k.c:467
+#: config/tc-ns32k.c:468
 msgid "Invalid syntax in External addressing mode"
 msgstr ""
 
-#: config/tc-ns32k.c:536
+#: config/tc-ns32k.c:537
 msgid "Invalid syntax in Memory Relative addressing mode"
 msgstr ""
 
-#: config/tc-ns32k.c:603
+#: config/tc-ns32k.c:604
 msgid "Invalid scaled-indexed mode, use (b,w,d,q)"
 msgstr ""
 
-#: config/tc-ns32k.c:608
+#: config/tc-ns32k.c:609
 msgid "Syntax in scaled-indexed mode, use [Rn:m] where n=[0..7] m={b,w,d,q}"
 msgstr ""
 
-#: config/tc-ns32k.c:614
+#: config/tc-ns32k.c:615
 msgid "Scaled-indexed addressing mode combined with scaled-index"
 msgstr ""
 
-#: config/tc-ns32k.c:623
+#: config/tc-ns32k.c:624
 msgid "Invalid or illegal addressing mode combined with scaled-index"
 msgstr ""
 
-#: config/tc-ns32k.c:730
+#: config/tc-ns32k.c:731
 msgid "Premature end of suffix -- Defaulting to d"
 msgstr ""
 
-#: config/tc-ns32k.c:743
+#: config/tc-ns32k.c:744
 msgid "Bad suffix after ':' use {b|w|d} Defaulting to d"
 msgstr ""
 
-#: config/tc-ns32k.c:784
+#: config/tc-ns32k.c:785
 msgid "Very short instr to option, ie you can't do it on a NULLstr"
 msgstr ""
 
-#: config/tc-ns32k.c:828
+#: config/tc-ns32k.c:829
 msgid "No such entry in list. (cpu/mmu register)"
 msgstr ""
 
-#: config/tc-ns32k.c:869
+#: config/tc-ns32k.c:870
 msgid "Internal consistency error.  check ns32k-opcode.h"
 msgstr ""
 
-#: config/tc-ns32k.c:890
+#: config/tc-ns32k.c:891
 msgid "Address of immediate operand"
 msgstr ""
 
-#: config/tc-ns32k.c:891
+#: config/tc-ns32k.c:892
 msgid "Invalid immediate write operand."
 msgstr ""
 
-#: config/tc-ns32k.c:1018
+#: config/tc-ns32k.c:1019
 msgid "Bad opcode-table-option, check in file ns32k-opcode.h"
 msgstr ""
 
-#: config/tc-ns32k.c:1047
+#: config/tc-ns32k.c:1048
 msgid "No such opcode"
 msgstr ""
 
-#: config/tc-ns32k.c:1115
+#: config/tc-ns32k.c:1116
 msgid "Bad suffix, defaulting to d"
 msgstr ""
 
-#: config/tc-ns32k.c:1137
+#: config/tc-ns32k.c:1138
 msgid "Too many operands passed to instruction"
 msgstr ""
 
 #. check error in default
-#: config/tc-ns32k.c:1148
+#: config/tc-ns32k.c:1149
 msgid "Wrong numbers of operands in default, check ns32k-opcodes.h"
 msgstr ""
 
-#: config/tc-ns32k.c:1153
+#: config/tc-ns32k.c:1154
 msgid "Wrong number of operands"
 msgstr ""
 
-#: config/tc-ns32k.c:1272
+#: config/tc-ns32k.c:1273
 msgid "iif convert internal pcrel/binary"
 msgstr ""
 
-#: config/tc-ns32k.c:1288
+#: config/tc-ns32k.c:1289
 msgid "Bignum too big for long"
 msgstr ""
 
-#: config/tc-ns32k.c:1363
+#: config/tc-ns32k.c:1364
 msgid "iif convert internal pcrel/pointer"
 msgstr ""
 
-#: config/tc-ns32k.c:1368
+#: config/tc-ns32k.c:1369
 msgid "Internal logic error in iif.iifP[n].type"
 msgstr ""
 
 #. We cant relax this case
-#: config/tc-ns32k.c:1402
+#: config/tc-ns32k.c:1403
 msgid "Can't relax difference"
 msgstr ""
 
-#: config/tc-ns32k.c:1451
+#: config/tc-ns32k.c:1452
 msgid "Displacement to large for :d"
 msgstr ""
 
-#: config/tc-ns32k.c:1462
+#: config/tc-ns32k.c:1463
 msgid "Internal logic error in iif.iifP[].type"
 msgstr ""
 
-#: config/tc-ns32k.c:1517
+#: config/tc-ns32k.c:1518
 #, c-format
 msgid "Can not do %d byte pc-relative relocation for storage type %d"
 msgstr ""
 
-#: config/tc-ns32k.c:1520
+#: config/tc-ns32k.c:1521
 #, c-format
 msgid "Can not do %d byte relocation for storage type %d"
 msgstr ""
 
-#: config/tc-ns32k.c:1552
+#: config/tc-ns32k.c:1553
 #, c-format
 msgid "Can't hash %s: %s"
 msgstr ""
 
-#: config/tc-ns32k.c:1636
+#: config/tc-ns32k.c:1637
 msgid "Byte displacement out of range.  line number not valid"
 msgstr ""
 
-#: config/tc-ns32k.c:1645
+#: config/tc-ns32k.c:1646
 msgid "Word displacement out of range.  line number not valid"
 msgstr ""
 
-#: config/tc-ns32k.c:1659
+#: config/tc-ns32k.c:1660
 msgid "Double word displacement out of range"
 msgstr ""
 
-#: config/tc-ns32k.c:1679
+#: config/tc-ns32k.c:1680
 #, c-format
 msgid "Internal logic error.  line %s, file \"%s\""
 msgstr ""
 
-#: config/tc-ns32k.c:1727
+#: config/tc-ns32k.c:1728
 #, c-format
 msgid "Internal logic error. line %s, file \"%s\""
 msgstr ""
 
-#: config/tc-ns32k.c:1838
+#: config/tc-ns32k.c:1839
 msgid "Bit field out of range"
 msgstr ""
 
-#: config/tc-ns32k.c:2087
+#: config/tc-ns32k.c:2088
 #, c-format
 msgid "invalid architecture option -m%s"
 msgstr ""
 
-#: config/tc-ns32k.c:2103
+#: config/tc-ns32k.c:2104
 msgid ""
 "NS32K options:\n"
 "-m32032 | -m32532\tselect variant of NS32K architecture\n"
 msgstr ""
 
-#: config/tc-ns32k.c:2282
+#: config/tc-ns32k.c:2284
 #, c-format
 msgid "Cannot find relocation type for symbol %s, code %d"
 msgstr ""
 
-#: config/tc-ppc.c:834
+#: config/tc-pj.c:70 config/tc-pj.c:78
+msgid "confusing relocation expressions"
+msgstr ""
+
+#: config/tc-pj.c:172
+msgid "can't have relocation for ipush"
+msgstr ""
+
+#: config/tc-pj.c:282
+#, c-format
+msgid "unknown opcode %s"
+msgstr ""
+
+#: config/tc-pj.c:431
+msgid ""
+"PJ options:\n"
+"-little\t\t\tgenerate little endian code\n"
+"-big\t\t\tgenerate big endian code\n"
+msgstr ""
+
+#: config/tc-pj.c:472 config/tc-sh.c:2570 config/tc-sh.c:2577
+#: config/tc-sh.c:2584 config/tc-sh.c:2591
+msgid "pcrel too far"
+msgstr ""
+
+#: config/tc-pj.c:541 config/tc-sh.c:2663
+msgid "offset out of range"
+msgstr ""
+
+#: config/tc-ppc.c:835
 #, c-format
 msgid "invalid switch -m%s"
 msgstr ""
 
-#: config/tc-ppc.c:871
+#: config/tc-ppc.c:872
 msgid ""
 "PowerPC options:\n"
 "-u\t\t\tignored\n"
@@ -4565,7 +5004,7 @@ msgid ""
 "-mno-regnames\t\tDo not allow symbolic names for registers\n"
 msgstr ""
 
-#: config/tc-ppc.c:886
+#: config/tc-ppc.c:887
 msgid ""
 "-mrelocatable\t\tsupport for GCC's -mrelocatble option\n"
 "-mrelocatable-lib\tsupport for GCC's -mrelocatble-lib option\n"
@@ -4579,239 +5018,305 @@ msgid ""
 "-Qy, -Qn\t\tignored\n"
 msgstr ""
 
-#: config/tc-ppc.c:921
+#: config/tc-ppc.c:922
 #, c-format
 msgid "Unknown default cpu = %s, os = %s"
 msgstr ""
 
-#: config/tc-ppc.c:946
+#: config/tc-ppc.c:947
 msgid "Neither Power nor PowerPC opcodes were selected."
 msgstr ""
 
-#: config/tc-ppc.c:994
+#: config/tc-ppc.c:995
 #, c-format
 msgid "Internal assembler error for instruction %s"
 msgstr ""
 
-#: config/tc-ppc.c:1013
+#: config/tc-ppc.c:1014
 #, c-format
 msgid "Internal assembler error for macro %s"
 msgstr ""
 
-#: config/tc-ppc.c:1223
+#: config/tc-ppc.c:1224
 msgid "identifier+constant@got means identifier@got+constant"
 msgstr ""
 
-#: config/tc-ppc.c:1277
+#: config/tc-ppc.c:1278
 #, c-format
 msgid "%s relocations do not fit in %d bytes\n"
 msgstr ""
 
-#: config/tc-ppc.c:1377
+#: config/tc-ppc.c:1378
 #, c-format
 msgid "Length of .lcomm \"%s\" is already %ld. Not changed to %ld."
 msgstr ""
 
-#: config/tc-ppc.c:1459
+#: config/tc-ppc.c:1460
 msgid "Relocation cannot be done when using -mrelocatable"
 msgstr ""
 
-#: config/tc-ppc.c:1540
+#: config/tc-ppc.c:1541
 #, c-format
 msgid "syntax error: invalid toc specifier `%s'"
 msgstr ""
 
-#: config/tc-ppc.c:1554
+#: config/tc-ppc.c:1555
 #, c-format
 msgid "syntax error: expected `]', found  `%c'"
 msgstr ""
 
-#: config/tc-ppc.c:1788
+#: config/tc-ppc.c:1790
 msgid "[tocv] symbol is not a toc symbol"
 msgstr ""
 
-#: config/tc-ppc.c:1799
+#: config/tc-ppc.c:1801
 msgid "Unimplemented toc32 expression modifier"
 msgstr ""
 
-#: config/tc-ppc.c:1804
+#: config/tc-ppc.c:1806
 msgid "Unimplemented toc64 expression modifier"
 msgstr ""
 
-#: config/tc-ppc.c:1808
+#: config/tc-ppc.c:1810
 #, c-format
 msgid "Unexpected return value [%d] from parse_toc_entry!\n"
 msgstr ""
 
-#: config/tc-ppc.c:1960
+#: config/tc-ppc.c:1963
 #, c-format
 msgid "syntax error; found `%c' but expected `%c'"
 msgstr ""
 
-#: config/tc-ppc.c:2068
+#: config/tc-ppc.c:2071
 msgid "wrong number of operands"
 msgstr ""
 
-#: config/tc-ppc.c:2124
+#: config/tc-ppc.c:2127
 msgid "Bad .section directive: want a,w,x,e in string"
 msgstr ""
 
-#: config/tc-ppc.c:2242
+#: config/tc-ppc.c:2241
 msgid "missing size"
 msgstr ""
 
-#: config/tc-ppc.c:2251
+#: config/tc-ppc.c:2250
 msgid "negative size"
 msgstr ""
 
-#: config/tc-ppc.c:2292
+#: config/tc-ppc.c:2291
 msgid "missing real symbol name"
 msgstr ""
 
-#: config/tc-ppc.c:2313
+#: config/tc-ppc.c:2312
 msgid "attempt to redefine symbol"
 msgstr ""
 
-#: config/tc-ppc.c:2544
+#: config/tc-ppc.c:2546
 msgid "The XCOFF file format does not support arbitrary sections"
 msgstr ""
 
-#: config/tc-ppc.c:2652 config/tc-ppc.c:3164 read.c:2950
+#: config/tc-ppc.c:2654 config/tc-ppc.c:3171 read.c:2976
 msgid "missing value"
 msgstr ""
 
-#: config/tc-ppc.c:2670
+#: config/tc-ppc.c:2672
 msgid "illegal .stabx expression; zero assumed"
 msgstr ""
 
-#: config/tc-ppc.c:2702
+#: config/tc-ppc.c:2704
 msgid "missing class"
 msgstr ""
 
-#: config/tc-ppc.c:2711
+#: config/tc-ppc.c:2713
 msgid "missing type"
 msgstr ""
 
-#: config/tc-ppc.c:2772
+#: config/tc-ppc.c:2774
 msgid "missing symbol name"
 msgstr ""
 
-#: config/tc-ppc.c:2944
+#: config/tc-ppc.c:2950
 msgid "nested .bs blocks"
 msgstr ""
 
-#: config/tc-ppc.c:2977
+#: config/tc-ppc.c:2983
 msgid ".es without preceding .bs"
 msgstr ""
 
-#: config/tc-ppc.c:3156
+#: config/tc-ppc.c:3163
 msgid "non-constant byte count"
 msgstr ""
 
-#: config/tc-ppc.c:3201
+#: config/tc-ppc.c:3208
 msgid ".tc not in .toc section"
 msgstr ""
 
-#: config/tc-ppc.c:3220
+#: config/tc-ppc.c:3227
 msgid ".tc with no label"
 msgstr ""
 
-#: config/tc-ppc.c:3295
+#: config/tc-ppc.c:3302
 msgid "No previous section to return to. Directive ignored."
 msgstr ""
 
 #. Section Contents
 #. unknown
-#: config/tc-ppc.c:3714
+#: config/tc-ppc.c:3721
 msgid "Unsupported section attribute -- 'a'"
 msgstr ""
 
-#: config/tc-ppc.c:3904
+#: config/tc-ppc.c:3911
 msgid "bad symbol suffix"
 msgstr ""
 
-#: config/tc-ppc.c:3995
+#: config/tc-ppc.c:4004
 msgid "Unrecognized symbol suffix"
 msgstr ""
 
-#: config/tc-ppc.c:4077
+#: config/tc-ppc.c:4086
 msgid "two .function pseudo-ops with no intervening .ef"
 msgstr ""
 
-#: config/tc-ppc.c:4089
+#: config/tc-ppc.c:4099
 msgid ".ef with no preceding .function"
 msgstr ""
 
-#: config/tc-ppc.c:4217
+#: config/tc-ppc.c:4227
 #, c-format
 msgid "warning: symbol %s has no csect"
 msgstr ""
 
-#: config/tc-ppc.c:4513
+#: config/tc-ppc.c:4528
 msgid "symbol in .toc does not match any .tc"
 msgstr ""
 
-#: config/tc-ppc.c:4810
+#: config/tc-ppc.c:4826
 msgid "unsupported relocation type"
 msgstr ""
 
-#: config/tc-ppc.c:4864
+#: config/tc-ppc.c:4880
 #, c-format
 msgid "cannot emit PC relative %s relocation against %s"
 msgstr ""
 
-#: config/tc-ppc.c:4869
+#: config/tc-ppc.c:4885
 #, c-format
 msgid "cannot emit PC relative %s relocation"
 msgstr ""
 
-#: config/tc-ppc.c:4931
+#: config/tc-ppc.c:4947
 msgid "must branch to an address a multiple of 4"
 msgstr ""
 
-#: config/tc-ppc.c:4935
+#: config/tc-ppc.c:4951
 #, c-format
 msgid "@local or @plt branch destination is too far away, %ld bytes"
 msgstr ""
 
-#: config/tc-ppc.c:4959
+#: config/tc-ppc.c:4975
 #, c-format
 msgid "Gas failure, reloc value %d\n"
 msgstr ""
 
-#: config/tc-sh.c:521
+#: config/tc-sh.c:671
 msgid "illegal register after @-"
 msgstr ""
 
-#: config/tc-sh.c:537
+#: config/tc-sh.c:687
 msgid "must be @(r0,...)"
 msgstr ""
 
-#: config/tc-sh.c:553
+#: config/tc-sh.c:703
 msgid "syntax error in @(r0,...)"
 msgstr ""
 
-#: config/tc-sh.c:585 config/tc-sh.c:590
+#: config/tc-sh.c:735 config/tc-sh.c:740
 msgid "syntax error in @(disp,[Rn, gbr, pc])"
 msgstr ""
 
-#: config/tc-sh.c:595
+#: config/tc-sh.c:745
 msgid "expecting )"
 msgstr ""
 
-#: config/tc-sh.c:604
+#: config/tc-sh.c:754
 msgid "illegal register after @"
 msgstr ""
 
-#: config/tc-sh.c:1228
+#: config/tc-sh.c:1256
+#, c-format
+msgid "Invalid register: 'r%d'"
+msgstr ""
+
+#: config/tc-sh.c:1392
+msgid "insn can't be combined with parallel processing insn"
+msgstr ""
+
+#: config/tc-sh.c:1399 config/tc-sh.c:1410
+msgid "multiple movx specifications"
+msgstr ""
+
+#: config/tc-sh.c:1404 config/tc-sh.c:1431
+msgid "multiple movy specifications"
+msgstr ""
+
+#: config/tc-sh.c:1412
+msgid "invalid movx address register"
+msgstr ""
+
+#: config/tc-sh.c:1418 config/tc-sh.c:1423
+msgid "invalid movx dsp register"
+msgstr ""
+
+#: config/tc-sh.c:1440 config/tc-sh.c:1445
+msgid "invalid movy dsp register"
+msgstr ""
+
+#: config/tc-sh.c:1449
+msgid "invalid movy address register"
+msgstr ""
+
+#: config/tc-sh.c:1455
+msgid "dsp immediate shift value not constant"
+msgstr ""
+
+#: config/tc-sh.c:1462 config/tc-sh.c:1475
+msgid "multiple parallel processing specifications"
+msgstr ""
+
+#: config/tc-sh.c:1468
+msgid "multiple condition specifications"
+msgstr ""
+
+#: config/tc-sh.c:1484
+msgid "insn cannot be combined with pmuls"
+msgstr ""
+
+#: config/tc-sh.c:1501
+msgid "bad padd / psub pmuls output operand"
+msgstr ""
+
+#: config/tc-sh.c:1511
+msgid "condition not followed by conditionalizable insn"
+msgstr ""
+
+#: config/tc-sh.c:1521
+msgid "unrecognized characters at end of parallel processing insn"
+msgstr ""
+
+#: config/tc-sh.c:1631
+#, c-format
+msgid "excess operands: '%s'"
+msgstr ""
+
+#: config/tc-sh.c:1777
 msgid ".uses pseudo-op seen when not relaxing"
 msgstr ""
 
-#: config/tc-sh.c:1234
+#: config/tc-sh.c:1783
 msgid "bad .uses format"
 msgstr ""
 
-#: config/tc-sh.c:1289
+#: config/tc-sh.c:1844
 msgid ""
 "SH options:\n"
 "-little\t\t\tgenerate little endian code\n"
@@ -4819,113 +5324,104 @@ msgid ""
 "-small\t\t\talign sections to 4 byte boundaries, not 16\n"
 msgstr ""
 
-#: config/tc-sh.c:1299 config/tc-w65.c:883
+#: config/tc-sh.c:1854 config/tc-w65.c:883
 msgid "call to tc_Nout_fix_to_chars \n"
 msgstr ""
 
-#: config/tc-sh.c:1385
+#: config/tc-sh.c:1940
 msgid ".uses does not refer to a local symbol in the same section"
 msgstr ""
 
-#: config/tc-sh.c:1404
+#: config/tc-sh.c:1959
 msgid "can't find fixup pointed to by .uses"
 msgstr ""
 
-#: config/tc-sh.c:1427
+#: config/tc-sh.c:1982
 msgid ".uses target does not refer to a local symbol in the same section"
 msgstr ""
 
-#: config/tc-sh.c:1524
+#: config/tc-sh.c:2079
 #, c-format
 msgid "at 0x%lx, displacement overflows 12-bit field"
 msgstr ""
 
-#: config/tc-sh.c:1527
+#: config/tc-sh.c:2082
 #, c-format
 msgid "at 0x%lx, displacement to defined symbol %s overflows 12-bit field"
 msgstr ""
 
-#: config/tc-sh.c:1531
+#: config/tc-sh.c:2086
 #, c-format
 msgid "at 0x%lx, displacement to undefined symbol %s overflows 12-bit field"
 msgstr ""
 
-#: config/tc-sh.c:1647
+#: config/tc-sh.c:2202
 #, c-format
 msgid "at 0x%lx, displacement overflows 8-bit field"
 msgstr ""
 
-#: config/tc-sh.c:1650
+#: config/tc-sh.c:2205
 #, c-format
 msgid "at 0x%lx, displacement to defined symbol %s overflows 8-bit field "
 msgstr ""
 
-#: config/tc-sh.c:1654
+#: config/tc-sh.c:2209
 #, c-format
 msgid "at 0x%lx, displacement to undefined symbol %s overflows 8-bit field "
 msgstr ""
 
-#: config/tc-sh.c:1707
+#: config/tc-sh.c:2262
 #, c-format
 msgid "overflow in branch to %s; converted into longer instruction sequence"
 msgstr ""
 
-#: config/tc-sh.c:1782 config/tc-sh.c:1810 config/tc-sparc.c:3436
-#: config/tc-sparc.c:3455
+#: config/tc-sh.c:2337 config/tc-sh.c:2365 config/tc-sparc.c:3892
+#: config/tc-sparc.c:3911
 msgid "misaligned data"
 msgstr ""
 
-#: config/tc-sh.c:1988 config/tc-sh.c:1995 config/tc-sh.c:2002
-#: config/tc-sh.c:2009
-msgid "pcrel too far"
-msgstr ""
-
-#: config/tc-sh.c:2073
+#: config/tc-sh.c:2655
 msgid "misaligned offset"
 msgstr ""
 
-#: config/tc-sh.c:2081
-msgid "offset out of range"
-msgstr ""
-
-#: config/tc-sparc.c:257
+#: config/tc-sparc.c:268
 msgid "Invalid default architecture, broken assembler."
 msgstr ""
 
-#: config/tc-sparc.c:261 config/tc-sparc.c:448
+#: config/tc-sparc.c:272 config/tc-sparc.c:463
 msgid "Bad opcode table, broken assembler."
 msgstr ""
 
-#: config/tc-sparc.c:427
+#: config/tc-sparc.c:442
 #, c-format
 msgid "invalid architecture -xarch=%s"
 msgstr ""
 
-#: config/tc-sparc.c:442
+#: config/tc-sparc.c:457
 #, c-format
 msgid "invalid architecture -A%s"
 msgstr ""
 
-#: config/tc-sparc.c:509
+#: config/tc-sparc.c:524
 #, c-format
 msgid "No compiled in support for %d bit object file format"
 msgstr ""
 
-#: config/tc-sparc.c:546
+#: config/tc-sparc.c:561
 msgid "Unrecognized option following -K"
 msgstr ""
 
-#: config/tc-sparc.c:570
+#: config/tc-sparc.c:589
 msgid "SPARC options:\n"
 msgstr ""
 
-#: config/tc-sparc.c:578
+#: config/tc-sparc.c:597
 msgid ""
 "\n"
 "-xarch=v8plus | -xarch=v8plusa\n"
 msgstr ""
 
-#: config/tc-sparc.c:579
+#: config/tc-sparc.c:598
 msgid ""
 "\t\t\tspecify variant of SPARC architecture\n"
 "-bump\t\t\twarn when assembler switches architectures\n"
@@ -4933,34 +5429,34 @@ msgid ""
 "--enforce-aligned-data\tforce .long, etc., to be aligned correctly\n"
 msgstr ""
 
-#: config/tc-sparc.c:585
+#: config/tc-sparc.c:604
 msgid "-k\t\t\tgenerate PIC\n"
 msgstr ""
 
-#: config/tc-sparc.c:589
+#: config/tc-sparc.c:608
 msgid ""
 "-32\t\t\tcreate 32 bit object file\n"
 "-64\t\t\tcreate 64 bit object file\n"
 msgstr ""
 
-#: config/tc-sparc.c:592
+#: config/tc-sparc.c:611
 #, c-format
 msgid "\t\t\t[default is %d]\n"
 msgstr ""
 
-#: config/tc-sparc.c:594
+#: config/tc-sparc.c:613
 msgid ""
 "-TSO\t\t\tuse Total Store Ordering\n"
 "-PSO\t\t\tuse Partial Store Ordering\n"
 "-RMO\t\t\tuse Relaxed Memory Ordering\n"
 msgstr ""
 
-#: config/tc-sparc.c:598
+#: config/tc-sparc.c:617
 #, c-format
 msgid "\t\t\t[default is %s]\n"
 msgstr ""
 
-#: config/tc-sparc.c:600
+#: config/tc-sparc.c:619
 msgid ""
 "-KPIC\t\t\tgenerate PIC\n"
 "-V\t\t\tprint assembler version number\n"
@@ -4969,7 +5465,7 @@ msgid ""
 "-s\t\t\tignored\n"
 msgstr ""
 
-#: config/tc-sparc.c:608
+#: config/tc-sparc.c:627
 msgid ""
 "-EL\t\t\tgenerate code for a little endian machine\n"
 "-EB\t\t\tgenerate code for a big endian machine\n"
@@ -4977,168 +5473,222 @@ msgid ""
 "                        instructions and little endian data."
 msgstr ""
 
-#: config/tc-sparc.c:856
-msgid "Support for 64-bit arithmetic not compiled in."
+#: config/tc-sparc.c:744
+#, c-format
+msgid "Internal error: losing opcode: `%s' \"%s\"\n"
+msgstr ""
+
+#: config/tc-sparc.c:762
+#, c-format
+msgid "Internal error: can't find opcode `%s' for `%s'\n"
 msgstr ""
 
 #: config/tc-sparc.c:911
-msgid "FP branch in delay slot"
+msgid "Support for 64-bit arithmetic not compiled in."
 msgstr ""
 
-#: config/tc-sparc.c:927
-msgid "FP branch preceded by FP instruction; NOP inserted"
+#: config/tc-sparc.c:957
+msgid "set: number not in 0..4294967295 range"
 msgstr ""
 
-#: config/tc-sparc.c:947
-msgid "set: used with negative number"
+#: config/tc-sparc.c:964
+msgid "set: number not in -2147483648..4294967295 range"
 msgstr ""
 
-#: config/tc-sparc.c:949
-msgid "set: number larger than 4294967295"
+#: config/tc-sparc.c:1024
+msgid "setsw: number not in -2147483648..4294967295 range"
 msgstr ""
 
-#: config/tc-sparc.c:1000
+#: config/tc-sparc.c:1072
 msgid "setx: temporary register same as destination register"
 msgstr ""
 
-#: config/tc-sparc.c:1145
+#: config/tc-sparc.c:1142
+msgid "setx: illegal temporary register g0"
+msgstr ""
+
+#: config/tc-sparc.c:1239
+msgid "FP branch in delay slot"
+msgstr ""
+
+#: config/tc-sparc.c:1255
+msgid "FP branch preceded by FP instruction; NOP inserted"
+msgstr ""
+
+#: config/tc-sparc.c:1295
 msgid "failed special case insn sanity check"
 msgstr ""
 
-#: config/tc-sparc.c:1235
+#: config/tc-sparc.c:1386
 msgid ": invalid membar mask name"
 msgstr ""
 
-#: config/tc-sparc.c:1249
+#: config/tc-sparc.c:1400
 msgid ": invalid membar mask expression"
 msgstr ""
 
-#: config/tc-sparc.c:1254
+#: config/tc-sparc.c:1405
 msgid ": invalid membar mask number"
 msgstr ""
 
-#: config/tc-sparc.c:1272
+#: config/tc-sparc.c:1423
 msgid ": invalid prefetch function name"
 msgstr ""
 
-#: config/tc-sparc.c:1280
+#: config/tc-sparc.c:1431
 msgid ": invalid prefetch function expression"
 msgstr ""
 
-#: config/tc-sparc.c:1285
+#: config/tc-sparc.c:1436
 msgid ": invalid prefetch function number"
 msgstr ""
 
-#: config/tc-sparc.c:1313 config/tc-sparc.c:1325
+#: config/tc-sparc.c:1464 config/tc-sparc.c:1476
 msgid ": unrecognizable privileged register"
 msgstr ""
 
-#: config/tc-sparc.c:1349 config/tc-sparc.c:1366
+#: config/tc-sparc.c:1500 config/tc-sparc.c:1517
 msgid ": unrecognizable v9a ancillary state register"
 msgstr ""
 
-#: config/tc-sparc.c:1354
+#: config/tc-sparc.c:1505
 msgid ": rd on write only ancillary state register"
 msgstr ""
 
-#: config/tc-sparc.c:1390
+#: config/tc-sparc.c:1541
 msgid ": asr number must be between 16 and 31"
 msgstr ""
 
-#: config/tc-sparc.c:1398
+#: config/tc-sparc.c:1549
 msgid ": asr number must be between 0 and 31"
 msgstr ""
 
-#: config/tc-sparc.c:1408
+#: config/tc-sparc.c:1559
 msgid ": expecting %asrN"
 msgstr ""
 
-#: config/tc-sparc.c:1799
+#: config/tc-sparc.c:1887
+msgid "detected global register use not covered by .register pseudo-op"
+msgstr ""
+
+#: config/tc-sparc.c:1959
 msgid ": There are only 64 f registers; [0-63]"
 msgstr ""
 
-#: config/tc-sparc.c:1801 config/tc-sparc.c:1813
+#: config/tc-sparc.c:1961 config/tc-sparc.c:1973
 msgid ": There are only 32 f registers; [0-31]"
 msgstr ""
 
-#: config/tc-sparc.c:1982
+#: config/tc-sparc.c:2092 config/tc-sparc.c:2128
+msgid "Illegal operands: %%%s requires arguments in ()"
+msgstr ""
+
+#: config/tc-sparc.c:2140
+msgid ""
+"Illegal operands: Can't do arithmetics other than + and - involving %%%s()"
+msgstr ""
+
+#: config/tc-sparc.c:2249
+msgid "Illegal operands: Can't add non-constant expression to %%%s()"
+msgstr ""
+
+#: config/tc-sparc.c:2259
+msgid ""
+"Illegal operands: Can't do arithmetics involving %%%s() of a relocatable "
+"symbol"
+msgstr ""
+
+#: config/tc-sparc.c:2277
 msgid ": PC-relative operand can't be a constant"
 msgstr ""
 
-#: config/tc-sparc.c:2015
+#: config/tc-sparc.c:2310
 msgid ": invalid ASI name"
 msgstr ""
 
-#: config/tc-sparc.c:2023
+#: config/tc-sparc.c:2318
 msgid ": invalid ASI expression"
 msgstr ""
 
-#: config/tc-sparc.c:2028
+#: config/tc-sparc.c:2323
 msgid ": invalid ASI number"
 msgstr ""
 
-#: config/tc-sparc.c:2125
+#: config/tc-sparc.c:2420
 msgid "OPF immediate operand out of range (0-0x1ff)"
 msgstr ""
 
-#: config/tc-sparc.c:2130
+#: config/tc-sparc.c:2425
 msgid "non-immediate OPF operand, ignored"
 msgstr ""
 
-#: config/tc-sparc.c:2149
+#: config/tc-sparc.c:2444
 msgid ": invalid cpreg name"
 msgstr ""
 
-#: config/tc-sparc.c:2178
+#: config/tc-sparc.c:2473
 #, c-format
 msgid "Illegal operands%s"
 msgstr ""
 
-#: config/tc-sparc.c:2207
+#: config/tc-sparc.c:2502
 #, c-format
 msgid "architecture bumped from \"%s\" to \"%s\" on \"%s\""
 msgstr ""
 
-#: config/tc-sparc.c:2243
+#: config/tc-sparc.c:2538
 #, c-format
 msgid "Architecture mismatch on \"%s\"."
 msgstr ""
 
-#: config/tc-sparc.c:2244
+#: config/tc-sparc.c:2539
 #, c-format
 msgid " (Requires %s; requested architecture is %s.)"
 msgstr ""
 
-#: config/tc-sparc.c:2760
+#: config/tc-sparc.c:3063
 #, c-format
 msgid "bad or unhandled relocation type: 0x%02x"
 msgstr ""
 
-#: config/tc-sparc.c:3037
+#: config/tc-sparc.c:3365
 msgid "bad .reserve segment -- expected BSS segment"
 msgstr ""
 
-#: config/tc-sparc.c:3054
+#: config/tc-sparc.c:3382
 msgid "missing alignment"
 msgstr ""
 
-#: config/tc-sparc.c:3065 config/tc-sparc.c:3210
+#: config/tc-sparc.c:3393 config/tc-sparc.c:3538
 #, c-format
 msgid "alignment too large; assuming %d"
 msgstr ""
 
-#: config/tc-sparc.c:3071 config/tc-sparc.c:3216
+#: config/tc-sparc.c:3399 config/tc-sparc.c:3544
 msgid "negative alignment"
 msgstr ""
 
-#: config/tc-sparc.c:3081 config/tc-sparc.c:3239
+#: config/tc-sparc.c:3409 config/tc-sparc.c:3567
 msgid "alignment not a power of 2"
 msgstr ""
 
-#: config/tc-sparc.c:3196
+#: config/tc-sparc.c:3524
 msgid "Expected comma after common length"
 msgstr ""
 
+#: config/tc-sparc.c:3759 config/tc-sparc.c:3769
+msgid "register syntax is .register %%g[2367],{#scratch|symbolname|#ignore}"
+msgstr ""
+
+#: config/tc-sparc.c:3787
+msgid "redefinition of global register"
+msgstr ""
+
+#: config/tc-sparc.c:3798
+#, c-format
+msgid "Register symbol %s already defined."
+msgstr ""
+
 #: config/tc-tahoe.c:387
 msgid "The -a option doesn't exist. (Despite what the man page says!"
 msgstr ""
@@ -5874,214 +6424,210 @@ msgstr ""
 msgid "Can't close `%s'"
 msgstr ""
 
-#: ecoff.c:1576
+#: ecoff.c:1577
 #, c-format
 msgid "String too big (%lu bytes)"
 msgstr ""
 
-#: ecoff.c:1602
+#: ecoff.c:1603
 #, c-format
 msgid "Inserting \"%s\" into string hash table: %s"
 msgstr ""
 
-#: ecoff.c:1634 ecoff.c:1827 ecoff.c:1853 ecoff.c:1885 ecoff.c:2041
-#: ecoff.c:2155
+#: ecoff.c:1635 ecoff.c:1828 ecoff.c:1854 ecoff.c:1886 ecoff.c:2042
+#: ecoff.c:2156
 msgid "no current file pointer"
 msgstr ""
 
-#: ecoff.c:1721
+#: ecoff.c:1722
 msgid "too many st_End's"
 msgstr ""
 
-#: ecoff.c:2067
+#: ecoff.c:2068
 #, c-format
 msgid "Inserting \"%s\" into tag hash table: %s"
 msgstr ""
 
-#: ecoff.c:2233
+#: ecoff.c:2234
 msgid "fake .file after real one"
 msgstr ""
 
-#: ecoff.c:2321
+#: ecoff.c:2322
 msgid "Filename goes over one page boundary."
 msgstr ""
 
-#: ecoff.c:2456
+#: ecoff.c:2457
 msgid ".begin directive without a preceding .file directive"
 msgstr ""
 
-#: ecoff.c:2463
+#: ecoff.c:2464
 msgid ".begin directive without a preceding .ent directive"
 msgstr ""
 
-#: ecoff.c:2495
+#: ecoff.c:2496
 msgid ".bend directive without a preceding .file directive"
 msgstr ""
 
-#: ecoff.c:2502
+#: ecoff.c:2503
 msgid ".bend directive without a preceding .ent directive"
 msgstr ""
 
-#: ecoff.c:2515
+#: ecoff.c:2516
 msgid ".bend directive names unknown symbol"
 msgstr ""
 
-#: ecoff.c:2559
+#: ecoff.c:2560
 msgid ".def pseudo-op used inside of .def/.endef; ignored"
 msgstr ""
 
-#: ecoff.c:2561
+#: ecoff.c:2562
 msgid "Empty symbol name in .def; ignored"
 msgstr ""
 
-#: ecoff.c:2599
+#: ecoff.c:2600
 msgid ".dim pseudo-op used outside of .def/.endef; ignored"
 msgstr ""
 
-#: ecoff.c:2614
+#: ecoff.c:2615
 msgid "Badly formed .dim directive"
 msgstr ""
 
-#: ecoff.c:2627
+#: ecoff.c:2628
 msgid "Too many .dim entries"
 msgstr ""
 
-#: ecoff.c:2648
+#: ecoff.c:2649
 msgid ".scl pseudo-op used outside of .def/.endef; ignored"
 msgstr ""
 
-#: ecoff.c:2674
+#: ecoff.c:2675
 msgid ".size pseudo-op used outside of .def/.endef; ignored"
 msgstr ""
 
-#: ecoff.c:2689
+#: ecoff.c:2690
 msgid "Badly formed .size directive"
 msgstr ""
 
-#: ecoff.c:2702
+#: ecoff.c:2703
 msgid "Too many .size entries"
 msgstr ""
 
-#: ecoff.c:2725
+#: ecoff.c:2726
 msgid ".type pseudo-op used outside of .def/.endef; ignored"
 msgstr ""
 
 #. FIXME: We could handle this by setting the continued bit.
 #. There would still be a limit: the .type argument can not
 #. be infinite.
-#: ecoff.c:2743
+#: ecoff.c:2744
 #, c-format
 msgid "The type of %s is too complex; it will be simplified"
 msgstr ""
 
-#: ecoff.c:2754
+#: ecoff.c:2755
 msgid "Unrecognized .type argument"
 msgstr ""
 
-#: ecoff.c:2793
+#: ecoff.c:2794
 msgid ".tag pseudo-op used outside of .def/.endef; ignored"
 msgstr ""
 
-#: ecoff.c:2820
+#: ecoff.c:2821
 msgid ".val pseudo-op used outside of .def/.endef; ignored"
 msgstr ""
 
-#: ecoff.c:2828
+#: ecoff.c:2829
 msgid ".val expression is too copmlex"
 msgstr ""
 
-#: ecoff.c:2859
+#: ecoff.c:2860
 msgid ".endef pseudo-op used before .def; ignored"
 msgstr ""
 
-#: ecoff.c:2885
+#: ecoff.c:2886
 msgid "Bad COFF debugging info"
 msgstr ""
 
-#: ecoff.c:2934
+#: ecoff.c:2935
 #, c-format
 msgid "No tag specified for %s"
 msgstr ""
 
-#: ecoff.c:2966
+#: ecoff.c:2967
 msgid "Bad COFF debugging information"
 msgstr ""
 
-#: ecoff.c:3038
+#: ecoff.c:3039
 msgid ".end directive without a preceding .file directive"
 msgstr ""
 
-#: ecoff.c:3045
+#: ecoff.c:3046
 msgid ".end directive without a preceding .ent directive"
 msgstr ""
 
-#: ecoff.c:3068
+#: ecoff.c:3069
 msgid ".end directive names unknown symbol"
 msgstr ""
 
-#: ecoff.c:3097
+#: ecoff.c:3098
 msgid "second .ent directive found before .end directive"
 msgstr ""
 
-#: ecoff.c:3172
+#: ecoff.c:3173
 msgid "No way to handle .file within .ent/.end section"
 msgstr ""
 
-#: ecoff.c:3197
+#: ecoff.c:3198
 msgid ".fmask outside of .ent"
 msgstr ""
 
-#: ecoff.c:3266
+#: ecoff.c:3267
 msgid ".mask outside of .ent"
 msgstr ""
 
-#: ecoff.c:3296
+#: ecoff.c:3297
 msgid ".loc before .file"
 msgstr ""
 
-#: ecoff.c:3303
-msgid ".loc outside of .text"
-msgstr ""
-
-#: ecoff.c:3422
+#: ecoff.c:3423
 #, c-format
 msgid "Ignoring attempt to redefine symbol `%s'."
 msgstr ""
 
-#: ecoff.c:3435
+#: ecoff.c:3436
 msgid "bad .weakext directive"
 msgstr ""
 
-#: ecoff.c:3504
+#: ecoff.c:3505
 #, c-format
 msgid ".stab%c is not supported"
 msgstr ""
 
-#: ecoff.c:3514
+#: ecoff.c:3515
 #, c-format
 msgid ".stab%c: ignoring non-zero other field"
 msgstr ""
 
-#: ecoff.c:3548
+#: ecoff.c:3549
 #, c-format
 msgid ""
 "Line number (%d) for .stab%c directive cannot fit in index field (20 bits)"
 msgstr ""
 
-#: ecoff.c:3584
+#: ecoff.c:3585
 #, c-format
 msgid "Illegal .stab%c directive, bad character"
 msgstr ""
 
-#: ecoff.c:4046 ecoff.c:4235 ecoff.c:4260
+#: ecoff.c:4047 ecoff.c:4236 ecoff.c:4261
 msgid ".begin/.bend in different segments"
 msgstr ""
 
-#: ecoff.c:4761
+#: ecoff.c:4762
 msgid "Missing .end or .bend at end of file"
 msgstr ""
 
-#: ecoff.c:5252
+#: ecoff.c:5253
 msgid "GP prologue size exceeds field size, using 0 instead"
 msgstr ""
 
@@ -6107,66 +6653,66 @@ msgstr ""
 #. either not seen or not defined.
 #. @@ Should print out the original string instead of
 #. the parsed number.
-#: expr.c:581
+#: expr.c:583
 #, c-format
 msgid "backw. ref to unknown label \"%d:\", 0 assumed."
 msgstr ""
 
-#: expr.c:705
+#: expr.c:707
 msgid "Character constant too large"
 msgstr ""
 
-#: expr.c:941
+#: expr.c:946
 #, c-format
 msgid "expr.c(operand): bad atof_generic return val %d"
 msgstr ""
 
-#: expr.c:1001
+#: expr.c:1006
 msgid "Missing ')' assumed"
 msgstr ""
 
-#: expr.c:1011 read.c:3824
+#: expr.c:1017 read.c:3857
 msgid "EBCDIC constants are not supported"
 msgstr ""
 
-#: expr.c:1078
+#: expr.c:1087
 #, c-format
 msgid "Unary operator %c ignored because bad operand follows"
 msgstr ""
 
-#: expr.c:1122 expr.c:1147
+#: expr.c:1133 expr.c:1158
 msgid "syntax error in .startof. or .sizeof."
 msgstr ""
 
-#: expr.c:1296
+#: expr.c:1311
 msgid "Bad expression"
 msgstr ""
 
-#: expr.c:1644
+#: expr.c:1676
 msgid "missing operand; zero assumed"
 msgstr ""
 
-#: expr.c:1677
+#: expr.c:1709
 msgid "operation combines symbols in different segments"
 msgstr ""
 
-#: expr.c:1693
+#: expr.c:1725
 msgid "left operand is a bignum; integer 0 assumed"
 msgstr ""
 
-#: expr.c:1695
+#: expr.c:1727
 msgid "left operand is a float; integer 0 assumed"
 msgstr ""
 
-#: expr.c:1704
+#: expr.c:1736
 msgid "right operand is a bignum; integer 0 assumed"
 msgstr ""
 
-#: expr.c:1706
+#: expr.c:1738
 msgid "right operand is a float; integer 0 assumed"
 msgstr ""
 
-#: expr.c:1754 symbols.c:1092
+#: expr.c:1786 symbols.c:1109
 msgid "division by zero"
 msgstr ""
 
@@ -6183,277 +6729,277 @@ msgstr ""
 msgid "attempt to allocate data in common section"
 msgstr ""
 
-#: gasp.c:484
+#: gasp.c:485
 msgid "redefinition not allowed\n"
 msgstr ""
 
-#: gasp.c:558
+#: gasp.c:559
 #, c-format
 msgid "the %c operator cannot take non-absolute arguments.\n"
 msgstr ""
 
-#: gasp.c:635
+#: gasp.c:636
 msgid "string where expression expected.\n"
 msgstr ""
 
-#: gasp.c:641
+#: gasp.c:642
 msgid "can't find primary in expression.\n"
 msgstr ""
 
-#: gasp.c:681
+#: gasp.c:682
 msgid "misplaced closing parens.\n"
 msgstr ""
 
-#: gasp.c:718
+#: gasp.c:719
 msgid "attempt to divide by zero.\n"
 msgstr ""
 
-#: gasp.c:750
+#: gasp.c:751
 msgid "can't add two relocatable expressions\n"
 msgstr ""
 
-#: gasp.c:955
+#: gasp.c:956
 msgid "unreasonable nesting.\n"
 msgstr ""
 
-#: gasp.c:1033
+#: gasp.c:1034
 msgid "End of file not at start of line.\n"
 msgstr ""
 
-#: gasp.c:1154
+#: gasp.c:1155
 #, c-format
 msgid "Illegal base character %c.\n"
 msgstr ""
 
-#: gasp.c:1269
+#: gasp.c:1270
 #, c-format
 msgid "radix is %c must be one of b, q, d or h"
 msgstr ""
 
-#: gasp.c:1305
+#: gasp.c:1306
 #, c-format
 msgid "size must be one of b, w or l, is %c.\n"
 msgstr ""
 
-#: gasp.c:1413
+#: gasp.c:1414
 msgid "datab repeat must be constant.\n"
 msgstr ""
 
-#: gasp.c:1415
+#: gasp.c:1416
 msgid "datab data must be absolute.\n"
 msgstr ""
 
-#: gasp.c:1429
+#: gasp.c:1430
 msgid "align needs absolute expression.\n"
 msgstr ""
 
-#: gasp.c:1436
+#: gasp.c:1437
 msgid ".align needs absolute fill value.\n"
 msgstr ""
 
-#: gasp.c:1444
+#: gasp.c:1445
 msgid "alignment must be one of 1, 2 or 4.\n"
 msgstr ""
 
-#: gasp.c:1469
+#: gasp.c:1470
 msgid "res needs absolute expression for fill count.\n"
 msgstr ""
 
-#: gasp.c:1549
+#: gasp.c:1550
 msgid "form LIN= needs absolute expresssion.\n"
 msgstr ""
 
-#: gasp.c:1552
+#: gasp.c:1553
 msgid "COL="
 msgstr ""
 
-#: gasp.c:1555
+#: gasp.c:1556
 msgid "form COL= needs absolute expresssion.\n"
 msgstr ""
 
 #. Turns the next expression into a string
-#: gasp.c:1597 macro.c:400
+#: gasp.c:1598 macro.c:402
 #, c-format
 msgid "% operator needs absolute expression"
 msgstr ""
 
-#: gasp.c:1659
+#: gasp.c:1660
 msgid "misplaced ( .\n"
 msgstr ""
 
-#: gasp.c:1674
+#: gasp.c:1675
 msgid "misplaced ).\n"
 msgstr ""
 
-#: gasp.c:1728
+#: gasp.c:1729
 msgid ".instr needs absolute expresson.\n"
 msgstr ""
 
-#: gasp.c:1766
+#: gasp.c:1767
 msgid "need absolute position.\n"
 msgstr ""
 
-#: gasp.c:1768
+#: gasp.c:1769
 msgid "need absolute length.\n"
 msgstr ""
 
-#: gasp.c:2017
+#: gasp.c:2018
 msgid "END missing from end of file.\n"
 msgstr ""
 
-#: gasp.c:2047
+#: gasp.c:2048
 msgid ".ASSIGNA needs constant expression argument.\n"
 msgstr ""
 
-#: gasp.c:2051
+#: gasp.c:2052
 msgid ".ASSIGNA without label.\n"
 msgstr ""
 
-#: gasp.c:2076
+#: gasp.c:2077
 msgid ".ASSIGNS without label.\n"
 msgstr ""
 
-#: gasp.c:2143
+#: gasp.c:2144
 #, c-format
 msgid "Can't find preprocessor variable %s.\n"
 msgstr ""
 
-#: gasp.c:2208
+#: gasp.c:2209
 msgid "Comparison operator must be one of EQ, NE, LT, LE, GT or GE.\n"
 msgstr ""
 
-#: gasp.c:2242
+#: gasp.c:2243
 msgid "Comparison operator for strings must be EQ or NE\n"
 msgstr ""
 
-#: gasp.c:2254 gasp.c:2264 gasp.c:2366
+#: gasp.c:2255 gasp.c:2265 gasp.c:2367
 msgid "Conditional operator must have absolute operands.\n"
 msgstr ""
 
-#: gasp.c:2259
+#: gasp.c:2260
 msgid "String compared against expression.\n"
 msgstr ""
 
-#: gasp.c:2309
+#: gasp.c:2310
 msgid "AIF nesting unreasonable.\n"
 msgstr ""
 
-#: gasp.c:2324
+#: gasp.c:2325
 msgid "Multiple AELSEs in AIF.\n"
 msgstr ""
 
-#: gasp.c:2340
+#: gasp.c:2341
 msgid "AENDI without AIF.\n"
 msgstr ""
 
-#: gasp.c:2363 gasp.c:2445
+#: gasp.c:2364 gasp.c:2446
 msgid "IF nesting unreasonable.\n"
 msgstr ""
 
-#: gasp.c:2455
+#: gasp.c:2456
 msgid "Bad format for IF or IFNC.\n"
 msgstr ""
 
-#: gasp.c:2475
+#: gasp.c:2476
 msgid "AENDR without a AREPEAT.\n"
 msgstr ""
 
-#: gasp.c:2477
+#: gasp.c:2478
 msgid "ENDR without a REPT.\n"
 msgstr ""
 
-#: gasp.c:2500
+#: gasp.c:2501
 #, c-format
 msgid "AWHILE without a AENDW at %d.\n"
 msgstr ""
 
-#: gasp.c:2538
+#: gasp.c:2539
 msgid "AENDW without a AENDW.\n"
 msgstr ""
 
-#: gasp.c:2583
+#: gasp.c:2584
 msgid "AREPEAT must have absolute operand.\n"
 msgstr ""
 
-#: gasp.c:2589
+#: gasp.c:2590
 #, c-format
 msgid "AREPEAT without a AENDR at %d.\n"
 msgstr ""
 
-#: gasp.c:2631
+#: gasp.c:2632
 msgid ".ENDM without a matching .MACRO.\n"
 msgstr ""
 
-#: gasp.c:2665
+#: gasp.c:2666
 msgid "LOCAL outside of MACRO"
 msgstr ""
 
-#: gasp.c:2678
+#: gasp.c:2679
 #, c-format
 msgid "macro at line %d: %s\n"
 msgstr ""
 
-#: gasp.c:2701
+#: gasp.c:2702
 msgid "macro expansion"
 msgstr ""
 
-#: gasp.c:2753
+#: gasp.c:2754
 msgid "Character code in string must be absolute expression.\n"
 msgstr ""
 
-#: gasp.c:2758
+#: gasp.c:2759
 msgid "Missing > for character code.\n"
 msgstr ""
 
-#: gasp.c:2817
+#: gasp.c:2818
 #, c-format
 msgid "string for SDATAC longer than 255 characters (%d).\n"
 msgstr ""
 
-#: gasp.c:2845
+#: gasp.c:2846
 #, c-format
 msgid "illegal character in SDATA line (0x%x).\n"
 msgstr ""
 
-#: gasp.c:2866
+#: gasp.c:2867
 msgid "Must have absolute SDATAB repeat count.\n"
 msgstr ""
 
-#: gasp.c:2869
+#: gasp.c:2870
 #, c-format
 msgid "Must have positive SDATAB repeat count (%d).\n"
 msgstr ""
 
-#: gasp.c:2897
+#: gasp.c:2898
 #, c-format
 msgid "Unreasonable include depth (%ld).\n"
 msgstr ""
 
-#: gasp.c:2951
+#: gasp.c:2952
 #, c-format
 msgid "Can't open include file `%s'.\n"
 msgstr ""
 
-#: gasp.c:3025
+#: gasp.c:3026
 msgid "Unreasonable expansion (-u turns off check).\n"
 msgstr ""
 
 #. This one causes lots of pain when trying to preprocess
 #. ordinary code
-#: gasp.c:3246
+#: gasp.c:3247
 #, c-format
 msgid "Unrecognised pseudo op `%s'.\n"
 msgstr ""
 
-#: gasp.c:3313
+#: gasp.c:3314
 msgid "ORG command not allowed.\n"
 msgstr ""
 
-#: gasp.c:3530
+#: gasp.c:3531
 msgid "Invalid expression on command line.\n"
 msgstr ""
 
-#: gasp.c:3571
+#: gasp.c:3572
 #, c-format
 msgid ""
 "Usage: %s \n"
@@ -6466,7 +7012,7 @@ msgid ""
 "  [-p]      [--print]             print line numbers\n"
 msgstr ""
 
-#: gasp.c:3580
+#: gasp.c:3581
 msgid ""
 "  [-s]      [--copysource]        copy source through as comments \n"
 "  [-u]      [--unreasonable]      allow unreasonable nesting\n"
@@ -6477,37 +7023,37 @@ msgid ""
 "  [in-file]\n"
 msgstr ""
 
-#: gasp.c:3596
+#: gasp.c:3597
 #, c-format
 msgid "%s: Gnu Assembler Macro Preprocessor\n"
 msgstr ""
 
 #. This output is intended to follow the GNU standards document.
-#: gasp.c:3680
+#: gasp.c:3681
 #, c-format
 msgid "GNU assembler pre-processor %s\n"
 msgstr ""
 
-#: gasp.c:3681
+#: gasp.c:3682
 msgid "Copyright 1996 Free Software Foundation, Inc.\n"
 msgstr ""
 
-#: gasp.c:3703
+#: gasp.c:3704
 #, c-format
 msgid "%s: Can't open output file `%s'.\n"
 msgstr ""
 
-#: gasp.c:3726
+#: gasp.c:3727
 #, c-format
 msgid "%s: Can't open input file `%s'.\n"
 msgstr ""
 
-#: gasp.c:3745
+#: gasp.c:3746
 #, c-format
 msgid "Internal error, aborting at %s line %d"
 msgstr ""
 
-#: gasp.c:3748
+#: gasp.c:3749
 msgid ""
 "\n"
 "Please report this bug.\n"
@@ -6567,57 +7113,57 @@ msgstr ""
 msgid "Error:"
 msgstr ""
 
-#: listing.c:1140
+#: listing.c:1145
 #, c-format
 msgid "can't open list file: %s"
 msgstr ""
 
-#: listing.c:1164
+#: listing.c:1169
 #, c-format
 msgid "error closing list file: %s"
 msgstr ""
 
-#: listing.c:1245
+#: listing.c:1250
 msgid "strange paper height, set to no form"
 msgstr ""
 
-#: listing.c:1311
+#: listing.c:1316
 msgid "New line in title"
 msgstr ""
 
-#: macro.c:563
+#: macro.c:565
 msgid "unexpected end of file in macro definition"
 msgstr ""
 
-#: macro.c:572
+#: macro.c:574
 msgid "missing ) after formals"
 msgstr ""
 
-#: macro.c:729
+#: macro.c:731
 msgid "missplaced )"
 msgstr ""
 
-#: macro.c:991
+#: macro.c:993
 msgid "confusion in formal parameters"
 msgstr ""
 
-#: macro.c:996
+#: macro.c:998
 msgid "macro formal argument does not exist"
 msgstr ""
 
-#: macro.c:1011
+#: macro.c:1013
 msgid "can't mix positional and keyword arguments"
 msgstr ""
 
-#: macro.c:1019
+#: macro.c:1021
 msgid "too many positional arguments"
 msgstr ""
 
-#: macro.c:1194
+#: macro.c:1196
 msgid "unexpected end of file in irp or irpc"
 msgstr ""
 
-#: macro.c:1202
+#: macro.c:1204
 msgid "missing model parameter"
 msgstr ""
 
@@ -6688,305 +7234,306 @@ msgstr ""
 msgid "Can't continue"
 msgstr ""
 
-#: read.c:434
+#: read.c:439
 #, c-format
 msgid "error constructing %s pseudo-op table: %s"
 msgstr ""
 
-#: read.c:802
+#: read.c:804
 #, c-format
 msgid "Unknown pseudo-op:  `%s'"
 msgstr ""
 
-#: read.c:928
+#: read.c:933
 #, c-format
 msgid "label \"%d$\" redefined"
 msgstr ""
 
-#: read.c:1145
+#: read.c:1150
 msgid ".abort detected.  Abandoning ship."
 msgstr ""
 
-#: read.c:1250 read.c:2031
+#: read.c:1241 read.c:2024
 msgid "Alignment not a power of 2"
 msgstr ""
 
-#: read.c:1258
+#: read.c:1249
 #, c-format
 msgid "Alignment too large: %u assumed"
 msgstr ""
 
-#: read.c:1290
+#: read.c:1281
 msgid "expected fill pattern missing"
 msgstr ""
 
-#: read.c:1487
+#: read.c:1478
 #, c-format
 msgid "attempt to re-define symbol `%s'"
 msgstr ""
 
 #. Some of the back ends can't deal with non-positive line numbers.
 #. Besides, it's silly.
-#: read.c:1611
+#: read.c:1602
 #, c-format
 msgid "Line numbers must be positive; line number %d rejected."
 msgstr ""
 
-#: read.c:1638
+#: read.c:1629
 msgid "start address not supported"
 msgstr ""
 
-#: read.c:1648
+#: read.c:1639
 msgid ".err encountered"
 msgstr ""
 
-#: read.c:1667 read.c:1669
+#: read.c:1658 read.c:1660
 #, c-format
 msgid ".fail %ld encountered"
 msgstr ""
 
-#: read.c:1706
+#: read.c:1697
 #, c-format
 msgid ".fill size clamped to %d."
 msgstr ""
 
-#: read.c:1711
+#: read.c:1702
 msgid "Size negative: .fill ignored."
 msgstr ""
 
-#: read.c:1717
+#: read.c:1708
 msgid "Repeat < 0, .fill ignored"
 msgstr ""
 
-#: read.c:1873
+#: read.c:1866
 #, c-format
 msgid "unrecognized .linkonce type `%s'"
 msgstr ""
 
-#: read.c:1886 read.c:1912
+#: read.c:1879 read.c:1905
 msgid ".linkonce is not supported for this object file format"
 msgstr ""
 
-#: read.c:1908
+#: read.c:1901
 #, c-format
 msgid "bfd_set_section_flags: %s"
 msgstr ""
 
-#: read.c:1977
+#: read.c:1970
 #, c-format
 msgid "error setting flags for \".sbss\": %s"
 msgstr ""
 
-#: read.c:2009
+#: read.c:2002
 msgid "Expected comma after size"
 msgstr ""
 
-#: read.c:2017
+#: read.c:2010
 msgid "Missing alignment"
 msgstr ""
 
-#: read.c:2154
+#: read.c:2152
 msgid "bad expression"
 msgstr ""
 
-#: read.c:2289
+#: read.c:2283
 #, c-format
 msgid "attempt to redefine pseudo-op `%s' ignored"
 msgstr ""
 
-#: read.c:2353
+#: read.c:2349
 #, c-format
 msgid "invalid segment \"%s\"; segment \"%s\" assumed"
 msgstr ""
 
-#: read.c:2359
+#: read.c:2355
 msgid "ignoring fill value in absolute section"
 msgstr ""
 
-#: read.c:2362
+#: read.c:2358
 msgid "only constant offsets supported in absolute section"
 msgstr ""
 
-#: read.c:2394
+#: read.c:2390
 msgid "MRI style ORG pseudo-op not supported"
 msgstr ""
 
-#: read.c:2482
+#: read.c:2478
 msgid "unrecognized section type"
 msgstr ""
 
-#: read.c:2550
+#: read.c:2546
 #, c-format
 msgid "unrecognized section type `%s'"
 msgstr ""
 
-#: read.c:2564
+#: read.c:2560
 msgid "absolute sections are not supported"
 msgstr ""
 
-#: read.c:2579
+#: read.c:2575
 #, c-format
 msgid "unrecognized section command `%s'"
 msgstr ""
 
-#: read.c:2654
-msgid "rept without endr"
+#: read.c:2663
+#, c-format
+msgid "%s without %s"
 msgstr ""
 
-#: read.c:2841
+#: read.c:2867
 msgid "Unsupported variable size or fill value"
 msgstr ""
 
-#: read.c:2866
+#: read.c:2892
 msgid ".space repeat count is zero, ignored"
 msgstr ""
 
-#: read.c:2868
+#: read.c:2894
 msgid ".space repeat count is negative, ignored"
 msgstr ""
 
-#: read.c:2897
+#: read.c:2923
 msgid "space allocation too complex in absolute section"
 msgstr ""
 
-#: read.c:2902
+#: read.c:2928
 msgid "space allocation too complex in common section"
 msgstr ""
 
-#: read.c:2989 read.c:4070
+#: read.c:3015 read.c:4104
 #, c-format
 msgid "Bad floating literal: %s"
 msgstr ""
 
-#: read.c:3065
+#: read.c:3091
 #, c-format
 msgid "Rest of line ignored. First ignored character is `%c'."
 msgstr ""
 
-#: read.c:3068
+#: read.c:3094
 #, c-format
 msgid "Rest of line ignored. First ignored character valued 0x%x."
 msgstr ""
 
-#: read.c:3119
+#: read.c:3145
 msgid "illegal expression; zero assumed"
 msgstr ""
 
-#: read.c:3121
+#: read.c:3147
 msgid "missing expression; zero assumed"
 msgstr ""
 
-#: read.c:3288
+#: read.c:3320
 msgid "rva without symbol"
 msgstr ""
 
-#: read.c:3413
+#: read.c:3445
 msgid "attempt to store value in absolute section"
 msgstr ""
 
-#: read.c:3451 read.c:4347
+#: read.c:3483 read.c:4381
 msgid "zero assumed for missing expression"
 msgstr ""
 
-#: read.c:3463 read.c:4359
+#: read.c:3495 read.c:4393
 msgid "register value used as expression"
 msgstr ""
 
 #. Leading bits contain both 0s & 1s.
-#: read.c:3553
+#: read.c:3585
 #, c-format
 msgid "Value 0x%lx truncated to 0x%lx."
 msgstr ""
 
-#: read.c:3569
+#: read.c:3601
 #, c-format
 msgid "Bignum truncated to %d bytes"
 msgstr ""
 
-#: read.c:3646
+#: read.c:3678
 #, c-format
 msgid "unsupported BFD relocation size %u"
 msgstr ""
 
-#: read.c:3735
+#: read.c:3767
 msgid "using a bit field width of zero"
 msgstr ""
 
-#: read.c:3743
+#: read.c:3775
 #, c-format
 msgid "field width \"%s\" too complex for a bitfield"
 msgstr ""
 
-#: read.c:3751
+#: read.c:3783
 #, c-format
 msgid "field width %lu too big to fit in %d bytes: truncated to %d bits"
 msgstr ""
 
-#: read.c:3772
+#: read.c:3804
 #, c-format
 msgid "field value \"%s\" too complex for a bitfield"
 msgstr ""
 
-#: read.c:3894
+#: read.c:3928
 msgid "Unresolvable or nonpositive repeat count; using 1"
 msgstr ""
 
-#: read.c:3945
+#: read.c:3979
 #, c-format
 msgid "Unknown floating type type '%c'"
 msgstr ""
 
-#: read.c:3967
+#: read.c:4001
 msgid "Floating point constant too large"
 msgstr ""
 
-#: read.c:4092
+#: read.c:4126
 msgid "unresolvable or nonpositive repeat count; using 1"
 msgstr ""
 
-#: read.c:4496
+#: read.c:4530
 msgid "Expected <nn>"
 msgstr ""
 
 #. To be compatible with BSD 4.2 as: give the luser a linefeed!!
-#: read.c:4529 read.c:4612
+#: read.c:4563 read.c:4646
 msgid "Unterminated string: Newline inserted."
 msgstr ""
 
-#: read.c:4620
+#: read.c:4654
 msgid "Bad escaped character in string, '?' assumed"
 msgstr ""
 
-#: read.c:4646
+#: read.c:4680
 msgid "expected address expression; zero assumed"
 msgstr ""
 
-#: read.c:4666
+#: read.c:4700
 #, c-format
 msgid "symbol \"%s\" undefined; zero assumed"
 msgstr ""
 
-#: read.c:4669
+#: read.c:4703
 msgid "some symbol undefined; zero assumed"
 msgstr ""
 
-#: read.c:4687
+#: read.c:4721
 msgid "bad or irreducible absolute expression; zero assumed"
 msgstr ""
 
-#: read.c:4725
+#: read.c:4759
 msgid "This string may not contain '\\0'"
 msgstr ""
 
-#: read.c:4764
+#: read.c:4798
 msgid "Missing string"
 msgstr ""
 
-#: read.c:4995
+#: read.c:5029
 msgid "missing .func"
 msgstr ""
 
-#: read.c:5012
+#: read.c:5046
 msgid ".endfunc missing for previous .func"
 msgstr ""
 
@@ -7008,66 +7555,61 @@ msgstr ""
 msgid "Attempt to switch to nonexistent segment \"%s\""
 msgstr ""
 
-#: symbols.c:364 symbols.c:459
+#: symbols.c:365 symbols.c:467
 #, c-format
 msgid "Symbol %s already defined."
 msgstr ""
 
-#: symbols.c:439
-#, c-format
-msgid "Symbol \"%s\" is already defined as \"%s\"/%d.%d.%ld."
-msgstr ""
-
-#: symbols.c:445
+#: symbols.c:453
 #, c-format
-msgid "Symbol \"%s\" is already defined as \"%s\"/%ld."
+msgid "Symbol \"%s\" is already defined as \"%s\"/%s%ld."
 msgstr ""
 
-#: symbols.c:528 symbols.c:535
+#: symbols.c:536 symbols.c:543
 #, c-format
 msgid "Inserting \"%s\" into symbol table failed: %s"
 msgstr ""
 
-#: symbols.c:880
+#: symbols.c:894
 #, c-format
 msgid "Symbol definition loop encountered at %s"
 msgstr ""
 
-#: symbols.c:1054 symbols.c:1058
+#: symbols.c:1071 symbols.c:1075
 #, c-format
 msgid "undefined symbol %s in operation"
 msgstr ""
 
-#: symbols.c:1062
+#: symbols.c:1079
 msgid "invalid section for operation"
 msgstr ""
 
-#: symbols.c:1067 symbols.c:1071
+#: symbols.c:1084 symbols.c:1088
 #, c-format
 msgid "undefined symbol %s in operation setting %s"
 msgstr ""
 
-#: symbols.c:1076
+#: symbols.c:1093
 #, c-format
 msgid "invalid section for operation setting %s"
 msgstr ""
 
-#: symbols.c:1094
+#: symbols.c:1111
 #, c-format
 msgid "division by zero when setting %s"
 msgstr ""
 
-#: symbols.c:1166 write.c:1877
+#: symbols.c:1183 write.c:1881
 #, c-format
 msgid "can't resolve value for symbol \"%s\""
 msgstr ""
 
-#: symbols.c:1536
+#: symbols.c:1556
 #, c-format
 msgid "\"%d\" (instance number %d of a %s label)"
 msgstr ""
 
-#: symbols.c:1584
+#: symbols.c:1606
 #, c-format
 msgid "Attempt to get value of unresolved symbol %s"
 msgstr ""
@@ -7081,86 +7623,83 @@ msgstr ""
 msgid "rva not supported"
 msgstr ""
 
-#: write.c:501
+#: write.c:502
 #, c-format
 msgid "attempt to .org/.space backwards? (%ld)"
 msgstr ""
 
-#: write.c:975
+#: write.c:974
 msgid "relocation out of range"
 msgstr ""
 
-#: write.c:978
+#: write.c:977
 #, c-format
 msgid "%s:%u: bad return from bfd_install_relocation: %x"
 msgstr ""
 
-#: write.c:1023
+#: write.c:1022
 msgid "internal error: fixup not contained within frag"
 msgstr ""
 
-#: write.c:1039
+#: write.c:1038
 #, c-format
 msgid "%s:%u: bad return from bfd_install_relocation"
 msgstr ""
 
-#: write.c:1122 write.c:1146
+#: write.c:1125 write.c:1149
 #, c-format
 msgid "FATAL: Can't write %s"
 msgstr ""
 
-#: write.c:1177
+#: write.c:1180
 msgid "Cannot write to output file."
 msgstr ""
 
-#: write.c:1408
+#: write.c:1412
 #, c-format
 msgid "%d error%s, %d warning%s, generating bad object file.\n"
 msgstr ""
 
-#: write.c:1415
+#: write.c:1419
 #, c-format
 msgid "%d error%s, %d warning%s, no object file generated.\n"
 msgstr ""
 
-#: write.c:1814
+#: write.c:1818
 #, c-format
 msgid "local label %s is not defined"
 msgstr ""
 
-#: write.c:2119
+#: write.c:2123
 #, c-format
 msgid "alignment padding (%lu bytes) not a multiple of %ld"
 msgstr ""
 
-#: write.c:2225
+#: write.c:2229
 #, c-format
 msgid ".word %s-%s+%s didn't fit"
 msgstr ""
 
-#. Growth may be negative, but variable part of frag
-#. cannot have fewer than 0 chars.  That is, we can't
-#. .org backwards.
-#: write.c:2304
+#: write.c:2309
 msgid "attempt to .org backwards ignored"
 msgstr ""
 
-#: write.c:2320
+#: write.c:2332
 msgid ".space specifies non-absolute value"
 msgstr ""
 
-#: write.c:2324
+#: write.c:2336
 msgid ".space or .fill with negative value, ignored"
 msgstr ""
 
-#: write.c:2575
+#: write.c:2587
 #, c-format
 msgid ""
 "Subtraction of two symbols in different sections \"%s\" {%s section} - "
 "\"%s\" {%s section} at file address %s."
 msgstr ""
 
-#: write.c:2750
+#: write.c:2752
 #, c-format
 msgid "Value of %s too large for field of %d bytes at %s"
 msgstr ""