Fix spelling typos.

Remove use of DEFUN().

16 files changed, 962 insertions, 509 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0f135ae..8173884 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,12 @@
 2000-06-25  Kazu Hirata  <kazu@hxi.com>
 
+        * config/obj-aout.c: Remove all uses of DEFUN.
+        * config/obj-ieee.c: Likewise.
+        * config/tc-sh.c: Fix comment typos.
+        * config/tc-tahoe.c: Likewise.
+        * config/tc-vax.c: Likewise.
+        * config/tc-w65.c: Likewise.
+        * config/tc-z8k.c: Likewise.
 	* config/tc-h8300.c (build_bytes): Assemble ldmac correctly.
 
 2000-06-24  DJ Delorie  <dj@cygnus.com>
diff --git a/gas/Makefile.in b/gas/Makefile.in
index 0f36193..4104085 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -1843,7 +1843,7 @@ configure configure.in gdbinit.in itbl-lex.c itbl-parse.c
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(itbl_test_SOURCES) $(as_new_SOURCES) $(EXTRA_as_new_SOURCES) $(gasp_new_SOURCES)
 OBJECTS = $(itbl_test_OBJECTS) $(as_new_OBJECTS) $(gasp_new_OBJECTS)
diff --git a/gas/aclocal.m4 b/gas/aclocal.m4
index 4b4ca84..2ae06cf 100644
--- a/gas/aclocal.m4
+++ b/gas/aclocal.m4
@@ -173,7 +173,7 @@ 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 $lt_target \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || AC_MSG_ERROR([libtool configure failed])
 
 # Reload cache, that may have been modified by ltconfig
@@ -205,11 +205,6 @@ AC_REQUIRE([AC_PROG_NM])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"
@@ -228,7 +223,7 @@ 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 "$lt_target" in
+case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
@@ -495,7 +490,7 @@ AC_MSG_RESULT([$NM])
 AC_DEFUN(AC_CHECK_LIBM,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
-case "$lt_target" in
+case "$host" in
 *-*-beos* | *-*-cygwin*)
   # These system don't have libm
   ;;
diff --git a/gas/config/obj-aout.c b/gas/config/obj-aout.c
index 3a9b3f1..1609077 100644
--- a/gas/config/obj-aout.c
+++ b/gas/config/obj-aout.c
@@ -578,7 +578,7 @@ obj_pre_write_hook (headers)
 }
 
 void
-DEFUN_VOID (s_sect)
+s_sect ()
 {
   /* Strip out the section name */
   char *section_name;
diff --git a/gas/config/obj-ieee.c b/gas/config/obj-ieee.c
index 30a0798..fbabb64 100644
--- a/gas/config/obj-ieee.c
+++ b/gas/config/obj-ieee.c
@@ -55,9 +55,9 @@ relax_align (address, alignment)
 /* calculate the size of the frag chain and create a bfd section
    to contain all of it */
 static void
-DEFUN (size_section, (abfd, idx),
-       bfd * abfd AND
-       unsigned int idx)
+size_section (abfd, idx)
+     bfd * abfd;
+     unsigned int idx;
 {
   asection *sec;
   unsigned int size = 0;
@@ -106,9 +106,9 @@ DEFUN (size_section, (abfd, idx),
 
 /* run through a frag chain and write out the data to go with it */
 static void
-DEFUN (fill_section, (abfd, idx),
-       bfd * abfd AND
-       unsigned int idx)
+fill_section (abfd, idx)
+     bfd * abfd;
+     unsigned int idx;
 {
   asection *sec = segment_info[idx].user_stuff;
   if (sec)
@@ -159,8 +159,8 @@ DEFUN (fill_section, (abfd, idx),
 /* Count the relocations in a chain */
 
 static unsigned int
-DEFUN (count_entries_in_chain, (idx),
-       unsigned int idx)
+count_entries_in_chain (idx)
+     unsigned int idx;
 {
   unsigned int nrelocs;
   fixS *fixup_ptr;
@@ -178,8 +178,8 @@ DEFUN (count_entries_in_chain, (idx),
 
 /* output all the relocations for a section */
 void
-DEFUN (do_relocs_for, (idx),
-       unsigned int idx)
+do_relocs_for (idx)
+     unsigned int idx;
 {
   unsigned int nrelocs;
   arelent **reloc_ptr_vector;
@@ -270,8 +270,8 @@ DEFUN (do_relocs_for, (idx),
 
 /* do the symbols.. */
 static void
-DEFUN (do_symbols, (abfd),
-       bfd * abfd)
+do_symbols (abfd)
+     bfd * abfd;
 {
   extern symbolS *symbol_rootP;
   symbolS *ptr;
@@ -333,7 +333,7 @@ DEFUN (do_symbols, (abfd),
    code */
 
 void
-DEFUN_VOID (bfd_as_write_hook)
+bfd_as_write_hook ()
 {
   int i;
 
@@ -509,7 +509,7 @@ obj_symbol_new_hook (symbolP)
 
 #if 1
 extern void
-DEFUN_VOID (write_object_file)
+write_object_file ()
 {
   int i;
   struct frchain *frchain_ptr;
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 7f7c7ea..50e4bea 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -1290,11 +1290,13 @@ static void
 s_thumb_func (ignore)
      int ignore ATTRIBUTE_UNUSED;
 {
+  if (! thumb_mode)
+    opcode_select (16);
+
   /* The following label is the name/address of the start of a Thumb function.
      We need to know this for the interworking support.  */
-
   label_is_thumb_function_name = true;
-  
+
   demand_empty_rest_of_line ();
 }
 
diff --git a/gas/config/tc-sh.c b/gas/config/tc-sh.c
index 6dcf515..d08b1a4 100644
--- a/gas/config/tc-sh.c
+++ b/gas/config/tc-sh.c
@@ -1285,8 +1285,7 @@ insert_loop_bounds (output, operand)
   return frag_more (2);
 }
 
-/* Now we know what sort of opcodes it is, lets build the bytes -
- */
+/* Now we know what sort of opcodes it is, lets build the bytes.  */
 static void
 build_Mytes (opcode, operand)
      sh_opcode_info *opcode;
diff --git a/gas/config/tc-tahoe.c b/gas/config/tc-tahoe.c
index 26a7524..58d9639 100644
--- a/gas/config/tc-tahoe.c
+++ b/gas/config/tc-tahoe.c
@@ -1224,7 +1224,7 @@ tip_op (optex, topP)
 
   if (*op_bad == '\0')
     {
-      /* statement has no syntax goofs yet: lets sniff the expression */
+      /* Statement has no syntax goofs yet: let's sniff the expression.  */
       input_line_pointer = point;
       expP = &(topP->exp_of_operand);
       topP->seg_of_operand = expression (expP);
@@ -1526,7 +1526,7 @@ tip (titP, instring)
       else
 	{
 	  /*
-       * We found a match! So lets pick up as many operands as the
+       * We found a match! So let's pick up as many operands as the
        * instruction wants, and even gripe if there are too many.
        * We expect comma to seperate each operand.
        * We let instring track the text, while p tracks a part of the
diff --git a/gas/config/tc-vax.c b/gas/config/tc-vax.c
index 314f9bc..acf78ee 100644
--- a/gas/config/tc-vax.c
+++ b/gas/config/tc-vax.c
@@ -389,7 +389,7 @@ md_assemble (instruction_string)
 	}
       else
 	{
-	  /* statement has no syntax goofs: lets sniff the expression */
+	  /* Statement has no syntax goofs: let's sniff the expression.  */
 	  int can_be_short = 0;	/* 1 if a bignum can be reduced to a short literal. */
 
 	  input_line_pointer = operandP->vop_expr_begin;
@@ -1795,7 +1795,7 @@ vip (vitP, instring)
       else
 	{
 	  /*
-	   * We found a match! So lets pick up as many operands as the
+	   * We found a match! So let's pick up as many operands as the
 	   * instruction wants, and even gripe if there are too many.
 	   * We expect comma to seperate each operand.
 	   * We let instring track the text, while p tracks a part of the
diff --git a/gas/config/tc-w65.c b/gas/config/tc-w65.c
index 2c6d85a..7223fa0 100644
--- a/gas/config/tc-w65.c
+++ b/gas/config/tc-w65.c
@@ -644,8 +644,7 @@ check (operand, low, high)
 static int log2[] =
 {0, 0, 1, 0, 2};
 
-/* Now we know what sort of opcodes it is, lets build the bytes -
- */
+/* Now we know what sort of opcodes it is, let's build the bytes.  */
 static void
 build_Mytes (opcode)
      struct opinfo *opcode;
diff --git a/gas/config/tc-z8k.c b/gas/config/tc-z8k.c
index 6b60cf5..b66bd50 100644
--- a/gas/config/tc-z8k.c
+++ b/gas/config/tc-z8k.c
@@ -1185,9 +1185,8 @@ top:;
 }
 
 /* This is the guts of the machine-dependent assembler.  STR points to a
-   machine dependent instruction.  This funciton is supposed to emit
-   the frags/bytes it assembles to.
-   */
+   machine dependent instruction.  This function is supposed to emit
+   the frags/bytes it assembles to.  */
 
 void
 md_assemble (str)
diff --git a/gas/configure b/gas/configure
index 3e1e80e..6988db7 100755
--- a/gas/configure
+++ b/gas/configure
@@ -1369,11 +1369,6 @@ else
 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"
@@ -1394,11 +1389,11 @@ 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 "$lt_target" in
+case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 1401 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:1402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 1396 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -1419,19 +1414,19 @@ case "$lt_target" in
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:1423: checking whether the C compiler needs -belf" >&5
+echo "configure:1418: 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 1428 "configure"
+#line 1423 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1430: \"$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
@@ -1509,7 +1504,7 @@ 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 $lt_target \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 
 # Reload cache, that may have been modified by ltconfig
@@ -2435,7 +2430,7 @@ EOF
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2439: checking for $ac_word" >&5
+echo "configure:2434: 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
@@ -2465,7 +2460,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2469: checking for $ac_word" >&5
+echo "configure:2464: 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
@@ -2516,7 +2511,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2520: checking for $ac_word" >&5
+echo "configure:2515: 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
@@ -2548,7 +2543,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2552: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2547: 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.
@@ -2559,12 +2554,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 2563 "configure"
+#line 2558 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:2568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2563: \"$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
@@ -2590,12 +2585,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2594: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2589: 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:2599: checking whether we are using GNU C" >&5
+echo "configure:2594: 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
@@ -2604,7 +2599,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2608: \"$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:2603: \"$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
@@ -2623,7 +2618,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2627: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2622: 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
@@ -2660,7 +2655,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2664: checking for $ac_word" >&5
+echo "configure:2659: 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
@@ -2691,7 +2686,7 @@ done
 test -n "$YACC" || YACC="yacc"
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2695: checking how to run the C preprocessor" >&5
+echo "configure:2690: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2706,13 +2701,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 2710 "configure"
+#line 2705 "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:2716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2711: \"$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
   :
@@ -2723,13 +2718,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2727 "configure"
+#line 2722 "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:2733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2728: \"$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
   :
@@ -2740,13 +2735,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2744 "configure"
+#line 2739 "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:2750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2745: \"$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
   :
@@ -2776,7 +2771,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2780: checking for $ac_word" >&5
+echo "configure:2775: 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
@@ -2809,7 +2804,7 @@ 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:2813: checking for $ac_word" >&5
+echo "configure:2808: 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
@@ -2843,7 +2838,7 @@ then
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:2847: checking for yywrap in -l$ac_lib" >&5
+echo "configure:2842: 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
@@ -2851,7 +2846,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2855 "configure"
+#line 2850 "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
@@ -2862,7 +2857,7 @@ int main() {
 yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:2866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2861: \"$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
@@ -2885,7 +2880,7 @@ fi
 fi
 
 echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:2889: checking lex output file root" >&5
+echo "configure:2884: 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
@@ -2906,7 +2901,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
 echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
-echo "configure:2910: checking whether yytext is a pointer" >&5
+echo "configure:2905: 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
@@ -2918,14 +2913,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
 ac_save_LIBS="$LIBS"
 LIBS="$LIBS $LEXLIB"
 cat > conftest.$ac_ext <<EOF
-#line 2922 "configure"
+#line 2917 "configure"
 #include "confdefs.h"
 `cat $LEX_OUTPUT_ROOT.c`
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2924: \"$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
@@ -2949,7 +2944,7 @@ fi
 
 ALL_LINGUAS=
 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:2953: checking for POSIXized ISC" >&5
+echo "configure:2948: 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
@@ -2970,12 +2965,12 @@ else
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2974: checking for ANSI C header files" >&5
+echo "configure:2969: 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 2979 "configure"
+#line 2974 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2983,7 +2978,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2982: \"$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*
@@ -3000,7 +2995,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 3004 "configure"
+#line 2999 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3018,7 +3013,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 3022 "configure"
+#line 3017 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3039,7 +3034,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 3043 "configure"
+#line 3038 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3050,7 +3045,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:3054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -3074,12 +3069,12 @@ EOF
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3078: checking for working const" >&5
+echo "configure:3073: 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 3083 "configure"
+#line 3078 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3128,7 +3123,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:3132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -3149,21 +3144,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:3153: checking for inline" >&5
+echo "configure:3148: 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 3160 "configure"
+#line 3155 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:3167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -3189,12 +3184,12 @@ EOF
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3193: checking for off_t" >&5
+echo "configure:3188: 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 3198 "configure"
+#line 3193 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3222,12 +3217,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3226: checking for size_t" >&5
+echo "configure:3221: 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 3231 "configure"
+#line 3226 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3257,19 +3252,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:3261: checking for working alloca.h" >&5
+echo "configure:3256: 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 3266 "configure"
+#line 3261 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:3273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3268: \"$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
@@ -3290,12 +3285,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:3294: checking for alloca" >&5
+echo "configure:3289: 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 3299 "configure"
+#line 3294 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -3323,7 +3318,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:3327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3322: \"$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
@@ -3355,12 +3350,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:3359: checking whether alloca needs Cray hooks" >&5
+echo "configure:3354: 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 3364 "configure"
+#line 3359 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -3385,12 +3380,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:3389: checking for $ac_func" >&5
+echo "configure:3384: 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 3394 "configure"
+#line 3389 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3413,7 +3408,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3412: \"$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
@@ -3440,7 +3435,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:3444: checking stack direction for C alloca" >&5
+echo "configure:3439: 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
@@ -3448,7 +3443,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 3452 "configure"
+#line 3447 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -3467,7 +3462,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:3471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3466: \"$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
@@ -3492,17 +3487,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:3496: checking for $ac_hdr" >&5
+echo "configure:3491: 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 3501 "configure"
+#line 3496 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3501: \"$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*
@@ -3531,12 +3526,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3535: checking for $ac_func" >&5
+echo "configure:3530: 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 3540 "configure"
+#line 3535 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3559,7 +3554,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3558: \"$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
@@ -3584,7 +3579,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:3588: checking for working mmap" >&5
+echo "configure:3583: 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
@@ -3592,7 +3587,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 3596 "configure"
+#line 3591 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -3732,7 +3727,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:3736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3731: \"$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
@@ -3760,17 +3755,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:3764: checking for $ac_hdr" >&5
+echo "configure:3759: 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 3769 "configure"
+#line 3764 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3774: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3769: \"$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*
@@ -3800,12 +3795,12 @@ done
 __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3804: checking for $ac_func" >&5
+echo "configure:3799: 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 3809 "configure"
+#line 3804 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3828,7 +3823,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3827: \"$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
@@ -3857,12 +3852,12 @@ done
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3861: checking for $ac_func" >&5
+echo "configure:3856: 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 3866 "configure"
+#line 3861 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3885,7 +3880,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3884: \"$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
@@ -3919,19 +3914,19 @@ EOF
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:3923: checking for LC_MESSAGES" >&5
+echo "configure:3918: 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 3928 "configure"
+#line 3923 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:3935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3930: \"$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
@@ -3952,7 +3947,7 @@ EOF
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:3956: checking whether NLS is requested" >&5
+echo "configure:3951: 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"
@@ -3972,7 +3967,7 @@ fi
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:3976: checking whether included gettext is requested" >&5
+echo "configure:3971: 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"
@@ -3991,17 +3986,17 @@ fi
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:3995: checking for libintl.h" >&5
+echo "configure:3990: 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 4000 "configure"
+#line 3995 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4000: \"$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*
@@ -4018,19 +4013,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:4022: checking for gettext in libc" >&5
+echo "configure:4017: 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 4027 "configure"
+#line 4022 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:4034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4029: \"$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
@@ -4046,7 +4041,7 @@ 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:4050: checking for bindtextdomain in -lintl" >&5
+echo "configure:4045: 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
@@ -4054,7 +4049,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4058 "configure"
+#line 4053 "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
@@ -4065,7 +4060,7 @@ int main() {
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:4069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4064: \"$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
@@ -4081,19 +4076,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:4085: checking for gettext in libintl" >&5
+echo "configure:4080: 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 4090 "configure"
+#line 4085 "configure"
 #include "confdefs.h"
 
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:4097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4092: \"$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
@@ -4121,7 +4116,7 @@ EOF
 	      # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4125: checking for $ac_word" >&5
+echo "configure:4120: 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
@@ -4155,12 +4150,12 @@ fi
 		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4159: checking for $ac_func" >&5
+echo "configure:4154: 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 4164 "configure"
+#line 4159 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4183,7 +4178,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4182: \"$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
@@ -4210,7 +4205,7 @@ done
 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4214: checking for $ac_word" >&5
+echo "configure:4209: 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
@@ -4246,7 +4241,7 @@ fi
 		# Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4250: checking for $ac_word" >&5
+echo "configure:4245: 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
@@ -4278,7 +4273,7 @@ else
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 4282 "configure"
+#line 4277 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4286,7 +4281,7 @@ extern int _nl_msg_cat_cntr;
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:4290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -4318,7 +4313,7 @@ fi
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4322: checking for $ac_word" >&5
+echo "configure:4317: 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
@@ -4352,7 +4347,7 @@ fi
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4356: checking for $ac_word" >&5
+echo "configure:4351: 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
@@ -4388,7 +4383,7 @@ fi
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4392: checking for $ac_word" >&5
+echo "configure:4387: 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
@@ -4478,7 +4473,7 @@ fi
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:4482: checking for catalogs to be installed" >&5
+echo "configure:4477: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -4506,17 +4501,17 @@ echo "configure:4482: 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:4510: checking for linux/version.h" >&5
+echo "configure:4505: 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 4515 "configure"
+#line 4510 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4515: \"$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*
@@ -4579,7 +4574,7 @@ fi
   
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:4583: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:4578: 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"
@@ -4602,12 +4597,12 @@ fi
   
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:4606: checking for Cygwin environment" >&5
+echo "configure:4601: 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 4611 "configure"
+#line 4606 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4618,7 +4613,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:4622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -4635,19 +4630,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:4639: checking for mingw32 environment" >&5
+echo "configure:4634: 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 4644 "configure"
+#line 4639 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:4651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -4666,7 +4661,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes
 
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:4670: checking for executable suffix" >&5
+echo "configure:4665: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4676,7 +4671,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:4680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:4675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj | *.ilk | *.pdb) ;;
@@ -4701,17 +4696,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:4705: checking for $ac_hdr" >&5
+echo "configure:4700: 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 4710 "configure"
+#line 4705 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4710: \"$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*
@@ -4741,7 +4736,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:4745: checking whether compiling a cross-assembler" >&5
+echo "configure:4740: checking whether compiling a cross-assembler" >&5
 if test "${host}" = "${target}"; then
   cross_gas=no
 else
@@ -4756,19 +4751,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:4760: checking for working alloca.h" >&5
+echo "configure:4755: 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 4765 "configure"
+#line 4760 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:4772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4767: \"$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
@@ -4789,12 +4784,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:4793: checking for alloca" >&5
+echo "configure:4788: 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 4798 "configure"
+#line 4793 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -4822,7 +4817,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:4826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4821: \"$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
@@ -4854,12 +4849,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:4858: checking whether alloca needs Cray hooks" >&5
+echo "configure:4853: 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 4863 "configure"
+#line 4858 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -4884,12 +4879,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:4888: checking for $ac_func" >&5
+echo "configure:4883: 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 4893 "configure"
+#line 4888 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4912,7 +4907,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4911: \"$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
@@ -4939,7 +4934,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:4943: checking stack direction for C alloca" >&5
+echo "configure:4938: 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
@@ -4947,7 +4942,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 4951 "configure"
+#line 4946 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -4966,7 +4961,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:4970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4965: \"$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
@@ -4988,21 +4983,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:4992: checking for inline" >&5
+echo "configure:4987: 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 4999 "configure"
+#line 4994 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:5006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -5032,12 +5027,12 @@ esac
 for ac_func in unlink remove
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5036: checking for $ac_func" >&5
+echo "configure:5031: 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 5041 "configure"
+#line 5036 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5060,7 +5055,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5059: \"$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
@@ -5089,12 +5084,12 @@ done
 for ac_func in sbrk
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5093: checking for $ac_func" >&5
+echo "configure:5088: 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 5098 "configure"
+#line 5093 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5117,7 +5112,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5116: \"$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
@@ -5146,13 +5141,13 @@ done
 case "${need_libm}" in
 yes) 
   LIBM=
-case "$lt_target" in
+case "$host" in
 *-*-beos* | *-*-cygwin*)
   # These system don't have libm
   ;;
 *-ncr-sysv4.3*)
   echo $ac_n "checking for _mwvalidcheckl in -lmw""... $ac_c" 1>&6
-echo "configure:5156: checking for _mwvalidcheckl in -lmw" >&5
+echo "configure:5151: checking for _mwvalidcheckl in -lmw" >&5
 ac_lib_var=`echo mw'_'_mwvalidcheckl | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5160,7 +5155,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmw  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5164 "configure"
+#line 5159 "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
@@ -5171,7 +5166,7 @@ int main() {
 _mwvalidcheckl()
 ; return 0; }
 EOF
-if { (eval echo configure:5175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5170: \"$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
@@ -5192,7 +5187,7 @@ else
 fi
 
   echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:5196: checking for main in -lm" >&5
+echo "configure:5191: checking for main in -lm" >&5
 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5200,14 +5195,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5204 "configure"
+#line 5199 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5206: \"$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
@@ -5230,7 +5225,7 @@ fi
   ;;
 *)
   echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:5234: checking for main in -lm" >&5
+echo "configure:5229: checking for main in -lm" >&5
 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5238,14 +5233,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5242 "configure"
+#line 5237 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5244: \"$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
@@ -5276,12 +5271,12 @@ esac
 # enough, but on some of those systems, the assert macro relies on requoting
 # working properly!
 echo $ac_n "checking for working assert macro""... $ac_c" 1>&6
-echo "configure:5280: checking for working assert macro" >&5
+echo "configure:5275: 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 5285 "configure"
+#line 5280 "configure"
 #include "confdefs.h"
 #include <assert.h>
 #include <stdio.h>
@@ -5297,7 +5292,7 @@ assert (a == b
 
 ; return 0; }
 EOF
-if { (eval echo configure:5301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gas_cv_assert_ok=yes
 else
@@ -5338,12 +5333,12 @@ gas_test_headers="
 "
 
 echo $ac_n "checking whether declaration is required for strstr""... $ac_c" 1>&6
-echo "configure:5342: checking whether declaration is required for strstr" >&5
+echo "configure:5337: 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 5347 "configure"
+#line 5342 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -5354,7 +5349,7 @@ x = (f) strstr;
 
 ; return 0; }
 EOF
-if { (eval echo configure:5358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5353: \"$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
@@ -5375,12 +5370,12 @@ fi
 
 
 echo $ac_n "checking whether declaration is required for malloc""... $ac_c" 1>&6
-echo "configure:5379: checking whether declaration is required for malloc" >&5
+echo "configure:5374: 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 5384 "configure"
+#line 5379 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -5391,7 +5386,7 @@ x = (f) malloc;
 
 ; return 0; }
 EOF
-if { (eval echo configure:5395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5390: \"$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
@@ -5412,12 +5407,12 @@ fi
 
 
 echo $ac_n "checking whether declaration is required for free""... $ac_c" 1>&6
-echo "configure:5416: checking whether declaration is required for free" >&5
+echo "configure:5411: 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 5421 "configure"
+#line 5416 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -5428,7 +5423,7 @@ x = (f) free;
 
 ; return 0; }
 EOF
-if { (eval echo configure:5432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5427: \"$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
@@ -5449,12 +5444,12 @@ fi
 
 
 echo $ac_n "checking whether declaration is required for sbrk""... $ac_c" 1>&6
-echo "configure:5453: checking whether declaration is required for sbrk" >&5
+echo "configure:5448: 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 5458 "configure"
+#line 5453 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -5465,7 +5460,7 @@ x = (f) sbrk;
 
 ; return 0; }
 EOF
-if { (eval echo configure:5469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5464: \"$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
@@ -5486,12 +5481,12 @@ fi
 
 
 echo $ac_n "checking whether declaration is required for environ""... $ac_c" 1>&6
-echo "configure:5490: checking whether declaration is required for environ" >&5
+echo "configure:5485: 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 5495 "configure"
+#line 5490 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -5502,7 +5497,7 @@ x = (f) environ;
 
 ; return 0; }
 EOF
-if { (eval echo configure:5506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5501: \"$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
@@ -5526,12 +5521,12 @@ fi
 # for it?
 
 echo $ac_n "checking whether declaration is required for errno""... $ac_c" 1>&6
-echo "configure:5530: checking whether declaration is required for errno" >&5
+echo "configure:5525: 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 5535 "configure"
+#line 5530 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_ERRNO_H
@@ -5546,7 +5541,7 @@ x = (f) errno;
 
 ; return 0; }
 EOF
-if { (eval echo configure:5550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5545: \"$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
diff --git a/gas/doc/c-arm.texi b/gas/doc/c-arm.texi
index e354982..ee3112d 100644
--- a/gas/doc/c-arm.texi
+++ b/gas/doc/c-arm.texi
@@ -203,7 +203,8 @@ This directive specifies that the following symbol is the name of a
 Thumb encoded function.  This information is necessary in order to allow
 the assembler and linker to generate correct code for interworking
 between Arm and Thumb instructions and should be used even if
-interworking is not going to be performed.
+interworking is not going to be performed.  The presence of this
+directive also implies @code{.thumb}
 
 @cindex @code{thumb_set} directive, ARM
 @item .thumb_set
diff --git a/gas/macro.c b/gas/macro.c
index 3a0b612..a8a0ae4 100644
--- a/gas/macro.c
+++ b/gas/macro.c
@@ -305,7 +305,9 @@ getstring (idx, in, acc)
 	{
 	  char tchar = in->ptr[idx];
 	  int escaped = 0;
+	  
 	  idx++;
+	  
 	  while (idx < in->len)
 	    {
 	      if (in->ptr[idx-1] == '\\')
@@ -315,24 +317,29 @@ getstring (idx, in, acc)
 
 	      if (macro_alternate && in->ptr[idx] == '!')
 		{
-		  idx++  ;
-		  sb_add_char (acc, in->ptr[idx++]);
+		  idx ++;
+		  
+		  sb_add_char (acc, in->ptr[idx]);
+
+		  idx ++;
 		}
 	      else if (escaped && in->ptr[idx] == tchar)
 		{
 		  sb_add_char (acc, tchar);
-		  idx++;
+		  idx ++;
 		}
 	      else
 		{
 		  if (in->ptr[idx] == tchar)
 		    {
-		      idx++;
+		      idx ++;
+		      
 		      if (idx >= in->len || in->ptr[idx] != tchar)
 			break;
 		    }
+		  
 		  sb_add_char (acc, in->ptr[idx]);
-		  idx++;
+		  idx ++;
 		}
 	    }
 	}
diff --git a/gas/po/POTFILES.in b/gas/po/POTFILES.in
index c5d9d4a..0d00af6 100644
--- a/gas/po/POTFILES.in
+++ b/gas/po/POTFILES.in
@@ -100,6 +100,8 @@ config/tc-tahoe.c
 config/tc-tahoe.h
 config/tc-tic30.c
 config/tc-tic30.h
+config/tc-tic54x.c
+config/tc-tic54x.h
 config/tc-tic80.c
 config/tc-tic80.h
 config/tc-v850.c
diff --git a/gas/po/gas.pot b/gas/po/gas.pot
index 7e02403..f0eb988 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: 2000-06-18 18:12-0700\n"
+"POT-Creation-Date: 2000-06-25 09:48-0700\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"
@@ -976,11 +976,11 @@ msgid "Broken assembler.  No assembly attempted."
 msgstr ""
 
 #: config/tc-a29k.c:375 config/tc-arc.c:535 config/tc-avr.c:1045
-#: config/tc-d10v.c:514 config/tc-d30v.c:553 config/tc-h8300.c:304
+#: config/tc-d10v.c:514 config/tc-d30v.c:553 config/tc-h8300.c:298
 #: config/tc-h8500.c:297 config/tc-mcore.c:656 config/tc-mn10200.c:935
 #: config/tc-mn10300.c:1303 config/tc-ppc.c:1970 config/tc-sh.c:638
 #: config/tc-tic80.c:291 config/tc-v850.c:2034 config/tc-w65.c:257
-#: config/tc-z8k.c:338
+#: config/tc-z8k.c:339
 msgid "missing operand"
 msgstr ""
 
@@ -1050,10 +1050,10 @@ msgstr ""
 msgid "syntax error"
 msgstr ""
 
-#: config/tc-alpha.c:1025 config/tc-arm.c:5220 config/tc-h8300.c:1409
+#: config/tc-alpha.c:1025 config/tc-arm.c:5222 config/tc-h8300.c:1374
 #: config/tc-h8500.c:1221 config/tc-hppa.c:3989 config/tc-i860.c:813
 #: config/tc-m68hc11.c:486 config/tc-m68k.c:4125 config/tc-m88k.c:1106
-#: config/tc-ns32k.c:1589 config/tc-sparc.c:2757 config/tc-z8k.c:1352
+#: config/tc-ns32k.c:1589 config/tc-sparc.c:2757 config/tc-z8k.c:1353
 msgid "Bad call to MD_ATOF()"
 msgstr ""
 
@@ -1314,7 +1314,7 @@ msgstr ""
 msgid "Bad .fmask directive"
 msgstr ""
 
-#: config/tc-alpha.c:5169 config/tc-arm.c:1331 read.c:2149 read.c:2729
+#: config/tc-alpha.c:5169 config/tc-arm.c:1333 read.c:2149 read.c:2729
 #: stabs.c:459
 #, c-format
 msgid "Expected comma after name \"%s\""
@@ -1412,7 +1412,7 @@ msgstr ""
 msgid "conditional branch follows set of flags"
 msgstr ""
 
-#: config/tc-arc.c:749 config/tc-arm.c:6425
+#: config/tc-arc.c:749 config/tc-arm.c:6427
 #, c-format
 msgid "bad instruction `%s'"
 msgstr ""
@@ -1465,7 +1465,7 @@ msgstr ""
 msgid "expression too complex for %%st"
 msgstr ""
 
-#: config/tc-arc.c:1326 config/tc-arm.c:3195 config/tc-avr.c:771
+#: config/tc-arc.c:1326 config/tc-arm.c:3197 config/tc-avr.c:771
 #: config/tc-d10v.c:1532 config/tc-d30v.c:1827 config/tc-mips.c:3250
 #: config/tc-mips.c:4182 config/tc-mips.c:4967 config/tc-mips.c:5513
 #: config/tc-ppc.c:4846 config/tc-v850.c:2341
@@ -1498,562 +1498,562 @@ msgstr ""
 msgid "Alignment negative. 0 assumed."
 msgstr ""
 
-#: config/tc-arm.c:1380 config/tc-m32r.c:418 read.c:2788 read.c:4865
+#: config/tc-arm.c:1382 config/tc-m32r.c:418 read.c:2788 read.c:4865
 #, c-format
 msgid "symbol `%s' already defined"
 msgstr ""
 
-#: config/tc-arm.c:1450
+#: config/tc-arm.c:1452
 msgid "selected processor does not support THUMB opcodes"
 msgstr ""
 
-#: config/tc-arm.c:1462
+#: config/tc-arm.c:1464
 msgid "selected processor does not support ARM opcodes"
 msgstr ""
 
-#: config/tc-arm.c:1471
+#: config/tc-arm.c:1473
 #, c-format
 msgid "invalid instruction size selected (%d)"
 msgstr ""
 
-#: config/tc-arm.c:1506
+#: config/tc-arm.c:1508
 #, c-format
 msgid "invalid operand to .code directive (%d) (expecting 16 or 32)"
 msgstr ""
 
-#: config/tc-arm.c:1517
+#: config/tc-arm.c:1519
 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:1566
+#: config/tc-arm.c:1568
 #, 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:1630
+#: config/tc-arm.c:1632
 msgid "flag for {c}psr instruction expected"
 msgstr ""
 
-#: config/tc-arm.c:1660
+#: config/tc-arm.c:1662
 msgid "Illegal co-processor number"
 msgstr ""
 
-#: config/tc-arm.c:1667
+#: config/tc-arm.c:1669
 msgid "Bad or missing co-processor number"
 msgstr ""
 
-#: config/tc-arm.c:1691
+#: config/tc-arm.c:1693
 msgid "bad or missing expression"
 msgstr ""
 
-#: config/tc-arm.c:1697
+#: config/tc-arm.c:1699
 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:1722
+#: config/tc-arm.c:1724
 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:1746
+#: config/tc-arm.c:1748
 msgid "Floating point register expected"
 msgstr ""
 
-#: config/tc-arm.c:1763
+#: config/tc-arm.c:1765
 msgid "immediate expression expected"
 msgstr ""
 
-#: config/tc-arm.c:1778
+#: config/tc-arm.c:1780
 msgid "co-processor address must be word aligned"
 msgstr ""
 
-#: config/tc-arm.c:1784
+#: config/tc-arm.c:1786
 msgid "offset too large"
 msgstr ""
 
-#: config/tc-arm.c:1832
+#: config/tc-arm.c:1834
 msgid "pc may not be used in post-increment"
 msgstr ""
 
-#: config/tc-arm.c:1848 config/tc-arm.c:2987
+#: config/tc-arm.c:1850 config/tc-arm.c:2989
 msgid "pre-indexed expression expected"
 msgstr ""
 
-#: config/tc-arm.c:1861 config/tc-arm.c:2999 config/tc-arm.c:3341
+#: config/tc-arm.c:1863 config/tc-arm.c:3001 config/tc-arm.c:3343
 msgid "missing ]"
 msgstr ""
 
-#: config/tc-arm.c:1871
+#: config/tc-arm.c:1873
 msgid "pc may not be used with write-back"
 msgstr ""
 
-#: config/tc-arm.c:1926
+#: config/tc-arm.c:1928
 msgid "comma expected after register name"
 msgstr ""
 
-#: config/tc-arm.c:1944
+#: config/tc-arm.c:1946
 msgid "{C|S}PSR expected"
 msgstr ""
 
-#: config/tc-arm.c:1971
+#: config/tc-arm.c:1973
 msgid "comma missing after psr flags"
 msgstr ""
 
-#: config/tc-arm.c:1987 config/tc-arm.c:1996
+#: config/tc-arm.c:1989 config/tc-arm.c:1998
 msgid "only a register or immediate value can follow a psr flag"
 msgstr ""
 
-#: config/tc-arm.c:2002
+#: config/tc-arm.c:2004
 msgid "can only set flag field with immediate value"
 msgstr ""
 
-#: config/tc-arm.c:2019 config/tc-arm.c:2324 config/tc-arm.c:2576
-#: config/tc-arm.c:2596
+#: config/tc-arm.c:2021 config/tc-arm.c:2326 config/tc-arm.c:2578
+#: config/tc-arm.c:2598
 msgid "Invalid constant"
 msgstr ""
 
-#: config/tc-arm.c:2069
+#: config/tc-arm.c:2071
 msgid "rdhi, rdlo and rm must all be different"
 msgstr ""
 
-#: config/tc-arm.c:2125
+#: config/tc-arm.c:2127
 msgid "rd and rm should be different in mul"
 msgstr ""
 
-#: config/tc-arm.c:2181
+#: config/tc-arm.c:2183
 msgid "rd and rm should be different in mla"
 msgstr ""
 
-#: config/tc-arm.c:2308
+#: config/tc-arm.c:2310
 msgid "bad_segment"
 msgstr ""
 
-#: config/tc-arm.c:2354 config/tc-arm.c:2431
+#: config/tc-arm.c:2356 config/tc-arm.c:2433
 msgid "Shift expression expected"
 msgstr ""
 
-#: config/tc-arm.c:2395
+#: config/tc-arm.c:2397
 msgid "Invalid immediate shift"
 msgstr ""
 
-#: config/tc-arm.c:2424
+#: config/tc-arm.c:2426
 msgid "shift requires register or #expression"
 msgstr ""
 
-#: config/tc-arm.c:2425
+#: config/tc-arm.c:2427
 msgid "shift requires #expression"
 msgstr ""
 
-#: config/tc-arm.c:2567 config/tc-arm.c:3028
+#: config/tc-arm.c:2569 config/tc-arm.c:3030
 msgid "Constant expression expected"
 msgstr ""
 
-#: config/tc-arm.c:2609
+#: config/tc-arm.c:2611
 msgid "Register or shift expression expected"
 msgstr ""
 
-#: config/tc-arm.c:2662
+#: config/tc-arm.c:2664
 msgid "Invalid floating point immediate expression"
 msgstr ""
 
-#: config/tc-arm.c:2665
+#: config/tc-arm.c:2667
 msgid "Floating point register or immediate expression expected"
 msgstr ""
 
-#: config/tc-arm.c:2834
+#: config/tc-arm.c:2836
 msgid "address offset too large"
 msgstr ""
 
-#: config/tc-arm.c:2906
+#: config/tc-arm.c:2908
 msgid "Processor does not support halfwords or signed bytes"
 msgstr ""
 
-#: config/tc-arm.c:2927
+#: config/tc-arm.c:2929
 msgid "Address expected"
 msgstr ""
 
-#: config/tc-arm.c:2957 config/tc-arm.c:2971 config/tc-arm.c:3008
+#: config/tc-arm.c:2959 config/tc-arm.c:2973 config/tc-arm.c:3010
 #, c-format
 msgid "%s register same as write-back base"
 msgstr ""
 
-#: config/tc-arm.c:2958 config/tc-arm.c:2972 config/tc-arm.c:3009
+#: config/tc-arm.c:2960 config/tc-arm.c:2974 config/tc-arm.c:3011
 msgid "destination"
 msgstr ""
 
-#: config/tc-arm.c:2958 config/tc-arm.c:2972 config/tc-arm.c:3009
+#: config/tc-arm.c:2960 config/tc-arm.c:2974 config/tc-arm.c:3011
 msgid "source"
 msgstr ""
 
-#: config/tc-arm.c:3048
+#: config/tc-arm.c:3050
 msgid "literal pool insertion failed"
 msgstr ""
 
-#: config/tc-arm.c:3086
+#: config/tc-arm.c:3088
 msgid "Pre-increment instruction with translate"
 msgstr ""
 
-#: config/tc-arm.c:3127
+#: config/tc-arm.c:3129
 msgid "Bad range in register list"
 msgstr ""
 
-#: config/tc-arm.c:3135 config/tc-arm.c:3144 config/tc-arm.c:3185
+#: config/tc-arm.c:3137 config/tc-arm.c:3146 config/tc-arm.c:3187
 #, c-format
 msgid "Warning: Duplicated register (r%d) in register list"
 msgstr ""
 
-#: config/tc-arm.c:3147
+#: config/tc-arm.c:3149
 msgid "Warning: Register range not in ascending order"
 msgstr ""
 
-#: config/tc-arm.c:3158
+#: config/tc-arm.c:3160
 msgid "Missing `}'"
 msgstr ""
 
-#: config/tc-arm.c:3174
+#: config/tc-arm.c:3176
 msgid "invalid register mask"
 msgstr ""
 
-#: config/tc-arm.c:3233
+#: config/tc-arm.c:3235
 msgid "r15 not allowed as base register"
 msgstr ""
 
-#: config/tc-arm.c:3301 config/tc-arm.c:3315
+#: config/tc-arm.c:3303 config/tc-arm.c:3317
 msgid "r15 not allowed in swap"
 msgstr ""
 
-#: config/tc-arm.c:3668 config/tc-v850.c:1922 config/tc-v850.c:1943
+#: config/tc-arm.c:3670 config/tc-v850.c:1922 config/tc-v850.c:1943
 msgid "constant expression expected"
 msgstr ""
 
-#: config/tc-arm.c:3674
+#: config/tc-arm.c:3676
 msgid "Constant value required for number of registers"
 msgstr ""
 
-#: config/tc-arm.c:3682
+#: config/tc-arm.c:3684
 msgid "number of registers must be in the range [1:4]"
 msgstr ""
 
-#: config/tc-arm.c:3742
+#: config/tc-arm.c:3744
 msgid "R15 not allowed as base register with write-back"
 msgstr ""
 
-#: config/tc-arm.c:3989
+#: config/tc-arm.c:3991
 msgid "lo register required"
 msgstr ""
 
-#: config/tc-arm.c:3997
+#: config/tc-arm.c:3999
 msgid "hi register required"
 msgstr ""
 
-#: config/tc-arm.c:4066
+#: config/tc-arm.c:4068
 msgid "dest and source1 must be the same register"
 msgstr ""
 
-#: config/tc-arm.c:4073
+#: config/tc-arm.c:4075
 msgid "subtract valid only on lo regs"
 msgstr ""
 
-#: config/tc-arm.c:4097
+#: config/tc-arm.c:4099
 msgid "invalid Hi register with immediate"
 msgstr ""
 
-#: config/tc-arm.c:4124 config/tc-arm.c:4157 config/tc-arm.c:4167
+#: config/tc-arm.c:4126 config/tc-arm.c:4159 config/tc-arm.c:4169
 msgid "immediate value out of range"
 msgstr ""
 
-#: config/tc-arm.c:4135
+#: config/tc-arm.c:4137
 msgid "invalid immediate value for stack adjust"
 msgstr ""
 
-#: config/tc-arm.c:4146
+#: config/tc-arm.c:4148
 msgid "invalid immediate for address calculation"
 msgstr ""
 
-#: config/tc-arm.c:4233
+#: config/tc-arm.c:4235
 msgid "source1 and dest must be same register"
 msgstr ""
 
-#: config/tc-arm.c:4268
+#: config/tc-arm.c:4270
 msgid "Invalid immediate for shift"
 msgstr ""
 
-#: config/tc-arm.c:4347
+#: config/tc-arm.c:4349
 msgid "only lo regs allowed with immediate"
 msgstr ""
 
-#: config/tc-arm.c:4366
+#: config/tc-arm.c:4368
 msgid "invalid immediate"
 msgstr ""
 
-#: config/tc-arm.c:4420
+#: config/tc-arm.c:4422
 msgid "expected ']'"
 msgstr ""
 
-#: config/tc-arm.c:4486
+#: config/tc-arm.c:4488
 msgid "byte or halfword not valid for base register"
 msgstr ""
 
-#: config/tc-arm.c:4491
+#: config/tc-arm.c:4493
 msgid "R15 based store not allowed"
 msgstr ""
 
-#: config/tc-arm.c:4496
+#: config/tc-arm.c:4498
 msgid "Invalid base register for register offset"
 msgstr ""
 
-#: config/tc-arm.c:4514
+#: config/tc-arm.c:4516
 msgid "invalid offset"
 msgstr ""
 
-#: config/tc-arm.c:4525
+#: config/tc-arm.c:4527
 msgid "invalid base register in load/store"
 msgstr ""
 
-#: config/tc-arm.c:4549
+#: config/tc-arm.c:4551
 msgid "Invalid offset"
 msgstr ""
 
-#: config/tc-arm.c:4623
+#: config/tc-arm.c:4625
 msgid "dest and source1 one must be the same register"
 msgstr ""
 
-#: config/tc-arm.c:4631
+#: config/tc-arm.c:4633
 msgid "Rs and Rd must be different in MUL"
 msgstr ""
 
-#: config/tc-arm.c:4775
+#: config/tc-arm.c:4777
 msgid ""
 "Inserted missing '!': load/store multiple always writes back base register"
 msgstr ""
 
-#: config/tc-arm.c:4791 config/tc-arm.c:4891
+#: config/tc-arm.c:4793 config/tc-arm.c:4893
 msgid "Expression too complex"
 msgstr ""
 
-#: config/tc-arm.c:4797
+#: config/tc-arm.c:4799
 msgid "only lo-regs valid in load/store multiple"
 msgstr ""
 
-#: config/tc-arm.c:4843
+#: config/tc-arm.c:4845
 msgid "Syntax: ldrs[b] Rd, [Rb, Ro]"
 msgstr ""
 
-#: config/tc-arm.c:4907
+#: config/tc-arm.c:4909
 msgid "invalid register list to push/pop instruction"
 msgstr ""
 
-#: config/tc-arm.c:5049
+#: config/tc-arm.c:5051
 msgid "Virtual memory exhausted"
 msgstr ""
 
-#: config/tc-arm.c:5421
+#: config/tc-arm.c:5423
 #, c-format
 msgid "invalid constant (%lx) after fixup"
 msgstr ""
 
-#: config/tc-arm.c:5455
+#: config/tc-arm.c:5457
 #, c-format
 msgid "Unable to compute ADRL instructions for PC offset of 0x%x"
 msgstr ""
 
-#: config/tc-arm.c:5483
+#: config/tc-arm.c:5485
 #, c-format
 msgid "bad immediate value for offset (%ld)"
 msgstr ""
 
-#: config/tc-arm.c:5504 config/tc-arm.c:5526
+#: config/tc-arm.c:5506 config/tc-arm.c:5528
 msgid "invalid literal constant: pool needs to be closer"
 msgstr ""
 
-#: config/tc-arm.c:5506
+#: config/tc-arm.c:5508
 #, c-format
 msgid "bad immediate value for half-word offset (%ld)"
 msgstr ""
 
-#: config/tc-arm.c:5543
+#: config/tc-arm.c:5545
 msgid "shift expression is too large"
 msgstr ""
 
-#: config/tc-arm.c:5561 config/tc-arm.c:5570
+#: config/tc-arm.c:5563 config/tc-arm.c:5572
 msgid "Invalid swi expression"
 msgstr ""
 
-#: config/tc-arm.c:5580
+#: config/tc-arm.c:5582
 msgid "Invalid expression in load/store multiple"
 msgstr ""
 
-#: config/tc-arm.c:5632
+#: config/tc-arm.c:5634
 msgid "gas can't handle same-section branch dest >= 0x04000000"
 msgstr ""
 
-#: config/tc-arm.c:5641
+#: config/tc-arm.c:5643
 msgid "out of range branch"
 msgstr ""
 
-#: config/tc-arm.c:5674 config/tc-arm.c:5690 config/tc-mips.c:9806
+#: config/tc-arm.c:5676 config/tc-arm.c:5692 config/tc-mips.c:9806
 msgid "Branch out of range"
 msgstr ""
 
-#: config/tc-arm.c:5713
+#: config/tc-arm.c:5715
 msgid "Branch with link out of range"
 msgstr ""
 
-#: config/tc-arm.c:5780
+#: config/tc-arm.c:5782
 msgid "Illegal value for co-processor offset"
 msgstr ""
 
-#: config/tc-arm.c:5803
+#: config/tc-arm.c:5805
 #, c-format
 msgid "Invalid offset, target not word aligned (0x%08X)"
 msgstr ""
 
-#: config/tc-arm.c:5808 config/tc-arm.c:5817 config/tc-arm.c:5824
-#: config/tc-arm.c:5831 config/tc-arm.c:5838
+#: config/tc-arm.c:5810 config/tc-arm.c:5819 config/tc-arm.c:5826
+#: config/tc-arm.c:5833 config/tc-arm.c:5840
 #, c-format
 msgid "Invalid offset, value too big (0x%08X)"
 msgstr ""
 
-#: config/tc-arm.c:5875
+#: config/tc-arm.c:5877
 msgid "Invalid immediate for stack address calculation"
 msgstr ""
 
-#: config/tc-arm.c:5884
+#: config/tc-arm.c:5886
 #, c-format
 msgid "Invalid immediate for address calculation (value = 0x%08lX)"
 msgstr ""
 
-#: config/tc-arm.c:5894
+#: config/tc-arm.c:5896
 msgid "Invalid 8bit immediate"
 msgstr ""
 
-#: config/tc-arm.c:5902
+#: config/tc-arm.c:5904
 msgid "Invalid 3bit immediate"
 msgstr ""
 
-#: config/tc-arm.c:5918
+#: config/tc-arm.c:5920
 #, c-format
 msgid "Invalid immediate: %ld is too large"
 msgstr ""
 
-#: config/tc-arm.c:5933
+#: config/tc-arm.c:5935
 #, c-format
 msgid "Illegal Thumb shift value: %ld"
 msgstr ""
 
-#: config/tc-arm.c:5947
+#: config/tc-arm.c:5949
 #, c-format
 msgid "Bad relocation fixup type (%d)"
 msgstr ""
 
-#: config/tc-arm.c:6019
+#: config/tc-arm.c:6021
 msgid "Literal referenced across section boundary (Implicit dump?)"
 msgstr ""
 
-#: config/tc-arm.c:6032
+#: config/tc-arm.c:6034
 #, c-format
 msgid "Internal_relocation (type %d) not fixed up (IMMEDIATE)"
 msgstr ""
 
-#: config/tc-arm.c:6038
+#: config/tc-arm.c:6040
 msgid "ADRL used for a symbol not defined in the same file"
 msgstr ""
 
-#: config/tc-arm.c:6044
+#: config/tc-arm.c:6046
 #, c-format
 msgid "Internal_relocation (type %d) not fixed up (OFFSET_IMM)"
 msgstr ""
 
-#: config/tc-arm.c:6064 config/tc-mcore.c:2110 config/tc-ns32k.c:2283
+#: config/tc-arm.c:6066 config/tc-mcore.c:2110 config/tc-ns32k.c:2283
 msgid "<unknown>"
 msgstr ""
 
-#: config/tc-arm.c:6067
+#: config/tc-arm.c:6069
 #, c-format
 msgid "Can not represent %s relocation in this object file format (%d)"
 msgstr ""
 
-#: config/tc-arm.c:6088 config/tc-mips.c:11302 config/tc-sh.c:2953
+#: config/tc-arm.c:6090 config/tc-mips.c:11302 config/tc-sh.c:2953
 #, c-format
 msgid "Can not represent %s relocation in this object file format"
 msgstr ""
 
-#: config/tc-arm.c:6106
+#: config/tc-arm.c:6108
 msgid "md_estimate_size_before_relax\n"
 msgstr ""
 
-#: config/tc-arm.c:6181
+#: config/tc-arm.c:6183
 #, c-format
 msgid "No operator -- statement `%s'\n"
 msgstr ""
 
-#: config/tc-arm.c:6199
+#: config/tc-arm.c:6201
 msgid "selected processor does not support this opcode"
 msgstr ""
 
-#: config/tc-arm.c:6245
+#: config/tc-arm.c:6247
 #, c-format
 msgid "Opcode `%s' must have suffix from list: <%s>"
 msgstr ""
 
-#: config/tc-arm.c:6275
+#: config/tc-arm.c:6277
 msgid "Warning: Use of the 'nv' conditional is deprecated\n"
 msgstr ""
 
-#: config/tc-arm.c:6292
+#: config/tc-arm.c:6294
 #, c-format
 msgid "Opcode `%s' is unconditional\n"
 msgstr ""
 
-#: config/tc-arm.c:6317
+#: config/tc-arm.c:6319
 #, c-format
 msgid "Opcode `%s' must have suffix from <%s>\n"
 msgstr ""
 
-#: config/tc-arm.c:6403
+#: config/tc-arm.c:6405
 #, c-format
 msgid "register '%s' does not exist\n"
 msgstr ""
 
-#: config/tc-arm.c:6408
+#: config/tc-arm.c:6410
 #, c-format
 msgid "ignoring redefinition of register alias '%s'"
 msgstr ""
 
-#: config/tc-arm.c:6414
+#: config/tc-arm.c:6416
 #, c-format
 msgid ""
 "ignoring redefinition of register alias '%s' to non-existant register '%s'"
 msgstr ""
 
-#: config/tc-arm.c:6418
+#: config/tc-arm.c:6420
 msgid "ignoring incomplete .req pseuso op"
 msgstr ""
 
-#: config/tc-arm.c:6598
+#: config/tc-arm.c:6600
 #, c-format
 msgid "Unrecognised APCS switch -m%s"
 msgstr ""
 
-#: config/tc-arm.c:6741 config/tc-arm.c:6754 config/tc-arm.c:6767
-#: config/tc-arm.c:6779 config/tc-arm.c:6785
+#: config/tc-arm.c:6743 config/tc-arm.c:6756 config/tc-arm.c:6769
+#: config/tc-arm.c:6781 config/tc-arm.c:6787
 #, c-format
 msgid "Invalid architecture variant -m%s"
 msgstr ""
 
-#: config/tc-arm.c:6792
+#: config/tc-arm.c:6794
 #, c-format
 msgid "Invalid processor variant -m%s"
 msgstr ""
 
-#: config/tc-arm.c:6815
+#: config/tc-arm.c:6817
 msgid ""
 " ARM Specific Assembler Options:\n"
 "  -m[arm][<processor name>] select processor variant\n"
@@ -2069,7 +2069,7 @@ msgid ""
 "  -k                        generate PIC code.\n"
 msgstr ""
 
-#: config/tc-arm.c:6827
+#: config/tc-arm.c:6829
 msgid ""
 "  -mapcs-32, -mapcs-26      specify which ARM Procedure Calling Standard to "
 "use\n"
@@ -2077,17 +2077,17 @@ msgid ""
 "  -mapcs-reentrant          the code is position independent/reentrant\n"
 msgstr ""
 
-#: config/tc-arm.c:6833
+#: config/tc-arm.c:6835
 msgid "  -moabi                    support the old ELF ABI\n"
 msgstr ""
 
-#: config/tc-arm.c:6837
+#: config/tc-arm.c:6839
 msgid ""
 "  -EB                       assemble code for a big endian cpu\n"
 "  -EL                       assemble code for a little endian cpu\n"
 msgstr ""
 
-#: config/tc-arm.c:6987
+#: config/tc-arm.c:6989
 #, c-format
 msgid "%s: unexpected function type: %d"
 msgstr ""
@@ -2211,8 +2211,8 @@ msgid "reloc %d not supported by object file format"
 msgstr ""
 
 #: config/tc-avr.c:1006 config/tc-d10v.c:1085 config/tc-d10v.c:1099
-#: config/tc-h8300.c:1275 config/tc-h8500.c:1121 config/tc-mcore.c:989
-#: config/tc-pj.c:274 config/tc-sh.c:1437 config/tc-z8k.c:1220
+#: config/tc-h8300.c:1241 config/tc-h8500.c:1121 config/tc-mcore.c:989
+#: config/tc-pj.c:274 config/tc-sh.c:1437 config/tc-z8k.c:1221
 msgid "can't find opcode "
 msgstr ""
 
@@ -2471,106 +2471,106 @@ msgstr ""
 msgid "Bad call to md_atof()"
 msgstr ""
 
-#: config/tc-h8300.c:253 config/tc-h8300.c:261
+#: config/tc-h8300.c:247 config/tc-h8300.c:255
 msgid "Reg not valid for H8/300"
 msgstr ""
 
-#: config/tc-h8300.c:422 config/tc-h8300.c:425 config/tc-h8300.c:428
-#: config/tc-h8300.c:432
+#: config/tc-h8300.c:415 config/tc-h8300.c:418 config/tc-h8300.c:421
+#: config/tc-h8300.c:425
 msgid "Invalid register list for ldm/stm\n"
 msgstr ""
 
-#: config/tc-h8300.c:489 config/tc-h8300.c:552 config/tc-h8300.c:559
+#: config/tc-h8300.c:477 config/tc-h8300.c:539 config/tc-h8300.c:546
 msgid "Wrong size pointer register for architecture."
 msgstr ""
 
-#: config/tc-h8300.c:517 config/tc-h8300.c:526 config/tc-h8300.c:536
+#: config/tc-h8300.c:504 config/tc-h8300.c:513 config/tc-h8300.c:523
 msgid "expected @(exp, reg16)"
 msgstr ""
 
-#: config/tc-h8300.c:616
+#: config/tc-h8300.c:602
 msgid "expect :8 or :16 here"
 msgstr ""
 
-#: config/tc-h8300.c:822
+#: config/tc-h8300.c:803
 #, c-format
 msgid "operand %s0x%lx out of range."
 msgstr ""
 
-#: config/tc-h8300.c:914
+#: config/tc-h8300.c:891
 msgid "Can't work out size of operand.\n"
 msgstr ""
 
-#: config/tc-h8300.c:964
+#: config/tc-h8300.c:939
 #, c-format
 msgid "Opcode `%s' with these operand types not available in H8/300 mode"
 msgstr ""
 
-#: config/tc-h8300.c:1016 config/tc-h8300.c:1036
+#: config/tc-h8300.c:990 config/tc-h8300.c:1010
 msgid "Need #1 or #2 here"
 msgstr ""
 
-#: config/tc-h8300.c:1031
+#: config/tc-h8300.c:1005
 msgid "#4 not valid on H8/300."
 msgstr ""
 
-#: config/tc-h8300.c:1112 config/tc-h8300.c:1145
+#: config/tc-h8300.c:1091 config/tc-h8300.c:1123
 #, c-format
 msgid "branch operand has odd offset (%lx)\n"
 msgstr ""
 
-#: config/tc-h8300.c:1187
+#: config/tc-h8300.c:1161
 msgid "destination operand must be 16 bit register"
 msgstr ""
 
-#: config/tc-h8300.c:1197
+#: config/tc-h8300.c:1170
 msgid "source operand must be 8 bit register"
 msgstr ""
 
-#: config/tc-h8300.c:1205
+#: config/tc-h8300.c:1178
 msgid "destination operand must be 16bit absolute address"
 msgstr ""
 
-#: config/tc-h8300.c:1212
+#: config/tc-h8300.c:1185
 msgid "destination operand must be 8 bit register"
 msgstr ""
 
-#: config/tc-h8300.c:1221
+#: config/tc-h8300.c:1193
 msgid "source operand must be 16bit absolute address"
 msgstr ""
 
-#: config/tc-h8300.c:1229
+#: config/tc-h8300.c:1201
 msgid "invalid operands"
 msgstr ""
 
-#: config/tc-h8300.c:1286 config/tc-h8500.c:1128 config/tc-mips.c:7966
-#: config/tc-sh.c:1666 config/tc-w65.c:759 config/tc-z8k.c:1232
+#: config/tc-h8300.c:1252 config/tc-h8500.c:1128 config/tc-mips.c:7966
+#: config/tc-sh.c:1666 config/tc-w65.c:759 config/tc-z8k.c:1233
 msgid "unknown opcode"
 msgstr ""
 
-#: config/tc-h8300.c:1332
+#: config/tc-h8300.c:1298
 msgid "mismatch between opcode size and operand size"
 msgstr ""
 
-#: config/tc-h8300.c:1344 config/tc-h8500.c:1156 config/tc-sh.c:1780
-#: config/tc-w65.c:791 config/tc-z8k.c:1287
+#: config/tc-h8300.c:1309 config/tc-h8500.c:1156 config/tc-sh.c:1780
+#: config/tc-w65.c:791 config/tc-z8k.c:1288
 msgid "call to tc_crawl_symbol_chain \n"
 msgstr ""
 
-#: config/tc-h8300.c:1358 config/tc-h8500.c:1170 config/tc-sh.c:1787
-#: config/tc-w65.c:805 config/tc-z8k.c:1301
+#: config/tc-h8300.c:1323 config/tc-h8500.c:1170 config/tc-sh.c:1787
+#: config/tc-w65.c:805 config/tc-z8k.c:1302
 msgid "call to tc_headers_hook \n"
 msgstr ""
 
-#: config/tc-h8300.c:1447 config/tc-h8500.c:1259 config/tc-z8k.c:1412
+#: config/tc-h8300.c:1413 config/tc-h8500.c:1259 config/tc-z8k.c:1413
 msgid "call to tc_aout_fix_to_chars \n"
 msgstr ""
 
-#: config/tc-h8300.c:1457 config/tc-z8k.c:1422
+#: config/tc-h8300.c:1423 config/tc-z8k.c:1423
 msgid "call to md_convert_frag \n"
 msgstr ""
 
-#: config/tc-h8300.c:1502 config/tc-z8k.c:1497
+#: config/tc-h8300.c:1468 config/tc-z8k.c:1498
 msgid "call tomd_estimate_size_before_relax \n"
 msgstr ""
 
@@ -3037,279 +3037,279 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: config/tc-i386.c:1000 config/tc-i386.c:4471
+#: config/tc-i386.c:1000 config/tc-i386.c:4456
 #, c-format
 msgid "can not do %d byte pc-relative relocation"
 msgstr ""
 
-#: config/tc-i386.c:1010 config/tc-i386.c:4485
+#: config/tc-i386.c:1010 config/tc-i386.c:4470
 #, c-format
 msgid "can not do %d byte relocation"
 msgstr ""
 
-#: config/tc-i386.c:1115 config/tc-i386.c:1198
+#: config/tc-i386.c:1114 config/tc-i386.c:1197
 #, c-format
 msgid "no such instruction: `%s'"
 msgstr ""
 
-#: config/tc-i386.c:1124
+#: config/tc-i386.c:1123
 #, c-format
 msgid "invalid character %s in mnemonic"
 msgstr ""
 
-#: config/tc-i386.c:1131
+#: config/tc-i386.c:1130
 msgid "expecting prefix; got nothing"
 msgstr ""
 
-#: config/tc-i386.c:1133
+#: config/tc-i386.c:1132
 msgid "expecting mnemonic; got nothing"
 msgstr ""
 
-#: config/tc-i386.c:1151
+#: config/tc-i386.c:1150
 #, c-format
 msgid "redundant %s prefix"
 msgstr ""
 
-#: config/tc-i386.c:1208
+#: config/tc-i386.c:1207
 #, c-format
 msgid "`%s' is not supported on `%s'"
 msgstr ""
 
-#: config/tc-i386.c:1213
+#: config/tc-i386.c:1212
 msgid "use .code16 to ensure correct addressing mode"
 msgstr ""
 
-#: config/tc-i386.c:1221
+#: config/tc-i386.c:1220
 #, c-format
 msgid "expecting string instruction after `%s'"
 msgstr ""
 
-#: config/tc-i386.c:1244
+#: config/tc-i386.c:1243
 #, c-format
 msgid "invalid character %s before operand %d"
 msgstr ""
 
-#: config/tc-i386.c:1258
+#: config/tc-i386.c:1257
 #, c-format
 msgid "unbalanced parenthesis in operand %d."
 msgstr ""
 
-#: config/tc-i386.c:1261
+#: config/tc-i386.c:1260
 #, c-format
 msgid "unbalanced brackets in operand %d."
 msgstr ""
 
-#: config/tc-i386.c:1270
+#: config/tc-i386.c:1269
 #, c-format
 msgid "invalid character %s in operand %d"
 msgstr ""
 
-#: config/tc-i386.c:1297
+#: config/tc-i386.c:1296
 #, c-format
 msgid "spurious operands; (%d operands/instruction max)"
 msgstr ""
 
-#: config/tc-i386.c:1318
+#: config/tc-i386.c:1317
 msgid "expecting operand after ','; got nothing"
 msgstr ""
 
-#: config/tc-i386.c:1323
+#: config/tc-i386.c:1322
 msgid "expecting operand before ','; got nothing"
 msgstr ""
 
 #. we found no match
-#: config/tc-i386.c:1563
+#: config/tc-i386.c:1587
 #, c-format
 msgid "suffix or operands invalid for `%s'"
 msgstr ""
 
-#: config/tc-i386.c:1574
+#: config/tc-i386.c:1598
 #, 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:1582
+#: config/tc-i386.c:1606
 #, c-format
 msgid "stand-alone `%s' prefix"
 msgstr ""
 
-#: config/tc-i386.c:1618 config/tc-i386.c:1633
+#: config/tc-i386.c:1642 config/tc-i386.c:1657
 msgid "`%s' operand %d must use `%%es' segment"
 msgstr ""
 
-#: config/tc-i386.c:1701 config/tc-i386.c:1743 config/tc-i386.c:1771
+#: config/tc-i386.c:1725 config/tc-i386.c:1767 config/tc-i386.c:1795
 msgid "using `%%%s' instead of `%%%s' due to `%c' suffix"
 msgstr ""
 
-#: config/tc-i386.c:1714 config/tc-i386.c:1731 config/tc-i386.c:1759
+#: config/tc-i386.c:1738 config/tc-i386.c:1755 config/tc-i386.c:1783
 msgid "`%%%s' not allowed with `%s%c'"
 msgstr ""
 
-#: config/tc-i386.c:1804 config/tc-i386.c:1824
+#: config/tc-i386.c:1828 config/tc-i386.c:1848
 msgid "no instruction mnemonic suffix given; can't determine immediate size"
 msgstr ""
 
-#: config/tc-i386.c:1849
+#: config/tc-i386.c:1873
 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:1951
+#: config/tc-i386.c:1975
 msgid "translating to `%s %%%s,%%%s'"
 msgstr ""
 
 #. extraneous `l' suffix on fp insn
-#: config/tc-i386.c:1958
+#: config/tc-i386.c:1982
 msgid "translating to `%s %%%s'"
 msgstr ""
 
-#: config/tc-i386.c:2173
+#: config/tc-i386.c:2197
 msgid "you can't `pop %%cs'"
 msgstr ""
 
 #. UnixWare fsub no args is alias for fsubp, fadd -> faddp, etc.
-#: config/tc-i386.c:2204
+#: config/tc-i386.c:2228
 #, c-format
 msgid "translating to `%sp'"
 msgstr ""
 
-#: config/tc-i386.c:2253 config/tc-i386.c:2316 config/tc-i386.c:2358
+#: config/tc-i386.c:2277 config/tc-i386.c:2340 config/tc-i386.c:2382
 msgid "skipping prefixes on this instruction"
 msgstr ""
 
-#: config/tc-i386.c:2373
+#: config/tc-i386.c:2397
 msgid "16-bit jump out of range"
 msgstr ""
 
-#: config/tc-i386.c:2382
+#: config/tc-i386.c:2406
 #, c-format
 msgid "can't handle non absolute segment in `%s'"
 msgstr ""
 
-#: config/tc-i386.c:2597
+#: config/tc-i386.c:2621
 msgid "only 1 or 2 immediate operands are allowed"
 msgstr ""
 
-#: config/tc-i386.c:2629 config/tc-i386.c:2850
+#: config/tc-i386.c:2653 config/tc-i386.c:2874
 msgid "GOT relocations not supported in 16 bit mode"
 msgstr ""
 
-#: config/tc-i386.c:2650 config/tc-i386.c:2871
+#: config/tc-i386.c:2674 config/tc-i386.c:2895
 msgid "bad reloc specifier in expression"
 msgstr ""
 
-#: config/tc-i386.c:2668 config/tc-i386.c:2905
+#: config/tc-i386.c:2692 config/tc-i386.c:2929
 #, c-format
 msgid "ignoring junk `%s' after expression"
 msgstr ""
 
 #. missing or bad expr becomes absolute 0
-#: config/tc-i386.c:2675
+#: config/tc-i386.c:2699
 #, c-format
 msgid "missing or invalid immediate expression `%s' taken as 0"
 msgstr ""
 
-#: config/tc-i386.c:2702 config/tc-i386.c:2948
+#: config/tc-i386.c:2726 config/tc-i386.c:2959
 #, c-format
 msgid "unimplemented segment %s in operand"
 msgstr ""
 
-#: config/tc-i386.c:2704 config/tc-i386.c:2950
+#: config/tc-i386.c:2728 config/tc-i386.c:2961
 #, c-format
 msgid "unimplemented segment type %d in operand"
 msgstr ""
 
-#: config/tc-i386.c:2748
+#: config/tc-i386.c:2772
 #, c-format
 msgid "expecting scale factor of 1, 2, 4, or 8: got `%s'"
 msgstr ""
 
-#: config/tc-i386.c:2754
+#: config/tc-i386.c:2778
 #, c-format
 msgid "scale factor of %d without an index register"
 msgstr ""
 
 #. missing or bad expr becomes absolute 0
-#: config/tc-i386.c:2916
+#: config/tc-i386.c:2940
 #, c-format
 msgid "missing or invalid displacement expression `%s' taken as 0"
 msgstr ""
 
-#: config/tc-i386.c:3130 config/tc-i386.c:3136 config/tc-i386.c:3145
+#: config/tc-i386.c:3141 config/tc-i386.c:3147 config/tc-i386.c:3156
 #, c-format
 msgid "bad segment name `%s'"
 msgstr ""
 
-#: config/tc-i386.c:3203
+#: config/tc-i386.c:3214
 #, c-format
 msgid "`%s' is not a valid base/index expression"
 msgstr ""
 
-#: config/tc-i386.c:3207
+#: config/tc-i386.c:3218
 #, c-format
 msgid "`%s' is not a valid %s bit base/index expression"
 msgstr ""
 
-#: config/tc-i386.c:3228 config/tc-i386.c:3582
+#: config/tc-i386.c:3239 config/tc-i386.c:3593
 #, c-format
 msgid "too many memory references for `%s'"
 msgstr ""
 
-#: config/tc-i386.c:3314 config/tc-i386.c:3449 config/tc-i386.c:3552
-#: config/tc-i386.c:3667 config/tc-i386.c:3703
+#: config/tc-i386.c:3325 config/tc-i386.c:3460 config/tc-i386.c:3563
+#: config/tc-i386.c:3678 config/tc-i386.c:3714
 #, c-format
 msgid "bad register name `%s'"
 msgstr ""
 
-#: config/tc-i386.c:3528
+#: config/tc-i386.c:3539
 #, c-format
 msgid "bad memory operand `%s'"
 msgstr ""
 
-#: config/tc-i386.c:3543
+#: config/tc-i386.c:3554
 #, c-format
 msgid "junk `%s' after register"
 msgstr ""
 
-#: config/tc-i386.c:3560
+#: config/tc-i386.c:3571
 msgid "immediate operand illegal with absolute jump"
 msgstr ""
 
-#: config/tc-i386.c:3660
+#: config/tc-i386.c:3671
 #, c-format
 msgid "expecting `,' or `)' after index register in `%s'"
 msgstr ""
 
-#: config/tc-i386.c:3682
+#: config/tc-i386.c:3693
 #, c-format
 msgid "expecting `)' after scale factor in `%s'"
 msgstr ""
 
-#: config/tc-i386.c:3689
+#: config/tc-i386.c:3700
 #, c-format
 msgid "expecting index register or scale factor after `,'; got '%c'"
 msgstr ""
 
-#: config/tc-i386.c:3696
+#: config/tc-i386.c:3707
 #, c-format
 msgid "expecting `,' or `)' after base register in `%s'"
 msgstr ""
 
 #. it's not a memory operand; argh!
-#: config/tc-i386.c:3736
+#: config/tc-i386.c:3747
 #, c-format
 msgid "invalid char %s beginning operand %d `%s'"
 msgstr ""
 
-#: config/tc-i386.c:4169
+#: config/tc-i386.c:4154
 msgid "Bad call to md_atof ()"
 msgstr ""
 
-#: config/tc-i386.c:4314
+#: config/tc-i386.c:4299
 msgid ""
 "  -Q                      ignored\n"
 "  -V                      print assembler version number\n"
@@ -3318,15 +3318,15 @@ msgid ""
 "  -s                      ignored\n"
 msgstr ""
 
-#: config/tc-i386.c:4321
+#: config/tc-i386.c:4306
 msgid "  -q                      quieten some warnings\n"
 msgstr ""
 
-#: config/tc-i386.c:4371
+#: config/tc-i386.c:4356
 msgid "GOT already in symbol table"
 msgstr ""
 
-#: config/tc-i386.c:4520
+#: config/tc-i386.c:4505
 #, c-format
 msgid "cannot represent relocation type %s"
 msgstr ""
@@ -3684,11 +3684,11 @@ msgstr ""
 msgid "Unrecognized dependency specifier %d\n"
 msgstr ""
 
-#: config/tc-ia64.c:8196
+#: config/tc-ia64.c:8203
 msgid "Only the first path encountering the conflict is reported"
 msgstr ""
 
-#: config/tc-ia64.c:8199
+#: config/tc-ia64.c:8206
 msgid "This is the location of the conflicting usage"
 msgstr ""
 
@@ -6525,6 +6525,452 @@ msgstr ""
 msgid "Barf, bad mode %x\n"
 msgstr ""
 
+#: config/tc-tic54x.c:79
+msgid "C54x-specific command line  options:\n"
+msgstr ""
+
+#: config/tc-tic54x.c:80
+msgid "-mfar-mode | -mf          Use extended addressing\n"
+msgstr ""
+
+#: config/tc-tic54x.c:81
+msgid "-mcpu=<CPU version>       Specify the CPU version\n"
+msgstr ""
+
+#. fprintf (stream, _("-mcoff-version={0|1|2}    Select COFF version\n"));
+#: config/tc-tic54x.c:83
+msgid "-merrors-to-file <filename>\n"
+msgstr ""
+
+#: config/tc-tic54x.c:84
+msgid "-me <filename>            Redirect errors to a file\n"
+msgstr ""
+
+#: config/tc-tic54x.c:329
+msgid "Comma and symbol expected for '.asg STRING, SYMBOL'"
+msgstr ""
+
+#: config/tc-tic54x.c:383
+msgid "Unterminated string after absolute expression"
+msgstr ""
+
+#: config/tc-tic54x.c:391
+msgid "Comma and symbol expected for '.eval EXPR, SYMBOL'"
+msgstr ""
+
+#: config/tc-tic54x.c:403
+msgid "symbols assigned with .eval must begin with a letter"
+msgstr ""
+
+#: config/tc-tic54x.c:657
+msgid "Offset on nested structures is ignored"
+msgstr ""
+
+#: config/tc-tic54x.c:706
+#, c-format
+msgid ".end%s without preceding .%s"
+msgstr ""
+
+#: config/tc-tic54x.c:773
+#, c-format
+msgid "Unrecognized struct/union tag '%s'"
+msgstr ""
+
+#: config/tc-tic54x.c:775
+msgid ".tag requires a structure tag"
+msgstr ""
+
+#: config/tc-tic54x.c:781
+msgid "Label required for .tag"
+msgstr ""
+
+#: config/tc-tic54x.c:798
+#, c-format
+msgid ".tag target '%s' undefined"
+msgstr ""
+
+#: config/tc-tic54x.c:860
+#, c-format
+msgid ".field count '%d' out of range (1 <= X <= 32)"
+msgstr ""
+
+#: config/tc-tic54x.c:888
+#, c-format
+msgid "Unrecognized field type '%c'"
+msgstr ""
+
+#. Disallow .byte with a non constant expression that will
+#. require relocation.
+#: config/tc-tic54x.c:1022
+msgid "Relocatable values require at least WORD storage"
+msgstr ""
+
+#: config/tc-tic54x.c:1084
+msgid "Use of .def/.ref is deprecated.  Use .global instead"
+msgstr ""
+
+#: config/tc-tic54x.c:1275
+msgid ".space/.bes repeat count is negative, ignored"
+msgstr ""
+
+#: config/tc-tic54x.c:1280
+msgid ".space/.bes repeat count is zero, ignored"
+msgstr ""
+
+#: config/tc-tic54x.c:1358
+msgid "Missing size argument"
+msgstr ""
+
+#: config/tc-tic54x.c:1493
+msgid "CPU version has already been set"
+msgstr ""
+
+#: config/tc-tic54x.c:1497
+#, c-format
+msgid "Unrecognized version '%s'"
+msgstr ""
+
+#: config/tc-tic54x.c:1503
+msgid "Changing of CPU version on the fly not supported"
+msgstr ""
+
+#: config/tc-tic54x.c:1637
+msgid "p2align not supported on this target"
+msgstr ""
+
+#: config/tc-tic54x.c:1649
+msgid "Argument to .even ignored"
+msgstr ""
+
+#: config/tc-tic54x.c:1696
+msgid "Invalid field size, must be from 1 to 32"
+msgstr ""
+
+#: config/tc-tic54x.c:1708
+msgid "field size must be 16 when value is relocatable"
+msgstr ""
+
+#: config/tc-tic54x.c:1722
+msgid "field value truncated"
+msgstr ""
+
+#: config/tc-tic54x.c:1828 config/tc-tic54x.c:2144
+#, c-format
+msgid "Unrecognized section '%s'"
+msgstr ""
+
+#: config/tc-tic54x.c:1837
+msgid "Current section is unitialized, section name required for .clink"
+msgstr ""
+
+#: config/tc-tic54x.c:2049
+msgid "ENDLOOP without corresponding LOOP"
+msgstr ""
+
+#: config/tc-tic54x.c:2096
+msgid "Mixing of normal and extended addressing not supported"
+msgstr ""
+
+#: config/tc-tic54x.c:2102
+msgid "Extended addressing not supported on the specified CPU"
+msgstr ""
+
+#: config/tc-tic54x.c:2150
+msgid ".sblock may be used for initialized sections only"
+msgstr ""
+
+#: config/tc-tic54x.c:2181
+msgid "Symbol missing for .set/.equ"
+msgstr ""
+
+#: config/tc-tic54x.c:2238
+msgid ".var may only be used within a macro definition"
+msgstr ""
+
+#: config/tc-tic54x.c:2246
+msgid "Substitution symbols must begin with a letter"
+msgstr ""
+
+#: config/tc-tic54x.c:2337
+#, c-format
+msgid "Can't open macro library file '%s' for reading."
+msgstr ""
+
+#: config/tc-tic54x.c:2344
+#, c-format
+msgid "File '%s' not in macro archive format"
+msgstr ""
+
+#: config/tc-tic54x.c:2493
+#, c-format
+msgid "Bad COFF version '%s'"
+msgstr ""
+
+#: config/tc-tic54x.c:2502
+#, c-format
+msgid "Bad CPU version '%s'"
+msgstr ""
+
+#: config/tc-tic54x.c:2514 config/tc-tic54x.c:2517
+#, c-format
+msgid "Can't redirect stderr to the file '%s'"
+msgstr ""
+
+#: config/tc-tic54x.c:2647
+#, c-format
+msgid "Undefined substitution symbol '%s'"
+msgstr ""
+
+#: config/tc-tic54x.c:3293
+msgid "Badly formed address expression"
+msgstr ""
+
+#: config/tc-tic54x.c:3552
+#, c-format
+msgid "Invalid dmad syntax '%s'"
+msgstr ""
+
+#: config/tc-tic54x.c:3668
+msgid "Address mode *+ARx is write-only. Results of reading are undefined."
+msgstr ""
+
+#: config/tc-tic54x.c:3688
+#, c-format
+msgid "Unrecognized indirect address format \"%s\""
+msgstr ""
+
+#: config/tc-tic54x.c:3725
+#, c-format
+msgid "Operand '%s' out of range (%d <= x <= %d)"
+msgstr ""
+
+#: config/tc-tic54x.c:3745
+msgid "Error in relocation handling"
+msgstr ""
+
+#: config/tc-tic54x.c:3766 config/tc-tic54x.c:3831 config/tc-tic54x.c:3861
+#, c-format
+msgid "Unrecognized condition code \"%s\""
+msgstr ""
+
+#: config/tc-tic54x.c:3784
+#, c-format
+msgid "Condition \"%s\" does not match preceding group"
+msgstr ""
+
+#: config/tc-tic54x.c:3792
+#, c-format
+msgid ""
+"Condition \"%s\" uses a different accumulator from a preceding condition"
+msgstr ""
+
+#: config/tc-tic54x.c:3799
+msgid "Only one comparison conditional allowed"
+msgstr ""
+
+#: config/tc-tic54x.c:3804
+msgid "Only one overflow conditional allowed"
+msgstr ""
+
+#: config/tc-tic54x.c:3812
+#, c-format
+msgid "Duplicate %s conditional"
+msgstr ""
+
+#: config/tc-tic54x.c:3846
+msgid "Invalid auxiliary register (use AR0-AR7)"
+msgstr ""
+
+#: config/tc-tic54x.c:3881
+msgid "lk addressing modes are invalid for memory-mapped register addressing"
+msgstr ""
+
+#: config/tc-tic54x.c:3889
+msgid ""
+"Address mode *+ARx is not allowed in memory-mapped register addressing.  "
+"Resulting behavior is undefined."
+msgstr ""
+
+#: config/tc-tic54x.c:3915
+msgid ""
+"Destination accumulator for each part of this parallel instruction must be "
+"different"
+msgstr ""
+
+#: config/tc-tic54x.c:3962
+#, c-format
+msgid "Memory mapped register \"%s\" out of range"
+msgstr ""
+
+#: config/tc-tic54x.c:4001
+msgid "Invalid operand (use 1, 2, or 3)"
+msgstr ""
+
+#: config/tc-tic54x.c:4026
+msgid "A status register or status bit name is required"
+msgstr ""
+
+#: config/tc-tic54x.c:4036
+#, c-format
+msgid "Unrecognized status bit \"%s\""
+msgstr ""
+
+#: config/tc-tic54x.c:4058
+#, c-format
+msgid "Invalid status register \"%s\""
+msgstr ""
+
+#: config/tc-tic54x.c:4070
+#, c-format
+msgid "Operand \"%s\" out of range (use 1 or 2)"
+msgstr ""
+
+#: config/tc-tic54x.c:4268
+#, c-format
+msgid "Unrecognized instruction \"%s\""
+msgstr ""
+
+#: config/tc-tic54x.c:4297
+#, c-format
+msgid "Unrecognized operand list '%s' for instruction '%s'"
+msgstr ""
+
+#: config/tc-tic54x.c:4328
+#, c-format
+msgid "Unrecognized parallel instruction \"%s\""
+msgstr ""
+
+#: config/tc-tic54x.c:4379
+#, c-format
+msgid "Invalid operand (s) for parallel instruction \"%s\""
+msgstr ""
+
+#: config/tc-tic54x.c:4382
+#, c-format
+msgid "Unrecognized parallel instruction combination \"%s || %s\""
+msgstr ""
+
+#: config/tc-tic54x.c:4608
+#, c-format
+msgid "%s symbol recursion stopped at second appearance of '%s'"
+msgstr ""
+
+#: config/tc-tic54x.c:4647
+msgid "Unrecognized substitution symbol function"
+msgstr ""
+
+#: config/tc-tic54x.c:4652
+msgid "Missing '(' after substitution symbol function"
+msgstr ""
+
+#: config/tc-tic54x.c:4666
+msgid "Expecting second argument"
+msgstr ""
+
+#: config/tc-tic54x.c:4679 config/tc-tic54x.c:4728
+msgid "Extra junk in function call, expecting ')'"
+msgstr ""
+
+#: config/tc-tic54x.c:4704
+msgid "Function expects two arguments"
+msgstr ""
+
+#: config/tc-tic54x.c:4717
+msgid "Expecting character constant argument"
+msgstr ""
+
+#: config/tc-tic54x.c:4723
+msgid "Both arguments must be substitution symbols"
+msgstr ""
+
+#: config/tc-tic54x.c:4777
+#, c-format
+msgid "Invalid subscript (use 1 to %d)"
+msgstr ""
+
+#: config/tc-tic54x.c:4787
+#, c-format
+msgid "Invalid length (use 0 to %d"
+msgstr ""
+
+#: config/tc-tic54x.c:4797
+msgid "Missing ')' in subscripted substitution symbol expression"
+msgstr ""
+
+#: config/tc-tic54x.c:4817
+msgid "Missing forced substitution terminator ':'"
+msgstr ""
+
+#: config/tc-tic54x.c:4993
+#, c-format
+msgid ""
+"Instruction does not fit in available delay slots (%d-word insn, %d slots "
+"left)"
+msgstr ""
+
+#: config/tc-tic54x.c:5034
+#, c-format
+msgid "Unrecognized parallel instruction '%s'"
+msgstr ""
+
+#: config/tc-tic54x.c:5046
+#, c-format
+msgid "Instruction '%s' requires an LP cpu version"
+msgstr ""
+
+#: config/tc-tic54x.c:5053
+#, c-format
+msgid "Instruction '%s' requires far mode addressing"
+msgstr ""
+
+#: config/tc-tic54x.c:5065
+#, c-format
+msgid ""
+"Instruction does not fit in available delay slots (%d-word insn, %d slots "
+"left). Resulting behavior is undefined."
+msgstr ""
+
+#: config/tc-tic54x.c:5075
+msgid ""
+"Instructions which cause PC discontinuity are not allowed in a delay slot. "
+"Resulting behavior is undefined."
+msgstr ""
+
+#: config/tc-tic54x.c:5085
+#, c-format
+msgid "'%s' is not repeatable. Resulting behavior is undefined."
+msgstr ""
+
+#: config/tc-tic54x.c:5089
+msgid ""
+"Instructions using long offset modifiers or absolute addresses are not "
+"repeatable. Resulting behavior is undefined."
+msgstr ""
+
+#: config/tc-tic54x.c:5273
+#, c-format
+msgid "Unsupported relocation size %d"
+msgstr ""
+
+#: config/tc-tic54x.c:5422
+msgid "non-absolute value used with .space/.bes"
+msgstr ""
+
+#: config/tc-tic54x.c:5426
+#, c-format
+msgid "negative value ignored in %s"
+msgstr ""
+
+#: config/tc-tic54x.c:5513
+#, c-format
+msgid "attempt to .space/.bes backwards? (%ld)"
+msgstr ""
+
+#: config/tc-tic54x.c:5546
+#, c-format
+msgid "Invalid label '%s'"
+msgstr ""
+
 #: config/tc-tic80.c:90
 msgid "Relaxation is a luxury we can't afford"
 msgstr ""
@@ -6946,84 +7392,84 @@ msgstr ""
 msgid "syntax error after <exp"
 msgstr ""
 
-#: config/tc-z8k.c:287
+#: config/tc-z8k.c:288
 #, c-format
 msgid "register rr%d, out of range."
 msgstr ""
 
-#: config/tc-z8k.c:295
+#: config/tc-z8k.c:296
 #, c-format
 msgid "register rh%d, out of range."
 msgstr ""
 
-#: config/tc-z8k.c:303
+#: config/tc-z8k.c:304
 #, c-format
 msgid "register rl%d, out of range."
 msgstr ""
 
-#: config/tc-z8k.c:312
+#: config/tc-z8k.c:313
 #, c-format
 msgid "register rq%d, out of range."
 msgstr ""
 
-#: config/tc-z8k.c:320
+#: config/tc-z8k.c:321
 #, c-format
 msgid "register r%d, out of range."
 msgstr ""
 
-#: config/tc-z8k.c:371
+#: config/tc-z8k.c:372
 #, c-format
 msgid "expected %c"
 msgstr ""
 
-#: config/tc-z8k.c:387
+#: config/tc-z8k.c:388
 #, c-format
 msgid "register is wrong size for a word %s"
 msgstr ""
 
-#: config/tc-z8k.c:402
+#: config/tc-z8k.c:403
 #, c-format
 msgid "register is wrong size for address %s"
 msgstr ""
 
-#: config/tc-z8k.c:677
+#: config/tc-z8k.c:678
 msgid "Missing ) in ra(rb)"
 msgstr ""
 
-#: config/tc-z8k.c:944
+#: config/tc-z8k.c:945
 #, c-format
 msgid "operand %s0x%x out of range."
 msgstr ""
 
-#: config/tc-z8k.c:1083
+#: config/tc-z8k.c:1084
 msgid "immediate must be 1 or 2"
 msgstr ""
 
-#: config/tc-z8k.c:1088
+#: config/tc-z8k.c:1089
 msgid "immediate 1 or 2 expected"
 msgstr ""
 
-#: config/tc-z8k.c:1116
+#: config/tc-z8k.c:1117
 msgid "can't use R0 here"
 msgstr ""
 
-#: config/tc-z8k.c:1275
+#: config/tc-z8k.c:1276
 msgid "Can't find opcode to match operands"
 msgstr ""
 
-#: config/tc-z8k.c:1387
+#: config/tc-z8k.c:1388
 #, c-format
 msgid "invalid architecture -z%s"
 msgstr ""
 
-#: config/tc-z8k.c:1403
+#: config/tc-z8k.c:1404
 msgid ""
 "Z8K options:\n"
 "-z8001\t\t\tgenerate segmented code\n"
 "-z8002\t\t\tgenerate unsegmented code\n"
 msgstr ""
 
-#: config/tc-z8k.c:1540
+#: config/tc-z8k.c:1541
 #, c-format
 msgid "Can't subtract symbols in different sections %s %s"
 msgstr ""
@@ -7276,57 +7722,58 @@ msgstr ""
 msgid "Character constant too large"
 msgstr ""
 
-#: expr.c:950
+#: expr.c:956
 #, c-format
 msgid "expr.c(operand): bad atof_generic return val %d"
 msgstr ""
 
-#: expr.c:1010
-msgid "Missing ')' assumed"
+#: expr.c:1019
+#, c-format
+msgid "Missing '%c' assumed"
 msgstr ""
 
-#: expr.c:1021 read.c:3864
+#: expr.c:1031 read.c:3864
 msgid "EBCDIC constants are not supported"
 msgstr ""
 
-#: expr.c:1091
+#: expr.c:1101
 #, c-format
 msgid "Unary operator %c ignored because bad operand follows"
 msgstr ""
 
-#: expr.c:1137 expr.c:1162
+#: expr.c:1147 expr.c:1172
 msgid "syntax error in .startof. or .sizeof."
 msgstr ""
 
-#: expr.c:1312
+#: expr.c:1322
 msgid "Bad expression"
 msgstr ""
 
-#: expr.c:1680
+#: expr.c:1690
 msgid "missing operand; zero assumed"
 msgstr ""
 
-#: expr.c:1713
+#: expr.c:1723
 msgid "operation combines symbols in different segments"
 msgstr ""
 
-#: expr.c:1729
+#: expr.c:1739
 msgid "left operand is a bignum; integer 0 assumed"
 msgstr ""
 
-#: expr.c:1731
+#: expr.c:1741
 msgid "left operand is a float; integer 0 assumed"
 msgstr ""
 
-#: expr.c:1740
+#: expr.c:1750
 msgid "right operand is a bignum; integer 0 assumed"
 msgstr ""
 
-#: expr.c:1742
+#: expr.c:1752
 msgid "right operand is a float; integer 0 assumed"
 msgstr ""
 
-#: expr.c:1797 symbols.c:1109
+#: expr.c:1807 symbols.c:1109
 msgid "division by zero"
 msgstr ""
 
@@ -7428,7 +7875,7 @@ msgid "form COL= needs absolute expresssion.\n"
 msgstr ""
 
 #. Turns the next expression into a string
-#: gasp.c:1563 macro.c:377
+#: gasp.c:1563 macro.c:384
 #, c-format
 msgid "% operator needs absolute expression"
 msgstr ""
@@ -7741,39 +8188,39 @@ msgstr ""
 msgid "New line in title"
 msgstr ""
 
-#: macro.c:540
+#: macro.c:547
 msgid "unexpected end of file in macro definition"
 msgstr ""
 
-#: macro.c:549
+#: macro.c:556
 msgid "missing ) after formals"
 msgstr ""
 
-#: macro.c:706
+#: macro.c:713
 msgid "missplaced )"
 msgstr ""
 
-#: macro.c:968
+#: macro.c:975
 msgid "confusion in formal parameters"
 msgstr ""
 
-#: macro.c:973
+#: macro.c:980
 msgid "macro formal argument does not exist"
 msgstr ""
 
-#: macro.c:988
+#: macro.c:995
 msgid "can't mix positional and keyword arguments"
 msgstr ""
 
-#: macro.c:996
+#: macro.c:1003
 msgid "too many positional arguments"
 msgstr ""
 
-#: macro.c:1176
+#: macro.c:1183
 msgid "unexpected end of file in irp or irpc"
 msgstr ""
 
-#: macro.c:1184
+#: macro.c:1191
 msgid "missing model parameter"
 msgstr ""