Add support for OpenRISC 32-bit embedded processor

13 files changed, 3155 insertions, 1064 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6747d4c..43d1f73 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,18 @@
+2002-01-31  Ivan Guzvinec  <ivang@opencores.org>
+
+	* config/tc-or32.c: New file.
+	* config/tc-or32.h: New file.
+	* configure.in: Add support for or32 targets.
+	* configure: Regenerate.
+	* config/obj-coff.c: Add support for or32 targets.
+	* config/obj-coff.h: Add support for or32 targets.
+	* Makefile.am: Add support for or32 targets.
+	* Makefile.in: Regenerate.
+	* NEWS: Mention support for OpenRISC.
+	* doc/Makefile.in: Regenerate.
+	* po/POTFILES.in: Regenerate.
+	* po/gas.pot: Regenerate.
+
 2002-01-30  Richard Sandiford  <rsandifo@redhat.com>
 
 	* config/tc-sh.c (parse_reg): Fix end-of-word check for is, ix, iy
diff --git a/gas/Makefile.am b/gas/Makefile.am
index 304189d..8b64d63 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -65,6 +65,7 @@ CPU_TYPES = \
 	mn10300 \
 	ns32k \
 	openrisc \
+	or32 \
 	pdp11 \
 	pj \
 	ppc \
@@ -251,6 +252,7 @@ TARGET_CPU_CFILES = \
 	config/tc-mn10300.c \
 	config/tc-ns32k.c \
 	config/tc-openrisc.c \
+	config/tc-or32.c \
 	config/tc-pdp11.c \
 	config/tc-pj.c \
 	config/tc-ppc.c \
@@ -296,6 +298,7 @@ TARGET_CPU_HFILES = \
 	config/tc-mn10300.h \
 	config/tc-ns32k.h \
 	config/tc-openrisc.h \
+	config/tc-or32.h \
 	config/tc-pdp11.h \
 	config/tc-pj.h \
 	config/tc-ppc.h \
diff --git a/gas/Makefile.in b/gas/Makefile.in
index 5664979..4be8550 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -176,6 +176,7 @@ CPU_TYPES = \
 	mn10300 \
 	ns32k \
 	openrisc \
+	or32 \
 	pdp11 \
 	pj \
 	ppc \
@@ -368,6 +369,7 @@ TARGET_CPU_CFILES = \
 	config/tc-mn10300.c \
 	config/tc-ns32k.c \
 	config/tc-openrisc.c \
+	config/tc-or32.c \
 	config/tc-pdp11.c \
 	config/tc-pj.c \
 	config/tc-ppc.c \
@@ -414,6 +416,7 @@ TARGET_CPU_HFILES = \
 	config/tc-mn10300.h \
 	config/tc-ns32k.h \
 	config/tc-openrisc.h \
+	config/tc-or32.h \
 	config/tc-pdp11.h \
 	config/tc-pj.h \
 	config/tc-ppc.h \
@@ -2228,7 +2231,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)
@@ -2389,7 +2392,7 @@ maintainer-clean-recursive:
 	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
 	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
+	  test "$$subdir" != "." || dot_seen=yes; \
 	done; \
 	test "$$dot_seen" = "no" && rev=". $$rev"; \
 	target=`echo $@ | sed s/-recursive//`; \
diff --git a/gas/NEWS b/gas/NEWS
index 950f63b..227dba5 100644
--- a/gas/NEWS
+++ b/gas/NEWS
@@ -1,4 +1,6 @@
 -*- text -*-
+Support for the OpenRISC 32-bit embedded processor by OpenCores.
+
 The ARM assembler now accepts -march=..., -mcpu=... and -mfpu=... for
 specifying the target instruction set.  The old method of specifying the
 target processor has been deprecated, but is still accepted for
diff --git a/gas/config/obj-coff.c b/gas/config/obj-coff.c
index 759389a..c956d62 100644
--- a/gas/config/obj-coff.c
+++ b/gas/config/obj-coff.c
@@ -1,6 +1,6 @@
 /* coff object file format
    Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001
+   1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
 
    This file is part of GAS.
@@ -1889,7 +1889,7 @@ count_entries_in_chain (idx)
     {
       if (fixup_ptr->fx_done == 0 && TC_COUNT_RELOC (fixup_ptr))
 	{
-#ifdef TC_A29K
+#if defined(TC_A29K) || defined(TC_OR32)
 	  if (fixup_ptr->fx_r_type == RELOC_CONSTH)
 	    nrelocs += 2;
 	  else
@@ -2048,6 +2048,20 @@ do_relocs_for (abfd, h, file_cursor)
 			  ext_ptr++;
 			}
 #endif
+#if defined(TC_OR32)
+		      /* The or32 has a special kludge for the high 16 bit
+			 reloc.  Two relocations are emited, R_IHIHALF,
+			 and R_IHCONST. The second one doesn't contain a
+			 symbol, but uses the value for offset.  */
+		      if (intr.r_type == R_IHIHALF)
+			{
+			  /* Now emit the second bit.  */
+			  intr.r_type = R_IHCONST;
+			  intr.r_symndx = fix_ptr->fx_addnumber;
+			  (void) bfd_coff_swap_reloc_out (abfd, & intr, ext_ptr);
+			  ext_ptr ++;
+			}
+#endif
 		    }
 
 		  fix_ptr = fix_ptr->fx_next;
@@ -2127,6 +2141,7 @@ fill_section (abfd, h, file_cursor)
 		 COFF_NOLOAD_PROBLEM, and have only one test here.  */
 #ifndef TC_I386
 #ifndef TC_A29K
+#ifndef TC_OR32
 #ifndef COFF_NOLOAD_PROBLEM
 	      /* Apparently the SVR3 linker (and exec syscall) and UDI
 		 mondfe progrem are confused by noload sections.  */
@@ -2134,6 +2149,7 @@ fill_section (abfd, h, file_cursor)
 #endif
 #endif
 #endif
+#endif
 	    }
 	  else if (strcmp (s->s_name, ".lit") == 0)
 	    s->s_flags = STYP_LIT | STYP_TEXT;
@@ -4420,7 +4436,7 @@ fixup_segment (segP, this_segment_type)
 		  break;
 		default:
 
-#if defined(TC_A29K) || (defined(TE_PE) && defined(TC_I386)) || defined(TC_M88K)
+#if defined(TC_A29K) || (defined(TE_PE) && defined(TC_I386)) || defined(TC_M88K) || defined(TC_OR32)
 		  /* This really should be handled in the linker, but
 		     backward compatibility forbids.  */
 		  add_number += S_GET_VALUE (add_symbolP);
@@ -4466,7 +4482,7 @@ fixup_segment (segP, this_segment_type)
 
       if (pcrel)
 	{
-#if !defined(TC_M88K) && !(defined(TE_PE) && defined(TC_I386)) && !defined(TC_A29K)
+#if !defined(TC_M88K) && !(defined(TE_PE) && defined(TC_I386)) && !defined(TC_A29K) && !defined(TC_OR32)
 	  /* This adjustment is not correct on the m88k, for which the
 	     linker does all the computation.  */
 	  add_number -= md_pcrel_from (fixP);
diff --git a/gas/config/obj-coff.h b/gas/config/obj-coff.h
index 98948be..1a50359 100644
--- a/gas/config/obj-coff.h
+++ b/gas/config/obj-coff.h
@@ -1,6 +1,6 @@
 /* coff object file format
    Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000
+   1999, 2000, 2002
    Free Software Foundation, Inc.
 
    This file is part of GAS.
@@ -90,6 +90,11 @@
 #define TARGET_FORMAT "coff-a29k-big"
 #endif
 
+#ifdef TC_OR32
+#include "coff/or32.h"
+#define TARGET_FORMAT "coff-or32-big"
+#endif
+
 #ifdef TC_I960
 #include "coff/i960.h"
 #define TARGET_FORMAT "coff-Intel-little"
@@ -190,9 +195,7 @@ extern void coff_obj_symbol_new_hook PARAMS ((symbolS *));
 extern void coff_obj_read_begin_hook PARAMS ((void));
 #define obj_read_begin_hook coff_obj_read_begin_hook
 
-/* ***********************************************************************
-
-   This file really contains two implementations of the COFF back end.
+/* This file really contains two implementations of the COFF back end.
    They are in the process of being merged, but this is only a
    preliminary, mechanical merging.  Many definitions that are
    identical between the two are still found in both versions.
@@ -226,9 +229,7 @@ extern void coff_obj_read_begin_hook PARAMS ((void));
    See doc/internals.texi for a brief discussion of the history, if
    you care.
 
-   Ken Raeburn, 5 May 1994
-
-   *********************************************************************** */
+   Ken Raeburn, 5 May 1994.  */
 
 #ifdef BFD_ASSEMBLER
 
@@ -257,10 +258,10 @@ extern void coff_obj_read_begin_hook PARAMS ((void));
 
 extern void obj_coff_section PARAMS ((int));
 
-/* The number of auxiliary entries */
+/* The number of auxiliary entries.  */
 #define S_GET_NUMBER_AUXILIARY(s) \
   (coffsymbol (symbol_get_bfdsym (s))->native->u.syment.n_numaux)
-/* The number of auxiliary entries */
+/* The number of auxiliary entries.  */
 #define S_SET_NUMBER_AUXILIARY(s,v)	(S_GET_NUMBER_AUXILIARY (s) = (v))
 
 /* True if a symbol name is in the string table, i.e. its length is > 8.  */
@@ -271,9 +272,9 @@ extern int S_SET_STORAGE_CLASS PARAMS ((symbolS *, int));
 extern int S_GET_STORAGE_CLASS PARAMS ((symbolS *));
 extern void SA_SET_SYM_ENDNDX PARAMS ((symbolS *, symbolS *));
 
-/* Auxiliary entry macros. SA_ stands for symbol auxiliary */
-/* Omit the tv related fields */
-/* Accessors */
+/* Auxiliary entry macros. SA_ stands for symbol auxiliary.  */
+/* Omit the tv related fields.  */
+/* Accessors.  */
 
 #define SA_GET_SYM_TAGNDX(s)	(SYM_AUXENT (s)->x_sym.x_tagndx.l)
 #define SA_GET_SYM_LNNO(s)	(SYM_AUXENT (s)->x_sym.x_misc.x_lnsz.x_lnno)
@@ -297,15 +298,13 @@ extern void SA_SET_SYM_ENDNDX PARAMS ((symbolS *, symbolS *));
 #define SA_SET_SCN_NRELOC(s,v)	(SYM_AUXENT (s)->x_scn.x_nreloc=(v))
 #define SA_SET_SCN_NLINNO(s,v)	(SYM_AUXENT (s)->x_scn.x_nlinno=(v))
 
-/*
- * Internal use only definitions. SF_ stands for symbol flags.
- *
- * These values can be assigned to sy_symbol.ost_flags field of a symbolS.
- *
- * You'll break i960 if you shift the SYSPROC bits anywhere else.  for
- * more on the balname/callname hack, see tc-i960.h.  b.out is done
- * differently.
- */
+/* Internal use only definitions. SF_ stands for symbol flags.
+  
+   These values can be assigned to sy_symbol.ost_flags field of a symbolS.
+  
+   You'll break i960 if you shift the SYSPROC bits anywhere else.  for
+   more on the balname/callname hack, see tc-i960.h.  b.out is done
+   differently.  */
 
 #define SF_I960_MASK	(0x000001ff)	/* Bits 0-8 are used by the i960 port.  */
 #define SF_SYSPROC	(0x0000003f)	/* bits 0-5 are used to store the sysproc number */
@@ -330,7 +329,7 @@ extern void SA_SET_SYM_ENDNDX PARAMS ((symbolS *, symbolS *));
 #define SF_GET_SEGMENT	(0x00200000)	/* Get the section of the forward symbol.  */
 /* All other bits are unused.  */
 
-/* Accessors */
+/* Accessors.  */
 #define SF_GET(s)		(*symbol_get_obj (s))
 #define SF_GET_DEBUG(s)		(symbol_get_bfdsym (s)->flags & BSF_DEBUGGING)
 #define SF_SET_DEBUG(s)		(symbol_get_bfdsym (s)->flags |= BSF_DEBUGGING)
@@ -352,7 +351,7 @@ extern void SA_SET_SYM_ENDNDX PARAMS ((symbolS *, symbolS *));
 #define SF_GET_IS_SYSPROC(s)	(SF_GET (s) & SF_IS_SYSPROC)	/* used by i960 */
 #define SF_GET_SYSPROC(s)	(SF_GET (s) & SF_SYSPROC)	/* used by i960 */
 
-/* Modifiers */
+/* Modifiers.  */
 #define SF_SET(s,v)		(SF_GET (s) = (v))
 #define SF_SET_NORMAL_FIELD(s,v) (SF_GET (s) |= ((v) & SF_NORMAL_MASK))
 #define SF_SET_DEBUG_FIELD(s,v)	(SF_GET (s) |= ((v) & SF_DEBUG_MASK))
@@ -414,7 +413,7 @@ extern symbolS *coff_last_function;
 #endif
 #endif
 
-/* sanity check */
+/* Sanity check.  */
 
 #ifdef TC_I960
 #ifndef C_LEAFSTAT
@@ -424,8 +423,8 @@ hey ! Where is the C_LEAFSTAT definition ? i960 - coff support is depending on i
 
 #else /* not BFD_ASSEMBLER */
 
-#ifdef TC_A29K
-/* Allow translate from aout relocs to coff relocs */
+#if defined TC_A29K || defined TC_OR32
+/* Allow translate from aout relocs to coff relocs.  */
 #define NO_RELOC 20
 #define RELOC_32 1
 #define RELOC_8 2
@@ -447,7 +446,7 @@ extern const segT N_TYPE_seg[];
 
 /* SYMBOL TABLE */
 
-/* Symbol table entry data type */
+/* Symbol table entry data type.  */
 
 typedef struct
 {
@@ -455,18 +454,17 @@ typedef struct
   struct internal_syment ost_entry;
   /* Auxiliary entry.  */
   union internal_auxent ost_auxent[OBJ_COFF_MAX_AUXENTRIES];
-  /* obj_coff internal use only flags */
+  /* obj_coff internal use only flags.  */
   unsigned int ost_flags;
 } obj_symbol_type;
 
 #ifndef DO_NOT_STRIP
 #define DO_NOT_STRIP	0
 #endif
-/* Symbol table macros and constants */
+/* Symbol table macros and constants.  */
 
 /* Possible and usefull section number in symbol table
- * The values of TEXT, DATA and BSS may not be portable.
- */
+   The values of TEXT, DATA and BSS may not be portable.  */
 
 #define C_ABS_SECTION		N_ABS
 #define C_UNDEF_SECTION		N_UNDEF
@@ -475,27 +473,25 @@ typedef struct
 #define C_PTV_SECTION		P_TV
 #define C_REGISTER_SECTION	50
 
-/*
- *  Macros to extract information from a symbol table entry.
- *  This syntaxic indirection allows independence regarding a.out or coff.
- *  The argument (s) of all these macros is a pointer to a symbol table entry.
- */
+/* Macros to extract information from a symbol table entry.
+   This syntaxic indirection allows independence regarding a.out or coff.
+   The argument (s) of all these macros is a pointer to a symbol table entry.  */
 
-/* Predicates */
-/* True if the symbol is external */
+/* Predicates.  */
+/* True if the symbol is external.  */
 #define S_IS_EXTERNAL(s)        ((s)->sy_symbol.ost_entry.n_scnum == C_UNDEF_SECTION)
 /* True if symbol has been defined, ie :
    section > 0 (DATA, TEXT or BSS)
-   section == 0 and value > 0 (external bss symbol) */
+   section == 0 and value > 0 (external bss symbol).  */
 #define S_IS_DEFINED(s) \
   ((s)->sy_symbol.ost_entry.n_scnum > C_UNDEF_SECTION \
    || ((s)->sy_symbol.ost_entry.n_scnum == C_UNDEF_SECTION \
        && S_GET_VALUE (s) > 0) \
    || ((s)->sy_symbol.ost_entry.n_scnum == C_ABS_SECTION))
-/* True if a debug special symbol entry */
+/* True if a debug special symbol entry.  */
 #define S_IS_DEBUG(s)		((s)->sy_symbol.ost_entry.n_scnum == C_DEBUG_SECTION)
-/* True if a symbol is local symbol name */
-/* A symbol name whose name includes ^A is a gas internal pseudo symbol */
+/* True if a symbol is local symbol name.  */
+/* A symbol name whose name includes ^A is a gas internal pseudo symbol.  */
 #define S_IS_LOCAL(s) \
   ((s)->sy_symbol.ost_entry.n_scnum == C_REGISTER_SECTION \
    || (S_LOCAL_NAME(s) && ! flag_keep_locals && ! S_IS_DEBUG (s)) \
@@ -504,13 +500,11 @@ typedef struct
    || (flag_strip_local_absolute \
        && !S_IS_EXTERNAL(s) \
        && (s)->sy_symbol.ost_entry.n_scnum == C_ABS_SECTION))
-/* True if a symbol is not defined in this file */
+/* True if a symbol is not defined in this file.  */
 #define S_IS_EXTERN(s)		((s)->sy_symbol.ost_entry.n_scnum == 0 \
 				 && S_GET_VALUE (s) == 0)
-/*
- * True if a symbol can be multiply defined (bss symbols have this def
- * though it is bad practice)
- */
+/* True if a symbol can be multiply defined (bss symbols have this def
+   though it is bad practice).  */
 #define S_IS_COMMON(s)		((s)->sy_symbol.ost_entry.n_scnum == 0 \
 				 && S_GET_VALUE (s) != 0)
 /* True if a symbol name is in the string table, i.e. its length is > 8.  */
@@ -526,41 +520,41 @@ typedef struct
   ((s)->sy_symbol.ost_entry.n_sclass == C_WEAKEXT)
 #endif
 
-/* Accessors */
-/* The name of the symbol */
+/* Accessors.  */
+/* The name of the symbol.  */
 #define S_GET_NAME(s)		((char*) (s)->sy_symbol.ost_entry.n_offset)
-/* The pointer to the string table */
+/* The pointer to the string table.  */
 #define S_GET_OFFSET(s)         ((s)->sy_symbol.ost_entry.n_offset)
-/* The numeric value of the segment */
+/* The numeric value of the segment.  */
 #define S_GET_SEGMENT(s)   s_get_segment(s)
-/* The data type */
+/* The data type.  */
 #define S_GET_DATA_TYPE(s)	((s)->sy_symbol.ost_entry.n_type)
-/* The storage class */
+/* The storage class.  */
 #define S_GET_STORAGE_CLASS(s)	((s)->sy_symbol.ost_entry.n_sclass)
-/* The number of auxiliary entries */
+/* The number of auxiliary entries.  */
 #define S_GET_NUMBER_AUXILIARY(s)	((s)->sy_symbol.ost_entry.n_numaux)
 
-/* Modifiers */
-/* Set the name of the symbol */
+/* Modifiers.  */
+/* Set the name of the symbol.  */
 #define S_SET_NAME(s,v)		((s)->sy_symbol.ost_entry.n_offset = (unsigned long) (v))
-/* Set the offset of the symbol */
+/* Set the offset of the symbol.  */
 #define S_SET_OFFSET(s,v)	((s)->sy_symbol.ost_entry.n_offset = (v))
-/* The numeric value of the segment */
+/* The numeric value of the segment.  */
 #define S_SET_SEGMENT(s,v)	((s)->sy_symbol.ost_entry.n_scnum = SEGMENT_TO_SYMBOL_TYPE(v))
-/* The data type */
+/* The data type.  */
 #define S_SET_DATA_TYPE(s,v)	((s)->sy_symbol.ost_entry.n_type = (v))
-/* The storage class */
+/* The storage class.  */
 #define S_SET_STORAGE_CLASS(s,v)	((s)->sy_symbol.ost_entry.n_sclass = (v))
-/* The number of auxiliary entries */
+/* The number of auxiliary entries.  */
 #define S_SET_NUMBER_AUXILIARY(s,v)	((s)->sy_symbol.ost_entry.n_numaux = (v))
 
-/* Additional modifiers */
-/* The symbol is external (does not mean undefined) */
+/* Additional modifiers.  */
+/* The symbol is external (does not mean undefined).  */
 #define S_SET_EXTERNAL(s)       { S_SET_STORAGE_CLASS(s, C_EXT) ; SF_CLEAR_LOCAL(s); }
 
-/* Auxiliary entry macros. SA_ stands for symbol auxiliary */
-/* Omit the tv related fields */
-/* Accessors */
+/* Auxiliary entry macros. SA_ stands for symbol auxiliary.  */
+/* Omit the tv related fields.  */
+/* Accessors.  */
 #define SYM_AUXENT(S)	(&(S)->sy_symbol.ost_auxent[0])
 
 #define SA_GET_SYM_TAGNDX(s)	(SYM_AUXENT (s)->x_sym.x_tagndx.l)
@@ -577,7 +571,7 @@ typedef struct
 #define SA_GET_SCN_NRELOC(s)	(SYM_AUXENT (s)->x_scn.x_nreloc)
 #define SA_GET_SCN_NLINNO(s)	(SYM_AUXENT (s)->x_scn.x_nlinno)
 
-/* Modifiers */
+/* Modifiers.  */
 #define SA_SET_SYM_TAGNDX(s,v)	(SYM_AUXENT (s)->x_sym.x_tagndx.l=(v))
 #define SA_SET_SYM_LNNO(s,v)	(SYM_AUXENT (s)->x_sym.x_misc.x_lnsz.x_lnno=(v))
 #define SA_SET_SYM_SIZE(s,v)	(SYM_AUXENT (s)->x_sym.x_misc.x_lnsz.x_size=(v))
@@ -592,15 +586,13 @@ typedef struct
 #define SA_SET_SCN_NRELOC(s,v)	(SYM_AUXENT (s)->x_scn.x_nreloc=(v))
 #define SA_SET_SCN_NLINNO(s,v)	(SYM_AUXENT (s)->x_scn.x_nlinno=(v))
 
-/*
- * Internal use only definitions. SF_ stands for symbol flags.
- *
- * These values can be assigned to sy_symbol.ost_flags field of a symbolS.
- *
- * You'll break i960 if you shift the SYSPROC bits anywhere else.  for
- * more on the balname/callname hack, see tc-i960.h.  b.out is done
- * differently.
- */
+/* Internal use only definitions. SF_ stands for symbol flags.
+  
+   These values can be assigned to sy_symbol.ost_flags field of a symbolS.
+  
+   You'll break i960 if you shift the SYSPROC bits anywhere else.  for
+   more on the balname/callname hack, see tc-i960.h.  b.out is done
+   differently.  */
 
 #define SF_I960_MASK	(0x000001ff)	/* Bits 0-8 are used by the i960 port.  */
 #define SF_SYSPROC	(0x0000003f)	/* bits 0-5 are used to store the sysproc number */
@@ -626,7 +618,7 @@ typedef struct
 #define SF_ADJ_LNNOPTR	(0x00400000)	/* Has a lnnoptr */
 /* All other bits are unused.  */
 
-/* Accessors */
+/* Accessors.  */
 #define SF_GET(s)		((s)->sy_symbol.ost_flags)
 #define SF_GET_NORMAL_FIELD(s)	(SF_GET (s) & SF_NORMAL_MASK)
 #define SF_GET_DEBUG_FIELD(s)	(SF_GET (s) & SF_DEBUG_MASK)
@@ -648,7 +640,7 @@ typedef struct
 #define SF_GET_IS_SYSPROC(s)	(SF_GET (s) & SF_IS_SYSPROC)	/* used by i960 */
 #define SF_GET_SYSPROC(s)	(SF_GET (s) & SF_SYSPROC)	/* used by i960 */
 
-/* Modifiers */
+/* Modifiers.  */
 #define SF_SET(s,v)		(SF_GET (s) = (v))
 #define SF_SET_NORMAL_FIELD(s,v) (SF_GET (s) |= ((v) & SF_NORMAL_MASK))
 #define SF_SET_DEBUG_FIELD(s,v)	(SF_GET (s) |= ((v) & SF_DEBUG_MASK))
@@ -671,12 +663,10 @@ typedef struct
 #define SF_SET_IS_SYSPROC(s)	(SF_GET (s) |= SF_IS_SYSPROC)	/* used by i960 */
 #define SF_SET_SYSPROC(s,v)	(SF_GET (s) |= ((v) & SF_SYSPROC))	/* used by i960 */
 
-/* File header macro and type definition */
+/* File header macro and type definition.  */
 
-/*
- * File position calculators. Beware to use them when all the
- * appropriate fields are set in the header.
- */
+/* File position calculators. Beware to use them when all the
+   appropriate fields are set in the header.  */
 
 #ifdef OBJ_COFF_OMIT_OPTIONAL_HEADER
 #define OBJ_COFF_AOUTHDRSZ (0)
@@ -714,8 +704,8 @@ typedef struct
 	   H_GET_TEXT_SIZE(h) + H_GET_DATA_SIZE(h) + \
 	   H_GET_RELOCATION_SIZE(h) + H_GET_LINENO_SIZE(h))
 
-/* Accessors */
-/* aouthdr */
+/* Accessors.  */
+/* aouthdr.  */
 #define H_GET_MAGIC_NUMBER(h)           ((h)->aouthdr.magic)
 #define H_GET_VERSION_STAMP(h)		((h)->aouthdr.vstamp)
 #define H_GET_TEXT_SIZE(h)              ((h)->aouthdr.tsize)
@@ -724,7 +714,7 @@ typedef struct
 #define H_GET_ENTRY_POINT(h)            ((h)->aouthdr.entry)
 #define H_GET_TEXT_START(h)		((h)->aouthdr.text_start)
 #define H_GET_DATA_START(h)		((h)->aouthdr.data_start)
-/* filehdr */
+/* filehdr.  */
 #define H_GET_FILE_MAGIC_NUMBER(h)	((h)->filehdr.f_magic)
 #define H_GET_NUMBER_OF_SECTIONS(h)	((h)->filehdr.f_nscns)
 #define H_GET_TIME_STAMP(h)		((h)->filehdr.f_timdat)
@@ -733,7 +723,7 @@ typedef struct
 #define H_GET_SYMBOL_TABLE_SIZE(h)	(H_GET_SYMBOL_COUNT(h) * SYMESZ)
 #define H_GET_SIZEOF_OPTIONAL_HEADER(h)	((h)->filehdr.f_opthdr)
 #define H_GET_FLAGS(h)			((h)->filehdr.f_flags)
-/* Extra fields to achieve bsd a.out compatibility and for convenience */
+/* Extra fields to achieve bsd a.out compatibility and for convenience.  */
 #define H_GET_RELOCATION_SIZE(h)   	((h)->relocation_size)
 #define H_GET_STRING_SIZE(h)            ((h)->string_table_size)
 #define H_GET_LINENO_SIZE(h)            ((h)->lineno_size)
@@ -750,8 +740,8 @@ typedef struct
 #define H_GET_TEXT_RELOCATION_SIZE(h)	(text_section_header.s_nreloc * RELSZ)
 #define H_GET_DATA_RELOCATION_SIZE(h)	(data_section_header.s_nreloc * RELSZ)
 
-/* Modifiers */
-/* aouthdr */
+/* Modifiers.  */
+/* aouthdr.  */
 #define H_SET_MAGIC_NUMBER(h,v)         ((h)->aouthdr.magic = (v))
 #define H_SET_VERSION_STAMP(h,v)	((h)->aouthdr.vstamp = (v))
 #define H_SET_TEXT_SIZE(h,v)            ((h)->aouthdr.tsize = (v))
@@ -760,7 +750,7 @@ typedef struct
 #define H_SET_ENTRY_POINT(h,v)          ((h)->aouthdr.entry = (v))
 #define H_SET_TEXT_START(h,v)		((h)->aouthdr.text_start = (v))
 #define H_SET_DATA_START(h,v)		((h)->aouthdr.data_start = (v))
-/* filehdr */
+/* filehdr.  */
 #define H_SET_FILE_MAGIC_NUMBER(h,v)	((h)->filehdr.f_magic = (v))
 #define H_SET_NUMBER_OF_SECTIONS(h,v)	((h)->filehdr.f_nscns = (v))
 #define H_SET_TIME_STAMP(h,v)		((h)->filehdr.f_timdat = (v))
@@ -768,30 +758,30 @@ typedef struct
 #define H_SET_SYMBOL_TABLE_SIZE(h,v)    ((h)->filehdr.f_nsyms = (v))
 #define H_SET_SIZEOF_OPTIONAL_HEADER(h,v) ((h)->filehdr.f_opthdr = (v))
 #define H_SET_FLAGS(h,v)		((h)->filehdr.f_flags = (v))
-/* Extra fields to achieve bsd a.out compatibility and for convinience */
+/* Extra fields to achieve bsd a.out compatibility and for convinience.  */
 #define H_SET_RELOCATION_SIZE(h,t,d) 	((h)->relocation_size = (t)+(d))
 #define H_SET_STRING_SIZE(h,v)          ((h)->string_table_size = (v))
 #define H_SET_LINENO_SIZE(h,v)          ((h)->lineno_size = (v))
 
-/* Segment flipping */
+/* Segment flipping.  */
 
 typedef struct
 {
   struct internal_aouthdr aouthdr;	/* a.out header */
   struct internal_filehdr filehdr;	/* File header, not machine dep.  */
-  long string_table_size;	/* names + '\0' + sizeof (int) */
-  long relocation_size;	/* Cumulated size of relocation
-			   information for all sections in
-			   bytes.  */
-  long lineno_size;		/* Size of the line number information
-				   table in bytes */
+  long string_table_size;		/* names + '\0' + sizeof (int) */
+  long relocation_size;			/* Cumulated size of relocation
+					   information for all sections in
+					   bytes.  */
+  long lineno_size;			/* Size of the line number information
+					   table in bytes.  */
 } object_headers;
 
 struct lineno_list
 {
   struct bfd_internal_lineno line;
-  char *frag;			/* Frag to which the line number is related */
-  struct lineno_list *next;	/* Forward chain pointer */
+  char *frag;			/* Frag to which the line number is related.  */
+  struct lineno_list *next;	/* Forward chain pointer.  */
 };
 
 #define obj_segment_name(i) (segment_info[(int) (i)].scnhdr.s_name)
@@ -823,7 +813,7 @@ extern void c_section_header PARAMS ((struct internal_scnhdr * header,
 void tc_coff_symbol_emit_hook PARAMS ((symbolS *));
 #endif
 
-/* sanity check */
+/* Sanity check.  */
 
 #ifdef TC_I960
 #ifndef C_LEAFSTAT
diff --git a/gas/config/tc-or32.c b/gas/config/tc-or32.c
new file mode 100644
index 0000000..4f0c2ec
--- /dev/null
+++ b/gas/config/tc-or32.c
@@ -0,0 +1,1636 @@
+/* Assembly backend for the OpenRISC 1000.
+   Copyright (C) 2002 Free Software Foundation, Inc.
+   Contributed by Damjan Lampret <lampret@opencores.org>.
+   Modified bu Johan Rydberg, <johan.rydberg@netinsight.se>.
+   Based upon a29k port.
+
+   This file is part of GAS, the GNU Assembler.
+
+   GAS is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   GAS is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GAS; see the file COPYING.  If not, write to
+   the Free Software Foundation, 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* tc-a29k.c used as a template.  */
+
+#include "safe-ctype.h"
+#include "as.h"
+#include "opcode/or32.h"
+
+#ifdef BFD_ASSEMBLER
+#include "elf/or32.h" 
+#endif
+
+#define DEBUG 0
+
+#ifndef REGISTER_PREFIX
+#define REGISTER_PREFIX   '%'
+#endif
+
+/* Make it easier to clone this machine desc into another one.  */
+#define machine_opcode  or32_opcode
+#define machine_opcodes or32_opcodes
+#define machine_ip      or32_ip
+#define machine_it      or32_it
+
+/* Handle of the OPCODE hash table.  */
+static struct hash_control *op_hash = NULL;
+
+struct machine_it
+  {
+    char *          error;
+    unsigned long   opcode;
+    struct nlist *  nlistp;
+    expressionS     exp;
+    int             pcrel;
+    int             reloc_offset;   /* Offset of reloc within insn.  */
+    int             reloc;
+  }
+the_insn;
+
+static void machine_ip PARAMS ((char *));
+
+const pseudo_typeS md_pseudo_table[] =
+  {
+    {"align",   s_align_bytes,  4 },
+    {"space",   s_space,        0 },
+    {"cputype", s_ignore,       0 }, 
+    {"reg",     s_lsym,         0 },  /* Register equate, same as equ.  */
+    {"sect",    s_ignore,       0 },  /* Creation of coff sections.  */
+    {"proc",    s_ignore,       0 },  /* Start of a function.  */
+    {"endproc", s_ignore,       0 },  /* Function end.  */
+    {"word",    cons,           4 },
+    {NULL,      0,              0 },
+  };
+
+int md_short_jump_size  = 4;
+int md_long_jump_size   = 4;
+
+#if defined(BFD_HEADERS)
+#ifdef RELSZ
+const int md_reloc_size = RELSZ;  /* Coff headers.  */
+#else
+const int md_reloc_size = 12;   /* Something else headers.  */
+#endif
+#else
+const int md_reloc_size = 12;   /* Not bfdized.  */
+#endif
+
+/* This array holds the chars that always start a comment.
+   If the pre-processor is disabled, these aren't very useful.  */
+const char comment_chars[] = "#";
+
+/* This array holds the chars that only start a comment at the beginning of
+   a line.  If the line seems to have the form '# 123 filename'
+   .line and .file directives will appear in the pre-processed output.  */
+/* Note that input_file.c hand checks for '#' at the beginning of the
+   first line of the input file.  This is because the compiler outputs
+   #NO_APP at the beginning of its output.  */
+/* Also note that comments like this one will always work.  */
+const char line_comment_chars[] = "#";
+
+/* We needed an unused char for line separation to work around the
+   lack of macros, using sed and such.  */
+const char line_separator_chars[] = ";";
+
+/* Chars that can be used to separate mant from exp in floating point nums.  */
+const char EXP_CHARS[] = "eE";
+
+/* Chars that mean this number is a floating point constant.
+   As in 0f12.456
+   or    0d1.2345e12.  */
+const char FLT_CHARS[] = "rRsSfFdDxXpP";
+
+/* "l.jalr r9" precalculated opcode.  */
+static unsigned long jalr_r9_opcode;
+
+
+static int check_invalid_opcode PARAMS ((unsigned long));
+static void encode PARAMS ((const struct machine_opcode *, unsigned long *, signed long, char));
+#ifdef BFD_ASSEMBLER
+static char * parse_operand PARAMS ((char *, expressionS *, int));
+#endif
+
+/* Set bits in machine opcode according to insn->encoding
+   description and passed operand.  */ 
+
+static void 
+encode (insn, opcode, param_val, param_ch)
+     const struct machine_opcode *insn;
+     unsigned long *opcode;
+     signed long param_val;
+     char param_ch;
+{
+  int opc_pos = 0;
+  int param_pos = 0;
+  char *enc;
+
+#if DEBUG
+  printf ("    encode:  opcode=%.8lx  param_val=%.8lx abs=%.8lx param_ch=%c\n",
+	  *opcode, param_val, abs (param_val), param_ch);
+#endif
+  for (enc = insn->encoding; *enc != '\0'; enc++)
+    if (*enc == param_ch)
+      {
+	if (enc - 2 >= insn->encoding && (*(enc - 2) == '0') && (*(enc - 1) == 'x'))
+	  continue;
+	else
+	  param_pos ++;
+      }
+
+  opc_pos = 32;
+
+  for (enc = insn->encoding; *enc != '\0';)
+    {
+      if ((*enc == '0') && (*(enc + 1) == 'x')) 
+	{
+	  int tmp = strtol (enc, NULL, 16);
+
+	  opc_pos -= 4;
+	  *opcode |= tmp << opc_pos;
+	  enc += 3;
+	}
+      else if ((*enc == '0') || (*enc == '-')) 
+	{
+	  opc_pos--;
+	  enc++;
+	}
+      else if (*enc == '1') 
+	{
+	  opc_pos--;
+	  *opcode |= 1 << opc_pos;
+	  enc++;
+	}
+      else if (*enc == param_ch) 
+	{
+	  opc_pos--;
+	  param_pos--;
+	  *opcode |= ((param_val >> param_pos) & 0x1) << opc_pos;
+	  enc++;
+	}
+      else if (ISALPHA (*enc)) 
+	{
+	  opc_pos--;
+	  enc++;
+	}
+      else
+	enc++;
+    }
+      
+#if DEBUG
+  printf ("    opcode=%.8lx\n", *opcode);
+#endif
+}
+
+/* This function is called once, at assembler startup time.  It should
+   set up all the tables, etc., that the MD part of the assembler will
+   need.  */
+
+void
+md_begin ()
+{
+  const char *retval = NULL;
+  int lose = 0;
+  int skipnext = 0;
+  unsigned int i;
+
+  /* Hash up all the opcodes for fast use later.  */
+  op_hash = hash_new ();
+
+  for (i = 0; i < or32_num_opcodes; i++)
+    {
+      const char *name = machine_opcodes[i].name;
+
+      if (skipnext)
+        {
+          skipnext = 0;
+          continue;
+        }
+
+      retval = hash_insert (op_hash, name, (PTR) &machine_opcodes[i]);
+      if (retval != NULL)
+        {
+          fprintf (stderr, "internal error: can't hash `%s': %s\n",
+                   machine_opcodes[i].name, retval);
+          lose = 1;
+        }
+    }
+
+  if (lose)
+    as_fatal (_("Broken assembler.  No assembly attempted."));
+
+  encode (&machine_opcodes[insn_index ("l.jalr")], &jalr_r9_opcode, 9, 'B');
+}
+
+/* Returs non zero if instruction is to be used.  */
+
+static int
+check_invalid_opcode (opcode)
+     unsigned long opcode;
+{
+  return opcode == jalr_r9_opcode;
+}
+
+/* Assemble a single instruction.  Its label has already been handled
+   by the generic front end.  We just parse opcode and operands, and
+   produce the bytes of data and relocation.  */
+
+void
+md_assemble (str)
+     char *str;
+{
+  char *toP;
+
+#if DEBUG
+  printf ("NEW INSTRUCTION\n");
+#endif
+
+  know (str);
+  machine_ip (str);
+  toP = frag_more (4);
+
+  /* Put out the opcode.  */
+  md_number_to_chars (toP, the_insn.opcode, 4);
+
+  /* Put out the symbol-dependent stuff.  */
+#ifdef BFD_ASSEMBLER
+  if (the_insn.reloc != BFD_RELOC_NONE)
+#else
+  if (the_insn.reloc != NO_RELOC)
+#endif
+    {
+      fix_new_exp (frag_now,
+                   (toP - frag_now->fr_literal + the_insn.reloc_offset),
+                   4,   /* size */
+                   &the_insn.exp,
+                   the_insn.pcrel,
+                   the_insn.reloc);
+    }
+}
+
+/* This is true of the we have issued a "lo(" or "hi"(.  */
+static int waiting_for_shift = 0;
+
+static int mask_or_shift = 0;
+
+#ifdef BFD_ASSEMBLER
+static char *
+parse_operand (s, operandp, opt)
+     char *s;
+     expressionS *operandp;
+     int opt;
+{
+  char *save = input_line_pointer;
+  char *new;
+
+#if DEBUG
+  printf ("  PROCESS NEW OPERAND(%s) == %c (%d)\n", s, opt ? opt : '!', opt);
+#endif
+
+  input_line_pointer = s;
+
+  if (strncasecmp (s, "HI(", 3) == 0)
+    {
+      waiting_for_shift = 1;
+      mask_or_shift = BFD_RELOC_HI16;
+
+      input_line_pointer += 3;
+    }
+  else if (strncasecmp (s, "LO(", 3) == 0)
+    {
+      mask_or_shift = BFD_RELOC_LO16;
+
+      input_line_pointer += 3;
+    }
+  else
+    mask_or_shift = 0;
+
+  if ((*s == '(') && (*(s+1) == 'r'))
+    s++;
+
+  if ((*s == 'r') && ISDIGIT (*(s + 1))) 
+    {
+      operandp->X_add_number = strtol (s + 1, NULL, 10);
+      operandp->X_op = O_register;
+      for (; (*s != ',') && (*s != '\0');)
+        s++;  
+      input_line_pointer = save;
+      return s; 
+    }
+
+  expression (operandp);
+
+  if (operandp->X_op == O_absent)
+    {
+      if (! opt)
+        as_bad (_("missing operand"));
+      else
+        {
+          operandp->X_add_number = 0;
+          operandp->X_op = O_constant;
+        }
+    }
+    
+  new = input_line_pointer;
+  input_line_pointer = save;
+ 
+#if DEBUG
+  printf ("  %s=parse_operand(%s): operandp->X_op = %u\n", new, s, operandp->X_op);
+#endif
+
+  return new;
+}
+#else
+
+char *
+parse_operand (s, operandp, opt)
+     char *s;
+     expressionS *operandp;
+     int opt;
+{
+  char *save = input_line_pointer;
+  char *new;
+
+#if DEBUG
+  printf ("  PROCESS NEW OPERAND(%s) == %c (%d)\n", s, opt ? opt : '!', opt);
+#endif
+
+  input_line_pointer = s;
+
+  if (strncasecmp (s, "HI(", 3) == 0)
+    {
+      waiting_for_shift = 1;
+      mask_or_shift = RELOC_CONSTH;
+
+      input_line_pointer += 3;
+    }
+  else if (strncasecmp (s, "LO(", 3) == 0)
+    {
+      mask_or_shift = RELOC_CONST;
+
+      input_line_pointer += 3;
+    }
+  else
+    mask_or_shift = 0;
+
+
+  expression (operandp);
+
+  if (operandp->X_op == O_absent)
+    {
+      if (! opt)
+        as_bad (_("missing operand"));
+      else
+        {
+          operandp->X_add_number = 0;
+          operandp->X_op = O_constant;
+        }
+    }
+    
+  new = input_line_pointer;
+  input_line_pointer = save;
+  
+  if ((operandp->X_op == O_symbol) && (*s != '_')) 
+    {
+#if DEBUG
+      printf ("symbol: '%s'\n", save);
+#endif
+
+      for (save = s; s < new; s++)
+        if ((*s == REGISTER_PREFIX) && (*(s + 1) == 'r')) /* Register prefix.  */
+          s++;
+
+        if ((*s == 'r') && ISDIGIT (*(s + 1))) 
+          {
+            operandp->X_add_number = strtol (s + 1, NULL, 10);
+            operandp->X_op = O_register;
+          }
+      s = save;
+    }
+
+#if DEBUG
+  printf ("  %s=parse_operand(%s): operandp->X_op = %u\n", new, s, operandp->X_op);
+#endif
+
+  return new;
+}
+#endif
+
+/* Instruction parsing.  Takes a string containing the opcode.
+   Operands are at input_line_pointer.  Output is in the_insn.
+   Warnings or errors are generated.  */
+
+#ifdef BFD_ASSEMBLER
+static void
+machine_ip (str)
+     char *str;
+{
+  char *s;
+  const char *args;
+  const struct machine_opcode *insn;
+  char *argsStart;
+  unsigned long opcode;
+  expressionS the_operand;
+  expressionS *operand = &the_operand;
+  unsigned int regno;
+  int reloc = BFD_RELOC_NONE;
+
+#if DEBUG
+  printf ("machine_ip(%s)\n", str);
+#endif
+
+  s = str;
+  for (; ISALNUM (*s) || *s == '.'; ++s)
+    if (ISUPPER (*s))
+      *s = TOLOWER (*s);
+
+  switch (*s)
+    {
+    case '\0':
+      break;
+
+    case ' ':     /* FIXME-SOMEDAY more whitespace.  */
+      *s++ = '\0';
+      break;
+
+    default:
+      as_bad (_("unknown opcode1: `%s'"), str);
+      return;
+    }
+
+  if ((insn = (struct machine_opcode *) hash_find (op_hash, str)) == NULL)
+    {
+      as_bad (_("unknown opcode2 `%s'."), str);
+      return;
+    }
+
+  argsStart = s;
+  opcode = 0;
+  memset (&the_insn, '\0', sizeof (the_insn));
+  the_insn.reloc = BFD_RELOC_NONE;
+
+  reloc = BFD_RELOC_NONE;
+
+  /* Build the opcode, checking as we go to make sure that the
+     operands match.
+   
+     If an operand matches, we modify the_insn or opcode appropriately,
+     and do a "continue".  If an operand fails to match, we "break".  */
+  if (insn->args[0] != '\0')
+    {
+      /* Prime the pump.  */
+      s = parse_operand (s, operand, insn->args[0] == 'I');
+    }
+
+  for (args = insn->args;; ++args)
+    {
+#if DEBUG
+      printf ("  args = %s\n", args);
+#endif
+      switch (*args)
+        {
+        case '\0':    /* End of args.  */
+          /* We have have 0 args, do the bazoooka!  */
+          if (args == insn->args)
+	    encode (insn, &opcode, 0, 0);
+
+          if (*s == '\0')
+            {
+              /* We are truly done.  */
+              the_insn.opcode = opcode;
+              if (check_invalid_opcode (opcode))
+                as_bad (_("instruction not allowed: %s"), str); 
+              return;
+            }
+          as_bad (_("too many operands: %s"), s);
+          break;
+
+        case ',':   /* Must match a comma.  */
+          if (*s++ == ',')
+            {
+              reloc = BFD_RELOC_NONE;
+
+              /* Parse next operand.  */
+              s = parse_operand (s, operand, args[1] == 'I');
+#if DEBUG
+	      printf ("    ',' case: operand->X_add_number = %d, *args = %s, *s = %s\n",
+		      operand->X_add_number, args, s);
+#endif    
+              continue;
+            }
+          break;
+
+        case '(':   /* Must match a (.  */
+          s = parse_operand (s, operand, args[1] == 'I');
+          continue;
+    
+        case ')':   /* Must match a ).  */
+          continue;
+
+        case 'r':   /* A general register.  */
+          args++;
+
+          if (operand->X_op != O_register)
+            break;    /* Only registers.  */
+ 
+          know (operand->X_add_symbol == 0);
+          know (operand->X_op_symbol == 0);
+          regno = operand->X_add_number;
+          encode (insn, &opcode, regno, *args);
+#if DEBUG
+          printf ("    r: operand->X_op = %d\n", operand->X_op);
+#endif
+          continue;
+
+        default:
+          /* if (! ISALPHA (*args))
+               break;  */   /* Only immediate values.  */
+               
+          if (mask_or_shift)
+	    {
+#if DEBUG
+	      printf ("mask_or_shift = %d\n", mask_or_shift);
+#endif
+	      reloc = mask_or_shift;
+	    }
+          mask_or_shift = 0;
+          
+          if (strncasecmp (args, "LO(", 3) == 0) 
+            {
+#if DEBUG
+              printf ("reloc_const\n");
+#endif
+              reloc = BFD_RELOC_LO16;
+            }
+          else if (strncasecmp (args, "HI(", 3) == 0) 
+            {
+#if DEBUG
+              printf ("reloc_consth\n");
+#endif
+              reloc = BFD_RELOC_HI16;
+            }
+          
+          if (*s == '(') 
+            {
+              operand->X_op = O_constant;
+#if 0
+              operand->X_add_number = 0; /* ??? if enabled load/store offsets
+					    are zero.  */
+#endif
+            }
+          else if (*s == ')')
+            s += 1;
+#if DEBUG
+          printf ("    default case: operand->X_add_number = %d, *args = %s, *s = %s\n", operand->X_add_number, args, s);
+#endif
+          if (operand->X_op == O_constant)
+            {
+	      if (reloc == BFD_RELOC_NONE)
+		{
+		  bfd_vma v, mask;
+
+		  mask = 0x3ffffff;
+		  v = abs (operand->X_add_number) & ~ mask;
+		  if (v)
+		    as_bad (_("call/jmp target out of range (1)"));
+		}
+
+              if (reloc == BFD_RELOC_HI16)
+		operand->X_add_number = ((operand->X_add_number >> 16) & 0xffff);
+
+              the_insn.pcrel = 0;
+              encode (insn, &opcode, operand->X_add_number, *args);
+ /*             the_insn.reloc = BFD_RELOC_NONE; */
+              continue; 
+            }
+
+          if (reloc == BFD_RELOC_NONE)
+            the_insn.reloc = BFD_RELOC_32_GOT_PCREL;
+          else
+            the_insn.reloc = reloc;
+
+          /* the_insn.reloc = insn->reloc;  */
+#if DEBUG
+          printf ("    reloc sym=%d\n", the_insn.reloc);
+          printf ("    BFD_RELOC_NONE=%d\n", BFD_RELOC_NONE);
+#endif
+          the_insn.exp = *operand;
+  
+          /*  the_insn.reloc_offset = 1;  */
+          the_insn.pcrel = 1; /* Assume PC-relative jump.  */
+
+          /* FIXME-SOON, Do we figure out whether abs later, after
+             know sym val?  */
+          if (reloc == BFD_RELOC_LO16 || reloc == BFD_RELOC_HI16)
+            the_insn.pcrel = 0;
+
+          encode (insn, &opcode, operand->X_add_number, *args);
+          continue;
+        }
+  
+      /* Types or values of args don't match.  */
+      as_bad (_("invalid operands"));
+      return;
+    }
+}
+
+#else
+
+static void
+machine_ip (str)
+     char *str;
+{
+  char *s;
+  const char *args;
+  const struct machine_opcode *insn;
+  char *argsStart;
+  unsigned long opcode;
+  expressionS the_operand;
+  expressionS *operand = &the_operand;
+  unsigned int regno;
+  int reloc = NO_RELOC;
+
+#if DEBUG
+  printf ("machine_ip(%s)\n", str);
+#endif
+
+  s = str;
+  for (; ISALNUM (*s) || *s == '.'; ++s)
+    if (ISUPPER (*s))
+      *s = TOLOWER (*s);
+
+  switch (*s)
+    {
+    case '\0':
+      break;
+
+    case ' ':     /* FIXME-SOMEDAY more whitespace.  */
+      *s++ = '\0';
+      break;
+
+    default:
+      as_bad (_("unknown opcode1: `%s'"), str);
+      return;
+    }
+
+  if ((insn = (struct machine_opcode *) hash_find (op_hash, str)) == NULL)
+    {
+      as_bad (_("unknown opcode2 `%s'."), str);
+      return;
+    }
+
+  argsStart = s;
+  opcode = 0;
+  memset (&the_insn, '\0', sizeof (the_insn));
+  the_insn.reloc = NO_RELOC;
+
+  reloc = NO_RELOC;
+
+  /* Build the opcode, checking as we go to make sure that the
+     operands match.
+   
+     If an operand matches, we modify the_insn or opcode appropriately,
+     and do a "continue".  If an operand fails to match, we "break".  */
+  if (insn->args[0] != '\0')
+    /* Prime the pump.  */      
+    s = parse_operand (s, operand,
+		       insn->args[0] == 'I'
+		       || strcmp (insn->name, "l.nop") == 0);
+
+  for (args = insn->args;; ++args)
+    {
+#if DEBUG
+      printf ("  args = %s\n", args);
+#endif
+      switch (*args)
+        {
+        case '\0':    /* End of args.  */
+          /* We have have 0 args, do the bazoooka!  */
+          if (args == insn->args)
+	    encode (insn, &opcode, 0, 0);
+
+          if (*s == '\0')
+            {
+              /* We are truly done.  */
+              the_insn.opcode = opcode;
+              if (check_invalid_opcode (opcode))
+                as_bad (_("instruction not allowed: %s"), str); 
+              return;
+            }
+          as_bad (_("too many operands: %s"), s);
+          break;
+
+        case ',':   /* Must match a comma.  */
+          if (*s++ == ',')
+            {
+              reloc = NO_RELOC;
+
+              /* Parse next operand.  */
+              s = parse_operand (s, operand, args[1] == 'I');
+#if DEBUG
+	      printf ("    ',' case: operand->X_add_number = %d, *args = %s, *s = %s\n",
+		      operand->X_add_number, args, s);
+#endif    
+              continue;
+            }
+          break;
+
+        case '(':   /* Must match a (.  */
+          s = parse_operand (s, operand, args[1] == 'I');
+          continue;
+    
+        case ')':   /* Must match a ).  */
+          continue;
+
+        case 'r':   /* A general register.  */
+          args++;
+
+          if (operand->X_op != O_register)
+            break;    /* Only registers.  */
+ 
+          know (operand->X_add_symbol == 0);
+          know (operand->X_op_symbol == 0);
+          regno = operand->X_add_number;
+          encode (insn, &opcode, regno, *args);
+#if DEBUG
+          printf ("    r: operand->X_op = %d\n", operand->X_op);
+#endif
+          continue;
+
+        default:
+          /* if (! ISALPHA (*args))
+               break;  */   /* Only immediate values.  */
+               
+          if (mask_or_shift)
+	    {
+#if DEBUG
+	      printf ("mask_or_shift = %d\n", mask_or_shift);
+#endif
+	      reloc = mask_or_shift;
+	    }
+          mask_or_shift = 0;
+          
+          if (strncasecmp (args, "LO(", 3) == 0) 
+            {
+#if DEBUG
+              printf ("reloc_const\n");
+#endif
+              reloc = RELOC_CONST;
+            }
+          else if (strncasecmp (args, "HI(", 3) == 0) 
+            {
+#if DEBUG
+              printf ("reloc_consth\n");
+#endif
+              reloc = RELOC_CONSTH;
+            }
+          
+          if (*s == '(') 
+            {
+              operand->X_op = O_constant;
+#if 0
+              operand->X_add_number = 0; /* ??? if enabled load/store offsets
+					    are zero.  */
+#endif
+            }
+          else if (*s == ')')
+            s += 1;
+#if DEBUG
+          printf ("    default case: operand->X_add_number = %d, *args = %s, *s = %s\n",
+		  operand->X_add_number, args, s);
+#endif
+          if (operand->X_op == O_constant)
+            {
+	      if (reloc == NO_RELOC)
+		{
+		  unsigned long v, mask;
+
+		  mask = 0x3ffffff;
+		  v = abs (operand->X_add_number) & ~ mask;
+		  if (v)
+		    as_bad (_("call/jmp target out of range (1)"));
+		}
+
+              if (reloc == RELOC_CONSTH)
+		operand->X_add_number = ((operand->X_add_number>>16) & 0xffff);
+
+              the_insn.pcrel = 0;
+              encode (insn, &opcode, operand->X_add_number, *args);
+	      /* the_insn.reloc = NO_RELOC; */
+              continue; 
+            }
+
+          if (reloc == NO_RELOC)
+            the_insn.reloc = RELOC_JUMPTARG;
+          else
+            the_insn.reloc = reloc;
+#if DEBUG
+          printf ("    reloc sym=%d\n", the_insn.reloc);
+          printf ("    NO_RELOC=%d\n", NO_RELOC);
+#endif
+          the_insn.exp = *operand;
+  
+          /*  the_insn.reloc_offset = 1;  */
+          the_insn.pcrel = 1; /* Assume PC-relative jump.  */
+
+          /* FIXME-SOON, Do we figure out whether abs later, after
+             know sym val?  */
+          if (reloc == RELOC_CONST || reloc == RELOC_CONSTH)
+            the_insn.pcrel = 0;
+
+          encode (insn, &opcode, operand->X_add_number, *args);
+          continue;
+        }
+  
+      /* Types or values of args don't match.  */
+      as_bad (_("invalid operands"));
+      return;
+    }
+}
+#endif
+
+/* This is identical to the md_atof in m68k.c.  I think this is right,
+   but I'm not sure.
+
+   Turn a string in input_line_pointer into a floating point constant
+   of type type, and store the appropriate bytes in *litP.  The number
+   of LITTLENUMS emitted is stored in *sizeP .  An error message is
+   returned, or NULL on OK.  */
+
+/* Equal to MAX_PRECISION in atof-ieee.c.  */
+#define MAX_LITTLENUMS 6
+
+char *
+md_atof (type, litP, sizeP)
+     char   type;
+     char * litP;
+     int *  sizeP;
+{
+  int prec;
+  LITTLENUM_TYPE words[MAX_LITTLENUMS];
+  LITTLENUM_TYPE *wordP;
+  char *t;
+
+  switch (type)
+    {
+    case 'f':
+    case 'F':
+    case 's':
+    case 'S':
+      prec = 2;
+      break;
+
+    case 'd':
+    case 'D':
+    case 'r':
+    case 'R':
+      prec = 4;
+      break;
+
+    case 'x':
+    case 'X':
+      prec = 6;
+      break;
+
+    case 'p':
+    case 'P':
+      prec = 6;
+      break;
+
+    default:
+      *sizeP = 0;
+      return _("Bad call to MD_ATOF()");
+    }
+
+  t = atof_ieee (input_line_pointer, type, words);
+  if (t)
+    input_line_pointer = t;
+
+  *sizeP = prec * sizeof (LITTLENUM_TYPE);
+
+  for (wordP = words; prec--;)
+    {
+      md_number_to_chars (litP, (valueT) (*wordP++), sizeof (LITTLENUM_TYPE));
+      litP += sizeof (LITTLENUM_TYPE);
+    }
+
+  return NULL;
+}
+
+/* Write out big-endian.  */
+
+void
+md_number_to_chars (buf, val, n)
+     char *buf;
+     valueT val;
+     int n;
+{
+  number_to_chars_bigendian (buf, val, n);
+}
+
+#ifdef BFD_ASSEMBLER
+void
+md_apply_fix3 (fixP, val, seg)
+     fixS *   fixP;
+     valueT * val;
+     segT     seg ATTRIBUTE_UNUSED;
+{
+  char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
+  long t_val;
+
+  t_val = (long) *val;
+
+#if DEBUG
+  printf ("md_apply_fix val:%x\n", t_val);
+#endif
+
+  fixP->fx_addnumber = t_val; /* Remember value for emit_reloc.  */
+
+  know (fixP->fx_size == 4);
+  know (fixP->fx_r_type < BFD_RELOC_NONE);
+
+  switch (fixP->fx_r_type)
+    {
+    case BFD_RELOC_32:      /* XXXXXXXX pattern in a word.  */
+#if DEBUG
+      printf ("reloc_const: val=%x\n", t_val);
+#endif
+      buf[0] = t_val >> 24;
+      buf[1] = t_val >> 16;
+      buf[2] = t_val >> 8;
+      buf[3] = t_val;
+      break;
+
+    case BFD_RELOC_16:      /* XXXX0000 pattern in a word.  */
+#if DEBUG
+      printf ("reloc_const: val=%x\n", t_val);
+#endif
+      buf[0] = t_val >> 8;
+      buf[1] = t_val;
+      break;
+
+    case BFD_RELOC_8:      /* XX000000 pattern in a word.  */
+#if DEBUG
+      printf ("reloc_const: val=%x\n", t_val);
+#endif
+      buf[0] = t_val;
+      break;
+
+    case BFD_RELOC_LO16:      /* 0000XXXX pattern in a word.  */
+#if DEBUG
+      printf ("reloc_const: val=%x\n", t_val);
+#endif
+      buf[2] = t_val >> 8;  /* Holds bits 0000XXXX.  */
+      buf[3] = t_val;
+      break;
+
+    case BFD_RELOC_HI16:    /* 0000XXXX pattern in a word.  */
+#if DEBUG
+      printf ("reloc_consth: val=%x\n", t_val);
+#endif
+      buf[2] = t_val >> 24; /* Holds bits XXXX0000.  */
+      buf[3] = t_val >> 16;
+      break;
+
+    case BFD_RELOC_32_GOT_PCREL:  /* 0000XXXX pattern in a word.  */
+      if (!fixP->fx_done)
+        {
+          /* The linker tries to support both AMD and old GNU style
+             R_IREL relocs.  That means that if the addend is exactly
+             the negative of the address within the section, the
+             linker will not handle it correctly.  */
+#if 0
+          if (fixP->fx_pcrel
+              && t_val != 0
+              && t_val == - (fixP->fx_frag->fr_address + fixP->fx_where))
+            as_bad_where
+              (fixP->fx_file, fixP->fx_line,
+               _("the linker will not handle this relocation correctly (1)"));
+#endif
+        }
+      else if (fixP->fx_pcrel)
+        {
+          long v = t_val >> 28;
+
+          if (v != 0 && v != -1)
+            as_bad_where (fixP->fx_file, fixP->fx_line,
+                          _("call/jmp target out of range (2)"));
+        }
+      else
+        /* This case was supposed to be handled in machine_ip.  */
+        abort ();
+
+      buf[0] |= (t_val >> 26) & 0x03; /* Holds bits 0FFFFFFC of address.  */
+      buf[1] = t_val >> 18;
+      buf[2] = t_val >> 10;
+      buf[3] = t_val >> 2;
+      break;
+
+    case BFD_RELOC_VTABLE_INHERIT:
+    case BFD_RELOC_VTABLE_ENTRY:
+      fixP->fx_done = 0;
+      break;
+
+    case BFD_RELOC_NONE:
+    default:
+      as_bad (_("bad relocation type: 0x%02x"), fixP->fx_r_type);
+      break;
+    }
+
+  if (fixP->fx_addsy == (symbolS *) NULL)
+    fixP->fx_done = 1;
+}
+#else
+void
+md_apply_fix3 (fixP, valP, seg)
+     fixS *fixP;
+     valueT *valP;
+     segT seg ATTRIBUTE_UNUSED;
+{
+  long val = *(long*)valP;
+  char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
+
+#if DEBUG
+  printf ("md_apply_fix val:%x\n", val);
+#endif
+
+  fixP->fx_addnumber = val; /* Remember value for emit_reloc.  */
+
+  know (fixP->fx_size == 4);
+  know (fixP->fx_r_type < NO_RELOC);
+
+  /* This is a hack.  There should be a better way to handle this.  */
+  if (fixP->fx_r_type == RELOC_WDISP30 && fixP->fx_addsy)
+    val += fixP->fx_where + fixP->fx_frag->fr_address;
+
+  switch (fixP->fx_r_type)
+    {
+    case RELOC_32:
+      buf[0] = val >> 24;
+      buf[1] = val >> 16;
+      buf[2] = val >> 8;
+      buf[3] = val;
+      break;
+
+    case RELOC_8:
+      buf[0] = val;
+      break;
+
+    case RELOC_WDISP30:
+      val = (val >>= 2) + 1;
+      buf[0] |= (val >> 24) & 0x3f;
+      buf[1] = (val >> 16);
+      buf[2] = val >> 8;
+      buf[3] = val;
+      break;
+
+    case RELOC_HI22:
+      buf[1] |= (val >> 26) & 0x3f;
+      buf[2] = val >> 18;
+      buf[3] = val >> 10;
+      break;
+
+    case RELOC_LO10:
+      buf[2] |= (val >> 8) & 0x03;
+      buf[3] = val;
+      break;
+
+    case RELOC_BASE13:
+      buf[2] |= (val >> 8) & 0x1f;
+      buf[3] = val;
+      break;
+
+    case RELOC_WDISP22:
+      val = (val >>= 2) + 1;
+      /* FALLTHROUGH */
+    case RELOC_BASE22:
+      buf[1] |= (val >> 16) & 0x3f;
+      buf[2] = val >> 8;
+      buf[3] = val;
+      break;
+
+    case RELOC_JUMPTARG:  /* 0000XXXX pattern in a word.  */
+      if (!fixP->fx_done)
+        {
+          /* The linker tries to support both AMD and old GNU style
+             R_IREL relocs.  That means that if the addend is exactly
+             the negative of the address within the section, the
+             linker will not handle it correctly.  */
+#if 0
+          if (fixP->fx_pcrel
+              && val != 0
+              && val == - (fixP->fx_frag->fr_address + fixP->fx_where))
+            as_bad_where
+              (fixP->fx_file, fixP->fx_line,
+               _("the linker will not handle this relocation correctly (1)"));
+#endif
+        }
+      else if (fixP->fx_pcrel)
+        {
+          long v = val >> 28;
+#if 1
+          if (v != 0 && v != -1)
+            as_bad_where (fixP->fx_file, fixP->fx_line,
+                          _("call/jmp target out of range (2)"));
+#endif
+        }
+      else
+        /* This case was supposed to be handled in machine_ip.  */
+        abort ();
+
+      buf[0] |= (val >> 26) & 0x03; /* Holds bits 0FFFFFFC of address.  */
+      buf[1] = val >> 18;
+      buf[2] = val >> 10;
+      buf[3] = val >> 2;
+      break;
+
+    case RELOC_CONST:     /* 0000XXXX pattern in a word.  */
+#if DEBUG
+      printf ("reloc_const: val=%x\n", val);
+#endif
+      buf[2] = val >> 8;  /* Holds bits 0000XXXX.  */
+      buf[3] = val;
+      break;
+
+    case RELOC_CONSTH:    /* 0000XXXX pattern in a word.  */
+#if DEBUG
+      printf ("reloc_consth: val=%x\n", val);
+#endif
+      buf[2] = val >> 24; /* Holds bits XXXX0000.  */
+      buf[3] = val >> 16;
+      break;
+
+    case BFD_RELOC_VTABLE_INHERIT:
+    case BFD_RELOC_VTABLE_ENTRY:
+      fixP->fx_done = 0;
+      break;
+
+    case NO_RELOC:
+    default:
+      as_bad (_("bad relocation type: 0x%02x"), fixP->fx_r_type);
+      break;
+    }
+
+  if (fixP->fx_addsy == (symbolS *) NULL)
+    fixP->fx_done = 1;
+}
+#endif
+
+#ifdef OBJ_COFF
+short
+tc_coff_fix2rtype (fixP)
+     fixS *fixP;
+{
+#if DEBUG
+  printf ("tc_coff_fix2rtype\n");
+#endif
+
+  switch (fixP->fx_r_type)
+    {
+    case RELOC_32:
+      return (R_WORD);
+    case RELOC_8:
+      return (R_BYTE);
+    case RELOC_CONST:
+      return (R_ILOHALF);
+    case RELOC_CONSTH:
+      return (R_IHIHALF);
+    case RELOC_JUMPTARG:
+      return (R_IREL);
+    default:
+      printf ("need %d\n", fixP->fx_r_type);
+      abort ();
+    }
+
+  return 0;
+}
+
+#endif /* OBJ_COFF */
+
+/* Should never be called for or32.  */
+
+void
+md_create_short_jump (ptr, from_addr, to_addr, frag, to_symbol)
+     char *    ptr       ATTRIBUTE_UNUSED;
+     addressT  from_addr ATTRIBUTE_UNUSED;
+     addressT  to_addr   ATTRIBUTE_UNUSED;
+     fragS *   frag      ATTRIBUTE_UNUSED;
+     symbolS * to_symbol ATTRIBUTE_UNUSED;
+{
+  as_fatal ("or32_create_short_jmp\n");
+}
+
+/* Should never be called for or32.  */
+
+#ifndef BFD_ASSEMBLER
+void
+md_convert_frag (headers, seg, fragP)
+     object_headers * headers ATTRIBUTE_UNUSED;
+     segT             seg     ATTRIBUTE_UNUSED;
+     register fragS * fragP   ATTRIBUTE_UNUSED;
+{
+  as_fatal ("or32_convert_frag\n");
+}
+
+#else
+void
+md_convert_frag (headers, seg, fragP)
+     bfd *   headers ATTRIBUTE_UNUSED;
+     segT    seg     ATTRIBUTE_UNUSED;
+     fragS * fragP   ATTRIBUTE_UNUSED;
+{
+  as_fatal ("or32_convert_frag\n");
+} 
+#endif
+
+/* Should never be called for or32.  */
+
+void
+md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol)
+     char *    ptr       ATTRIBUTE_UNUSED;
+     addressT  from_addr ATTRIBUTE_UNUSED;
+     addressT  to_addr   ATTRIBUTE_UNUSED;
+     fragS *   frag      ATTRIBUTE_UNUSED;
+     symbolS * to_symbol ATTRIBUTE_UNUSED;
+{
+  as_fatal ("or32_create_long_jump\n");
+}
+
+/* Should never be called for or32.  */
+
+int
+md_estimate_size_before_relax (fragP, segtype)
+     fragS * fragP   ATTRIBUTE_UNUSED;
+     segT    segtype ATTRIBUTE_UNUSED;
+{
+  as_fatal ("or32_estimate_size_before_relax\n");
+  return 0;
+}
+
+/* Translate internal representation of relocation info to target format.
+
+   On sparc/29k: first 4 bytes are normal unsigned long address, next three
+   bytes are index, most sig. byte first.  Byte 7 is broken up with
+   bit 7 as external, bits 6 & 5 unused, and the lower
+   five bits as relocation type.  Next 4 bytes are long addend.  */
+/* Thanx and a tip of the hat to Michael Bloom, mb@ttidca.tti.com.  */
+
+#ifdef OBJ_AOUT
+void
+tc_aout_fix_to_chars (where, fixP, segment_address_in_file)
+     char *where;
+     fixS *fixP;
+     relax_addressT segment_address_in_file;
+{
+  long r_symbolnum;
+
+#if DEBUG
+  printf ("tc_aout_fix_to_chars\n");
+#endif  
+
+  know (fixP->fx_r_type < BFD_RELOC_NONE);
+  know (fixP->fx_addsy != NULL);
+
+  md_number_to_chars
+    (where,
+     fixP->fx_frag->fr_address + fixP->fx_where - segment_address_in_file,
+     4);
+
+  r_symbolnum = (S_IS_DEFINED (fixP->fx_addsy)
+     ? S_GET_TYPE (fixP->fx_addsy)
+     : fixP->fx_addsy->sy_number);
+
+  where[4] = (r_symbolnum >> 16) & 0x0ff;
+  where[5] = (r_symbolnum >> 8) & 0x0ff;
+  where[6] = r_symbolnum & 0x0ff;
+  where[7] = (((!S_IS_DEFINED (fixP->fx_addsy)) << 7) & 0x80) | (0 & 0x60) | (fixP->fx_r_type & 0x1F);
+
+  /* Also easy.  */
+  md_number_to_chars (&where[8], fixP->fx_addnumber, 4);
+}
+
+#endif /* OBJ_AOUT */
+
+const char *md_shortopts = "";
+
+struct option md_longopts[] =
+  {
+    { NULL, no_argument, NULL, 0 }
+  };
+size_t md_longopts_size = sizeof (md_longopts);
+
+int
+md_parse_option (c, arg)
+     int    c   ATTRIBUTE_UNUSED;
+     char * arg ATTRIBUTE_UNUSED;
+{
+  return 0;
+}
+
+void
+md_show_usage (stream)
+     FILE * stream ATTRIBUTE_UNUSED;
+{
+}
+
+/* This is called when a line is unrecognized.  This is used to handle
+   definitions of or32 style local labels.  */
+
+int
+or32_unrecognized_line (c)
+     int c;
+{
+  int lab;
+  char *s;
+
+  if (c != '$'
+      || ! ISDIGIT ((unsigned char) input_line_pointer[0]))
+    return 0;
+
+  s = input_line_pointer;
+
+  lab = 0;
+  while (ISDIGIT ((unsigned char) *s))
+    {
+      lab = lab * 10 + *s - '0';
+      ++s;
+    }
+
+  if (*s != ':')
+    /* Not a label definition.  */
+    return 0;
+
+  if (dollar_label_defined (lab))
+    {
+      as_bad (_("label \"$%d\" redefined"), lab);
+      return 0;
+    }
+
+  define_dollar_label (lab);
+  colon (dollar_label_name (lab, 0));
+  input_line_pointer = s + 1;
+
+  return 1;
+}
+
+#ifndef BFD_ASSEMBLER
+/* Record a fixup for a cons expression.  */
+/*
+  void
+or32_cons_fix_new (frag, where, nbytes, exp)
+     fragS *frag;
+     int where;
+     int nbytes;
+     expressionS *exp;
+{
+  fix_new_exp (frag, where, nbytes, exp, 0,
+		   nbytes == 5 ? RELOC_32
+                   : nbytes == 2 ? RELOC_16
+		   : RELOC_8);
+}
+void
+tc_aout_pre_write_hook ()
+{
+#if DEBUG
+  printf ("In tc_aout_pre_write_hook()\n");
+#endif
+} 
+*/                                                                                      
+#endif
+
+/* Default the values of symbols known that should be "predefined".  We
+   don't bother to predefine them unless you actually use one, since there
+   are a lot of them.  */
+
+symbolS *
+md_undefined_symbol (name)
+     char *name ATTRIBUTE_UNUSED;
+{
+#ifndef BFD_ASSEMBLER
+  long regnum;
+  char testbuf[5 + /*SLOP*/ 5];
+
+#if DEBUG
+  printf ("md_undefined_symbol(%s)\n", name);
+#endif
+
+  /* Register name.  */
+  if (name[0] == 'r' || name[0] == 'R' || name[0] == 'a' || name[0] == 'b') 
+    { 
+      long maxreg;
+
+      /* Parse the number, make sure it has no extra zeroes or
+         trailing chars.  */
+      regnum = atol (& name[1]);
+
+      if (regnum > 31)
+        as_fatal (_("register out of range"));
+
+      sprintf (testbuf, "%ld", regnum);
+
+      if (strcmp (testbuf, &name[1]) != 0)
+        return NULL;  /* gr007 or lr7foo or whatever.  */
+
+      /* We have a wiener!  Define and return a new symbol for it.  */
+      return (symbol_new (name, SEG_REGISTER, (valueT) regnum,
+                          &zero_address_frag));
+    }
+#endif
+  return NULL;
+}
+
+/* Parse an operand that is machine-specific.  */
+
+void
+md_operand (expressionP)
+     expressionS *expressionP;
+{
+#if DEBUG
+  printf ("  md_operand(input_line_pointer = %s)\n", input_line_pointer);
+#endif
+
+  if (input_line_pointer[0] == REGISTER_PREFIX && input_line_pointer[1] == 'r')
+    {
+      /* We have a numeric register expression.  No biggy.  */
+      input_line_pointer += 2;  /* Skip %r */
+      (void) expression (expressionP);
+
+      if (expressionP->X_op != O_constant
+          || expressionP->X_add_number > 255)
+        as_bad (_("Invalid expression after %%%%\n"));
+      expressionP->X_op = O_register;
+    }
+  else if (input_line_pointer[0] == '&')
+    {
+      /* We are taking the 'address' of a register...this one is not
+         in the manual, but it *is* in traps/fpsymbol.h!  What they
+         seem to want is the register number, as an absolute number.  */
+      input_line_pointer++; /* Skip & */
+      (void) expression (expressionP);
+
+      if (expressionP->X_op != O_register)
+        as_bad (_("invalid register in & expression"));
+      else
+        expressionP->X_op = O_constant;
+    }
+  else if (input_line_pointer[0] == '$'
+           && ISDIGIT ((unsigned char) input_line_pointer[1]))
+    {
+      long lab;
+      char *name;
+      symbolS *sym;
+      
+      /* This is a local label.  */
+      ++input_line_pointer;
+      lab = (long) get_absolute_expression ();
+
+      if (dollar_label_defined (lab))
+        {
+          name = dollar_label_name (lab, 0);
+          sym = symbol_find (name);
+        }
+      else
+        {
+          name = dollar_label_name (lab, 1);
+          sym = symbol_find_or_make (name);
+        }
+
+      expressionP->X_op = O_symbol;
+      expressionP->X_add_symbol = sym;
+      expressionP->X_add_number = 0;
+    }
+  else if (input_line_pointer[0] == '$')
+    {
+      char *s;
+      char type;
+      int fieldnum, fieldlimit;
+      LITTLENUM_TYPE floatbuf[8];
+
+      /* $float(), $doubleN(), or $extendN() convert floating values
+         to integers.  */
+      s = input_line_pointer;
+
+      ++s;
+
+      fieldnum = 0;
+      if (strncmp (s, "double", sizeof "double" - 1) == 0)
+        {
+          s += sizeof "double" - 1;
+          type = 'd';
+          fieldlimit = 2;
+        }
+      else if (strncmp (s, "float", sizeof "float" - 1) == 0)
+        {
+          s += sizeof "float" - 1;
+          type = 'f';
+          fieldlimit = 1;
+        }
+      else if (strncmp (s, "extend", sizeof "extend" - 1) == 0)
+        {
+          s += sizeof "extend" - 1;
+          type = 'x';
+          fieldlimit = 4;
+        }
+      else 
+	return;
+
+      if (ISDIGIT (*s))
+        {
+          fieldnum = *s - '0';
+          ++s;
+        }
+      if (fieldnum >= fieldlimit)
+        return;
+
+      SKIP_WHITESPACE ();
+      if (*s != '(')
+        return;
+      ++s;
+      SKIP_WHITESPACE ();
+
+      s = atof_ieee (s, type, floatbuf);
+      if (s == NULL)
+        return;
+      s = s;
+
+      SKIP_WHITESPACE ();
+      if (*s != ')')
+        return;
+      ++s;
+      SKIP_WHITESPACE ();
+
+      input_line_pointer = s;
+      expressionP->X_op = O_constant; 
+      expressionP->X_unsigned = 1;
+      expressionP->X_add_number = ((floatbuf[fieldnum * 2]
+                                    << LITTLENUM_NUMBER_OF_BITS)
+                                   + floatbuf[fieldnum * 2 + 1]);
+    }
+}
+
+/* Round up a section size to the appropriate boundary.  */
+
+valueT
+md_section_align (segment, size)
+     segT segment ATTRIBUTE_UNUSED;
+     valueT size ATTRIBUTE_UNUSED;
+{
+  return size;      /* Byte alignment is fine.  */
+}
+
+/* Exactly what point is a PC-relative offset relative TO?
+   On the 29000, they're relative to the address of the instruction,
+   which we have set up as the address of the fixup too.  */
+
+long
+md_pcrel_from (fixP)
+     fixS *fixP;
+{
+  return fixP->fx_where + fixP->fx_frag->fr_address;
+}
+
+/* Generate a reloc for a fixup.  */
+
+#ifdef BFD_ASSEMBLER
+arelent *
+tc_gen_reloc (seg, fixp)
+     asection *seg ATTRIBUTE_UNUSED;
+     fixS *fixp;
+{
+  arelent *reloc;
+
+  reloc = (arelent *) xmalloc (sizeof (arelent));
+  reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
+  *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);
+  reloc->address = fixp->fx_frag->fr_address + fixp->fx_where;
+  /*  reloc->address = fixp->fx_frag->fr_address + fixp->fx_where + fixp->fx_addnumber;*/
+  reloc->howto = bfd_reloc_type_lookup (stdoutput, fixp->fx_r_type);
+
+  if (reloc->howto == (reloc_howto_type *) NULL)
+    {
+      as_bad_where (fixp->fx_file, fixp->fx_line,
+		    _("reloc %d not supported by object file format"),
+		    (int) fixp->fx_r_type);
+      return NULL;
+    }
+
+  if (   fixp->fx_r_type == BFD_RELOC_VTABLE_ENTRY
+      || fixp->fx_r_type == BFD_RELOC_VTABLE_INHERIT)
+    reloc->addend = fixp->fx_offset;
+  else
+  reloc->addend = fixp->fx_addnumber;
+
+  return reloc;
+}
+#endif
+
diff --git a/gas/config/tc-or32.h b/gas/config/tc-or32.h
new file mode 100644
index 0000000..b78cf93
--- /dev/null
+++ b/gas/config/tc-or32.h
@@ -0,0 +1,63 @@
+/* tc-or32.h -- Assemble for the OpenRISC 1000.
+   Copyright (C) 2002 Free Software Foundation, Inc.
+   Contributed by Damjan Lampret <lampret@opencores.org>.
+   Based upon a29k port.
+
+   This file is part of GAS, the GNU Assembler.
+
+   GAS is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   GAS is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GAS; see the file COPYING.  If not, write to
+   the Free Software Foundation, 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#define TC_OR32
+
+#define TARGET_BYTES_BIG_ENDIAN 1
+
+#define LEX_DOLLAR 1
+
+#ifdef OBJ_ELF
+#define TARGET_FORMAT  "elf32-or32"
+#define TARGET_ARCH    bfd_arch_or32
+#endif
+
+#ifdef OBJ_COFF
+#define TARGET_FORMAT  "coff-or32-big"
+#define reloc_type     int
+#endif
+
+#define tc_unrecognized_line(c) or32_unrecognized_line (c)
+
+extern int or32_unrecognized_line PARAMS ((int));
+
+#define tc_headers_hook(a)    ; /* not used */
+#define tc_headers_hook(a)    ; /* not used */
+#define tc_crawl_symbol_chain(a)  ; /* not used */
+#define tc_coff_symbol_emit_hook(a) ; /* not used */
+
+#define AOUT_MACHTYPE               80
+#define TC_COFF_FIX2RTYPE(fix_ptr)  tc_coff_fix2rtype (fix_ptr)
+#define BFD_ARCH                    bfd_arch_or32
+#define COFF_MAGIC                  SIPFBOMAGIC
+
+/* Should the reloc be output ?
+   on the 29k, this is true only if there is a symbol attatched.
+   on the h8, this is allways true, since no fixup is done.  */
+#define TC_COUNT_RELOC(x)           (x->fx_addsy)
+#define TC_CONS_RELOC               RELOC_32
+
+#define COFF_FLAGS                  F_AR32W
+#define NEED_FX_R_TYPE
+
+#define ZERO_BASED_SEGMENTS
+
diff --git a/gas/configure b/gas/configure
index 73d1170..74ccca2 100755
--- a/gas/configure
+++ b/gas/configure
@@ -719,49 +719,249 @@ test "$host_alias" != "$target_alias" &&
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
 
+# Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:726: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="gcc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-        echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
-echo "configure:725: checking for strerror in -lcposix" >&5
-ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+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:756: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lcposix  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 733 "configure"
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_prog_rejected=no
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+	continue
+      fi
+      ac_cv_prog_CC="cc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# -gt 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    set dummy "$ac_dir/$ac_word" "$@"
+    shift
+    ac_cv_prog_CC="$@"
+  fi
+fi
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  if test -z "$CC"; then
+    case "`uname -s`" in
+    *win32* | *WIN32*)
+      # Extract the first word of "cl", so it can be a program name with args.
+set dummy cl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:807: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="cl"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+ ;;
+    esac
+  fi
+  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:839: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+cat > conftest.$ac_ext << EOF
+
+#line 850 "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
-    builtin and then its argument prototype would still apply.  */
-char strerror();
 
-int main() {
-strerror()
-; return 0; }
+main(){return(0);}
 EOF
-if { (eval echo configure:744: \"$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"
+if { (eval echo configure:855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  ac_cv_prog_cc_works=yes
+  # If we can't run a trivial program, we are probably using a cross compiler.
+  if (./conftest; exit) 2>/dev/null; then
+    ac_cv_prog_cc_cross=no
+  else
+    ac_cv_prog_cc_cross=yes
+  fi
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  ac_cv_prog_cc_works=no
+fi
+rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+if test $ac_cv_prog_cc_works = no; then
+  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+fi
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+echo "configure:881: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+cross_compiling=$ac_cv_prog_cc_cross
+
+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+echo "configure:886: checking whether we are using GNU C" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.c <<EOF
+#ifdef __GNUC__
+  yes;
+#endif
+EOF
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+  ac_cv_prog_gcc=yes
+else
+  ac_cv_prog_gcc=no
+fi
+fi
+
+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+
+if test $ac_cv_prog_gcc = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+
+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:914: checking whether ${CC-cc} accepts -g" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  echo 'void f(){}' > conftest.c
+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+  ac_cv_prog_cc_g=yes
+else
+  ac_cv_prog_cc_g=no
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
 
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS="$ac_save_CFLAGS"
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+
+echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
+echo "configure:946: checking for POSIXized ISC" >&5
+if test -d /etc/conf/kconfig.d &&
+  grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
+then
   echo "$ac_t""yes" 1>&6
-  LIBS="$LIBS -lcposix"
+  ISC=yes # If later tests want to check for ISC.
+  cat >> confdefs.h <<\EOF
+#define _POSIX_SOURCE 1
+EOF
+
+  if test "$GCC" = yes; then
+    CC="$CC -posix"
+  else
+    CC="$CC -Xp"
+  fi
 else
   echo "$ac_t""no" 1>&6
+  ISC=
 fi
 
-  
-
 
 BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ 	]*\([^ 	]*\)[ 	]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
 # Find a good install program.  We prefer a C program (faster),
@@ -776,7 +976,7 @@ BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ 	]*\([^ 	]*\)[ 	]*).*/\1/p' < ${
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:780: checking for a BSD compatible install" >&5
+echo "configure:980: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -829,7 +1029,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:833: checking whether build environment is sane" >&5
+echo "configure:1033: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -886,7 +1086,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:890: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1090: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -932,7 +1132,7 @@ EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:936: checking for working aclocal" >&5
+echo "configure:1136: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -945,7 +1145,7 @@ else
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:949: checking for working autoconf" >&5
+echo "configure:1149: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -958,7 +1158,7 @@ else
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:962: checking for working automake" >&5
+echo "configure:1162: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -971,7 +1171,7 @@ else
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:975: checking for working autoheader" >&5
+echo "configure:1175: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -984,7 +1184,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:988: checking for working makeinfo" >&5
+echo "configure:1188: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1067,228 +1267,6 @@ else
   enable_fast_install=yes
 fi
 
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1074: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-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:1104: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1155: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1187: 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.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 1198 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:1203: \"$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
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1229: 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:1234: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1243: \"$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
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-
-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:1262: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-
 # Check whether --with-gnu-ld or --without-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
   withval="$with_gnu_ld"
@@ -1301,7 +1279,7 @@ ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1305: checking for ld used by GCC" >&5
+echo "configure:1283: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1331,10 +1309,10 @@ echo "configure:1305: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1335: checking for GNU ld" >&5
+echo "configure:1313: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1338: checking for non-GNU ld" >&5
+echo "configure:1316: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1369,7 +1347,7 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1373: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1351: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1386,7 +1364,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1390: checking for $LD option to reload object files" >&5
+echo "configure:1368: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1398,7 +1376,7 @@ reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1402: checking for BSD-compatible nm" >&5
+echo "configure:1380: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1436,7 +1414,7 @@ NM="$lt_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1440: checking whether ln -s works" >&5
+echo "configure:1418: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1457,7 +1435,7 @@ else
 fi
 
 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:1461: checking how to recognise dependant libraries" >&5
+echo "configure:1439: checking how to recognise dependant libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1630,13 +1608,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:1634: checking for object suffix" >&5
+echo "configure:1612: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:1640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -1656,7 +1634,7 @@ ac_objext=$ac_cv_objext
 
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1660: checking for executable suffix" >&5
+echo "configure:1638: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1666,7 +1644,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1699,7 +1677,7 @@ case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:1703: checking for ${ac_tool_prefix}file" >&5
+echo "configure:1681: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1761,7 +1739,7 @@ fi
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:1765: checking for file" >&5
+echo "configure:1743: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1832,7 +1810,7 @@ esac
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1836: checking for $ac_word" >&5
+echo "configure:1814: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1864,7 +1842,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1868: checking for $ac_word" >&5
+echo "configure:1846: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1899,7 +1877,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1903: checking for $ac_word" >&5
+echo "configure:1881: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1931,7 +1909,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1935: checking for $ac_word" >&5
+echo "configure:1913: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1998,8 +1976,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2002 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 1980 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2018,7 +1996,7 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:2000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *ELF-32*)
       HPUX_IA64_MODE="32"
@@ -2036,7 +2014,7 @@ ia64-*-hpux*)
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2040: checking whether the C compiler needs -belf" >&5
+echo "configure:2018: 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
@@ -2049,14 +2027,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
-#line 2053 "configure"
+#line 2031 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2038: \"$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
@@ -2309,6 +2287,7 @@ for this_target in $target $canon_targets ; do
       m8*)		cpu_type=m88k ;;
       mips*el)		cpu_type=mips endian=little ;;
       mips*)		cpu_type=mips endian=big ;;
+      or32*)		cpu_type=or32 endian=big ;;
       pjl*)		cpu_type=pj endian=little ;;
       pj*)		cpu_type=pj endian=big ;;
       powerpc*le*)	cpu_type=ppc endian=little ;;
@@ -2550,6 +2529,9 @@ EOF
       mn10200-*-*)	    fmt=elf bfd_gas=yes ;;
       mn10300-*-*)	    fmt=elf bfd_gas=yes ;;
       openrisc-*-*)	    fmt=elf bfd_gas=yes ;;
+      or32-*-rtems*)	    fmt=coff ;;
+      or32-*-coff)	    fmt=coff ;;
+      or32-*-elf)           fmt=elf ;;
       pj*)		    fmt=elf ;;
       ppc-*-pe | ppc-*-cygwin* | ppc-*-winnt*)
 		            fmt=coff em=pe ;;
@@ -3155,7 +3137,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:3159: checking for $ac_word" >&5
+echo "configure:3141: 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
@@ -3185,7 +3167,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:3189: checking for $ac_word" >&5
+echo "configure:3171: 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
@@ -3236,7 +3218,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:3240: checking for $ac_word" >&5
+echo "configure:3222: 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
@@ -3268,7 +3250,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:3272: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:3254: 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.
@@ -3279,12 +3261,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 3283 "configure"
+#line 3265 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:3288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3270: \"$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
@@ -3310,12 +3292,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:3314: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:3296: 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:3319: checking whether we are using GNU C" >&5
+echo "configure:3301: 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
@@ -3324,7 +3306,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:3328: \"$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:3310: \"$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
@@ -3343,7 +3325,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:3347: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:3329: 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
@@ -3380,7 +3362,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:3384: checking for $ac_word" >&5
+echo "configure:3366: 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
@@ -3411,7 +3393,7 @@ done
 test -n "$YACC" || YACC="yacc"
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:3415: checking how to run the C preprocessor" >&5
+echo "configure:3397: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -3426,13 +3408,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 3430 "configure"
+#line 3412 "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:3436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3418: \"$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
   :
@@ -3443,13 +3425,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 3447 "configure"
+#line 3429 "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:3453: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3435: \"$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
   :
@@ -3460,13 +3442,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 3464 "configure"
+#line 3446 "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:3470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3452: \"$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
   :
@@ -3496,7 +3478,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:3500: checking for $ac_word" >&5
+echo "configure:3482: 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
@@ -3529,7 +3511,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:3533: checking for $ac_word" >&5
+echo "configure:3515: 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
@@ -3563,7 +3545,7 @@ then
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:3567: checking for yywrap in -l$ac_lib" >&5
+echo "configure:3549: 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
@@ -3571,7 +3553,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3575 "configure"
+#line 3557 "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
@@ -3582,7 +3564,7 @@ int main() {
 yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:3586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3568: \"$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
@@ -3605,7 +3587,7 @@ fi
 fi
 
 echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:3609: checking lex output file root" >&5
+echo "configure:3591: 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
@@ -3626,7 +3608,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:3630: checking whether yytext is a pointer" >&5
+echo "configure:3612: 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
@@ -3638,14 +3620,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
 ac_save_LIBS="$LIBS"
 LIBS="$LIBS $LEXLIB"
 cat > conftest.$ac_ext <<EOF
-#line 3642 "configure"
+#line 3624 "configure"
 #include "confdefs.h"
 `cat $LEX_OUTPUT_ROOT.c`
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3631: \"$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
@@ -3671,7 +3653,7 @@ ALL_LINGUAS="fr tr"
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3675: checking for $ac_word" >&5
+echo "configure:3657: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3699,12 +3681,12 @@ else
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3703: checking for ANSI C header files" >&5
+echo "configure:3685: 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 3708 "configure"
+#line 3690 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3712,7 +3694,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3698: \"$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*
@@ -3729,7 +3711,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 3733 "configure"
+#line 3715 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3747,7 +3729,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 3751 "configure"
+#line 3733 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3768,7 +3750,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 3772 "configure"
+#line 3754 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3779,7 +3761,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:3783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -3803,12 +3785,12 @@ EOF
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3807: checking for working const" >&5
+echo "configure:3789: 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 3812 "configure"
+#line 3794 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3857,7 +3839,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:3861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -3878,21 +3860,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:3882: checking for inline" >&5
+echo "configure:3864: 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 3889 "configure"
+#line 3871 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:3896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -3918,12 +3900,12 @@ EOF
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3922: checking for off_t" >&5
+echo "configure:3904: 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 3927 "configure"
+#line 3909 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3951,12 +3933,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3955: checking for size_t" >&5
+echo "configure:3937: 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 3960 "configure"
+#line 3942 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3986,19 +3968,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:3990: checking for working alloca.h" >&5
+echo "configure:3972: 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 3995 "configure"
+#line 3977 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:4002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3984: \"$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
@@ -4019,12 +4001,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:4023: checking for alloca" >&5
+echo "configure:4005: 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 4028 "configure"
+#line 4010 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -4052,7 +4034,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:4056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4038: \"$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
@@ -4084,12 +4066,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:4088: checking whether alloca needs Cray hooks" >&5
+echo "configure:4070: 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 4093 "configure"
+#line 4075 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -4114,12 +4096,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:4118: checking for $ac_func" >&5
+echo "configure:4100: 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 4123 "configure"
+#line 4105 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4142,7 +4124,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4128: \"$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
@@ -4169,7 +4151,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:4173: checking stack direction for C alloca" >&5
+echo "configure:4155: 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
@@ -4177,7 +4159,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 4181 "configure"
+#line 4163 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -4196,7 +4178,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:4200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4182: \"$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
@@ -4217,21 +4199,21 @@ EOF
 
 fi
 
-for ac_hdr in unistd.h
+for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4225: checking for $ac_hdr" >&5
+echo "configure:4207: 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 4230 "configure"
+#line 4212 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4217: \"$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*
@@ -4260,12 +4242,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4264: checking for $ac_func" >&5
+echo "configure:4246: 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 4269 "configure"
+#line 4251 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4288,7 +4270,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4274: \"$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
@@ -4313,7 +4295,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:4317: checking for working mmap" >&5
+echo "configure:4299: 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
@@ -4321,7 +4303,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 4325 "configure"
+#line 4307 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -4349,11 +4331,24 @@ else
 #include <fcntl.h>
 #include <sys/mman.h>
 
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
 /* This mess was copied from the GNU getpagesize.h.  */
 #ifndef HAVE_GETPAGESIZE
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
 
 /* Assume that all systems that can run configure have sys/param.h.  */
 # ifndef HAVE_SYS_PARAM_H
@@ -4461,7 +4456,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:4465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4460: \"$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
@@ -4489,17 +4484,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:4493: checking for $ac_hdr" >&5
+echo "configure:4488: 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 4498 "configure"
+#line 4493 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4503: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4498: \"$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*
@@ -4529,12 +4524,12 @@ done
 __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4533: checking for $ac_func" >&5
+echo "configure:4528: 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 4538 "configure"
+#line 4533 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4557,7 +4552,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4556: \"$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
@@ -4586,12 +4581,12 @@ done
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4590: checking for $ac_func" >&5
+echo "configure:4585: 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 4595 "configure"
+#line 4590 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4614,7 +4609,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4613: \"$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
@@ -4648,19 +4643,19 @@ EOF
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:4652: checking for LC_MESSAGES" >&5
+echo "configure:4647: 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 4657 "configure"
+#line 4652 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:4664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4659: \"$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
@@ -4681,7 +4676,7 @@ EOF
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:4685: checking whether NLS is requested" >&5
+echo "configure:4680: 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"
@@ -4701,7 +4696,7 @@ fi
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:4705: checking whether included gettext is requested" >&5
+echo "configure:4700: 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"
@@ -4720,17 +4715,17 @@ fi
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:4724: checking for libintl.h" >&5
+echo "configure:4719: 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 4729 "configure"
+#line 4724 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4729: \"$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*
@@ -4747,19 +4742,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:4751: checking for gettext in libc" >&5
+echo "configure:4746: 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 4756 "configure"
+#line 4751 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:4763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4758: \"$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
@@ -4775,7 +4770,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:4779: checking for bindtextdomain in -lintl" >&5
+echo "configure:4774: 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
@@ -4783,7 +4778,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4787 "configure"
+#line 4782 "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
@@ -4794,7 +4789,7 @@ int main() {
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:4798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4793: \"$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
@@ -4810,19 +4805,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:4814: checking for gettext in libintl" >&5
+echo "configure:4809: 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 4819 "configure"
+#line 4814 "configure"
 #include "confdefs.h"
 
 int main() {
 return (int) gettext ("")
 ; 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*
   gt_cv_func_gettext_libintl=yes
 else
@@ -4850,7 +4845,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:4854: checking for $ac_word" >&5
+echo "configure:4849: 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
@@ -4884,12 +4879,12 @@ fi
 		for ac_func in dcgettext
 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
 		# 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:4943: checking for $ac_word" >&5
+echo "configure:4938: 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
@@ -4975,7 +4970,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:4979: checking for $ac_word" >&5
+echo "configure:4974: 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
@@ -5007,7 +5002,7 @@ else
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 5011 "configure"
+#line 5006 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -5015,7 +5010,7 @@ extern int _nl_msg_cat_cntr;
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:5019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -5047,7 +5042,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:5051: checking for $ac_word" >&5
+echo "configure:5046: 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
@@ -5081,7 +5076,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:5085: checking for $ac_word" >&5
+echo "configure:5080: 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
@@ -5117,7 +5112,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:5121: checking for $ac_word" >&5
+echo "configure:5116: 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
@@ -5207,7 +5202,7 @@ fi
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:5211: checking for catalogs to be installed" >&5
+echo "configure:5206: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -5235,17 +5230,17 @@ echo "configure:5211: 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:5239: checking for linux/version.h" >&5
+echo "configure:5234: 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 5244 "configure"
+#line 5239 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5244: \"$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*
@@ -5308,7 +5303,7 @@ fi
   
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:5312: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:5307: 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"
@@ -5333,7 +5328,7 @@ fi
 
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:5337: checking for executable suffix" >&5
+echo "configure:5332: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5343,7 +5338,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:5347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:5342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -5368,17 +5363,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:5372: checking for $ac_hdr" >&5
+echo "configure:5367: 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 5377 "configure"
+#line 5372 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5377: \"$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*
@@ -5408,7 +5403,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:5412: checking whether compiling a cross-assembler" >&5
+echo "configure:5407: checking whether compiling a cross-assembler" >&5
 if test "${host}" = "${target}"; then
   cross_gas=no
 else
@@ -5423,19 +5418,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:5427: checking for working alloca.h" >&5
+echo "configure:5422: 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 5432 "configure"
+#line 5427 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:5439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5434: \"$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
@@ -5456,12 +5451,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:5460: checking for alloca" >&5
+echo "configure:5455: 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 5465 "configure"
+#line 5460 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -5489,7 +5484,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:5493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5488: \"$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
@@ -5521,12 +5516,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:5525: checking whether alloca needs Cray hooks" >&5
+echo "configure:5520: 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 5530 "configure"
+#line 5525 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -5551,12 +5546,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:5555: checking for $ac_func" >&5
+echo "configure:5550: 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 5560 "configure"
+#line 5555 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5579,7 +5574,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5578: \"$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
@@ -5606,7 +5601,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:5610: checking stack direction for C alloca" >&5
+echo "configure:5605: 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
@@ -5614,7 +5609,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 5618 "configure"
+#line 5613 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -5633,7 +5628,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:5637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5632: \"$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
@@ -5655,21 +5650,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:5659: checking for inline" >&5
+echo "configure:5654: 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 5666 "configure"
+#line 5661 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:5673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -5699,12 +5694,12 @@ esac
 for ac_func in unlink remove
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5703: checking for $ac_func" >&5
+echo "configure:5698: 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 5708 "configure"
+#line 5703 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5727,7 +5722,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5726: \"$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
@@ -5756,12 +5751,12 @@ done
 for ac_func in sbrk
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5760: checking for $ac_func" >&5
+echo "configure:5755: 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 5765 "configure"
+#line 5760 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5784,7 +5779,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5783: \"$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
@@ -5819,7 +5814,7 @@ case $host in
   ;;
 *-ncr-sysv4.3*)
   echo $ac_n "checking for _mwvalidcheckl in -lmw""... $ac_c" 1>&6
-echo "configure:5823: checking for _mwvalidcheckl in -lmw" >&5
+echo "configure:5818: 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
@@ -5827,7 +5822,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmw  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5831 "configure"
+#line 5826 "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
@@ -5838,7 +5833,7 @@ int main() {
 _mwvalidcheckl()
 ; return 0; }
 EOF
-if { (eval echo configure:5842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5837: \"$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
@@ -5859,7 +5854,7 @@ else
 fi
 
   echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:5863: checking for main in -lm" >&5
+echo "configure:5858: 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
@@ -5867,14 +5862,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5871 "configure"
+#line 5866 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5873: \"$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
@@ -5897,7 +5892,7 @@ fi
   ;;
 *)
   echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:5901: checking for main in -lm" >&5
+echo "configure:5896: 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
@@ -5905,14 +5900,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5909 "configure"
+#line 5904 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5943,12 +5938,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:5947: checking for working assert macro" >&5
+echo "configure:5942: 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 5952 "configure"
+#line 5947 "configure"
 #include "confdefs.h"
 #include <assert.h>
 #include <stdio.h>
@@ -5964,7 +5959,7 @@ assert (a == b
 
 ; return 0; }
 EOF
-if { (eval echo configure:5968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gas_cv_assert_ok=yes
 else
@@ -6005,12 +6000,12 @@ gas_test_headers="
 "
 
 echo $ac_n "checking whether declaration is required for strstr""... $ac_c" 1>&6
-echo "configure:6009: checking whether declaration is required for strstr" >&5
+echo "configure:6004: 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 6014 "configure"
+#line 6009 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -6021,7 +6016,7 @@ x = (f) strstr;
 
 ; return 0; }
 EOF
-if { (eval echo configure:6025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6020: \"$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
@@ -6042,12 +6037,12 @@ fi
 
 
 echo $ac_n "checking whether declaration is required for malloc""... $ac_c" 1>&6
-echo "configure:6046: checking whether declaration is required for malloc" >&5
+echo "configure:6041: 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 6051 "configure"
+#line 6046 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -6058,7 +6053,7 @@ x = (f) malloc;
 
 ; return 0; }
 EOF
-if { (eval echo configure:6062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6057: \"$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
@@ -6079,12 +6074,12 @@ fi
 
 
 echo $ac_n "checking whether declaration is required for free""... $ac_c" 1>&6
-echo "configure:6083: checking whether declaration is required for free" >&5
+echo "configure:6078: 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 6088 "configure"
+#line 6083 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -6095,7 +6090,7 @@ x = (f) free;
 
 ; return 0; }
 EOF
-if { (eval echo configure:6099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6094: \"$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
@@ -6116,12 +6111,12 @@ fi
 
 
 echo $ac_n "checking whether declaration is required for sbrk""... $ac_c" 1>&6
-echo "configure:6120: checking whether declaration is required for sbrk" >&5
+echo "configure:6115: 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 6125 "configure"
+#line 6120 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -6132,7 +6127,7 @@ x = (f) sbrk;
 
 ; return 0; }
 EOF
-if { (eval echo configure:6136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6131: \"$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
@@ -6153,12 +6148,12 @@ fi
 
 
 echo $ac_n "checking whether declaration is required for environ""... $ac_c" 1>&6
-echo "configure:6157: checking whether declaration is required for environ" >&5
+echo "configure:6152: 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 6162 "configure"
+#line 6157 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -6169,7 +6164,7 @@ x = (f) environ;
 
 ; return 0; }
 EOF
-if { (eval echo configure:6173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6168: \"$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
@@ -6193,12 +6188,12 @@ fi
 # for it?
 
 echo $ac_n "checking whether declaration is required for errno""... $ac_c" 1>&6
-echo "configure:6197: checking whether declaration is required for errno" >&5
+echo "configure:6192: 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 6202 "configure"
+#line 6197 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_ERRNO_H
@@ -6213,7 +6208,7 @@ x = (f) errno;
 
 ; return 0; }
 EOF
-if { (eval echo configure:6217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6212: \"$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
@@ -6383,6 +6378,7 @@ s%@build_alias@%$build_alias%g
 s%@build_cpu@%$build_cpu%g
 s%@build_vendor@%$build_vendor%g
 s%@build_os@%$build_os%g
+s%@CC@%$CC%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -6394,7 +6390,6 @@ s%@AUTOMAKE@%$AUTOMAKE%g
 s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
 s%@LN_S@%$LN_S%g
 s%@OBJEXT@%$OBJEXT%g
 s%@EXEEXT@%$EXEEXT%g
diff --git a/gas/configure.in b/gas/configure.in
index 0be9d21..3ebbe86 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -137,6 +137,7 @@ changequote([,])dnl
       m8*)		cpu_type=m88k ;;
       mips*el)		cpu_type=mips endian=little ;;
       mips*)		cpu_type=mips endian=big ;;
+      or32*)		cpu_type=or32 endian=big ;;
       pjl*)		cpu_type=pj endian=little ;;
       pj*)		cpu_type=pj endian=big ;;
       powerpc*le*)	cpu_type=ppc endian=little ;;
@@ -375,6 +376,9 @@ changequote([,])dnl
       mn10200-*-*)	    fmt=elf bfd_gas=yes ;;
       mn10300-*-*)	    fmt=elf bfd_gas=yes ;;
       openrisc-*-*)	    fmt=elf bfd_gas=yes ;;
+      or32-*-rtems*)	    fmt=coff ;;
+      or32-*-coff)	    fmt=coff ;;
+      or32-*-elf)           fmt=elf ;;
       pj*)		    fmt=elf ;;
       ppc-*-pe | ppc-*-cygwin* | ppc-*-winnt*)
 		            fmt=coff em=pe ;;
diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in
index ec5ff26..456e690 100644
--- a/gas/doc/Makefile.in
+++ b/gas/doc/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -188,7 +188,7 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -278,7 +278,7 @@ uninstall-info:
 	else ii=; fi; \
 	list='$(INFO_DEPS)'; \
 	for file in $$list; do \
-	  test -z "$ii" \
+	  test -z "$$ii" \
 	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
 	done
 	@$(NORMAL_UNINSTALL)
diff --git a/gas/po/POTFILES.in b/gas/po/POTFILES.in
index d1d5c97..0fb4fcd 100644
--- a/gas/po/POTFILES.in
+++ b/gas/po/POTFILES.in
@@ -96,6 +96,8 @@ config/tc-ns32k.c
 config/tc-ns32k.h
 config/tc-openrisc.c
 config/tc-openrisc.h
+config/tc-or32.c
+config/tc-or32.h
 config/tc-pdp11.c
 config/tc-pdp11.h
 config/tc-pj.c
diff --git a/gas/po/gas.pot b/gas/po/gas.pot
index f477568..3a0fd05 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: 2002-01-17 12:56+0000\n"
+"POT-Creation-Date: 2002-01-31 17:13+0000\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"
@@ -258,7 +258,7 @@ msgid "GNU assembler %s\n"
 msgstr ""
 
 #: as.c:528
-msgid "Copyright 2001 Free Software Foundation, Inc.\n"
+msgid "Copyright 2002 Free Software Foundation, Inc.\n"
 msgstr ""
 
 #: as.c:529 gasp.c:3627
@@ -444,7 +444,7 @@ msgstr ""
 msgid "%s: bad type for weak symbol"
 msgstr ""
 
-#: config/obj-aout.c:458 config/obj-coff.c:2940 write.c:1933
+#: config/obj-aout.c:458 config/obj-coff.c:2956 write.c:1933
 #, c-format
 msgid "%s: global symbols not supported in common sections"
 msgstr ""
@@ -473,7 +473,7 @@ msgstr ""
 msgid "Line numbers must be positive integers\n"
 msgstr ""
 
-#: config/obj-coff.c:503 config/obj-coff.c:2355
+#: config/obj-coff.c:503 config/obj-coff.c:2371
 msgid ".ln pseudo-op inside .def/.endef: ignored."
 msgstr ""
 
@@ -485,11 +485,11 @@ msgstr ""
 msgid ".loc pseudo-op inside .def/.endef: ignored."
 msgstr ""
 
-#: config/obj-coff.c:641 config/obj-coff.c:2412
+#: config/obj-coff.c:641 config/obj-coff.c:2428
 msgid ".def pseudo-op used inside of .def/.endef: ignored."
 msgstr ""
 
-#: config/obj-coff.c:687 config/obj-coff.c:2464
+#: config/obj-coff.c:687 config/obj-coff.c:2480
 msgid ".endef pseudo-op used outside of .def/.endef: ignored."
 msgstr ""
 
@@ -498,49 +498,49 @@ msgstr ""
 msgid "`%s' symbol without preceding function"
 msgstr ""
 
-#: config/obj-coff.c:812 config/obj-coff.c:2539
+#: config/obj-coff.c:812 config/obj-coff.c:2555
 #, c-format
 msgid "unexpected storage class %d"
 msgstr ""
 
-#: config/obj-coff.c:925 config/obj-coff.c:2646
+#: config/obj-coff.c:925 config/obj-coff.c:2662
 msgid ".dim pseudo-op used outside of .def/.endef: ignored."
 msgstr ""
 
-#: config/obj-coff.c:945 config/obj-coff.c:2666
+#: config/obj-coff.c:945 config/obj-coff.c:2682
 msgid "badly formed .dim directive ignored"
 msgstr ""
 
-#: config/obj-coff.c:996 config/obj-coff.c:2729
+#: config/obj-coff.c:996 config/obj-coff.c:2745
 msgid ".size pseudo-op used outside of .def/.endef ignored."
 msgstr ""
 
-#: config/obj-coff.c:1012 config/obj-coff.c:2745
+#: config/obj-coff.c:1012 config/obj-coff.c:2761
 msgid ".scl pseudo-op used outside of .def/.endef ignored."
 msgstr ""
 
-#: config/obj-coff.c:1030 config/obj-coff.c:2763
+#: config/obj-coff.c:1030 config/obj-coff.c:2779
 msgid ".tag pseudo-op used outside of .def/.endef ignored."
 msgstr ""
 
-#: config/obj-coff.c:1049 config/obj-coff.c:2781
+#: config/obj-coff.c:1049 config/obj-coff.c:2797
 #, c-format
 msgid "tag not found for .tag %s"
 msgstr ""
 
-#: config/obj-coff.c:1064 config/obj-coff.c:2796
+#: config/obj-coff.c:1064 config/obj-coff.c:2812
 msgid ".type pseudo-op used outside of .def/.endef ignored."
 msgstr ""
 
-#: config/obj-coff.c:1086 config/obj-coff.c:2818
+#: config/obj-coff.c:1086 config/obj-coff.c:2834
 msgid ".val pseudo-op used outside of .def/.endef ignored."
 msgstr ""
 
-#: config/obj-coff.c:1231 config/obj-coff.c:3013
+#: config/obj-coff.c:1231 config/obj-coff.c:3029
 msgid "mismatched .eb"
 msgstr ""
 
-#: config/obj-coff.c:1252 config/obj-coff.c:3053
+#: config/obj-coff.c:1252 config/obj-coff.c:3069
 msgid "C_EFCN symbol out of scope"
 msgstr ""
 
@@ -552,12 +552,12 @@ msgstr ""
 msgid "unsupported section attribute '%c'"
 msgstr ""
 
-#: config/obj-coff.c:1481 config/obj-coff.c:3758 config/tc-ppc.c:4211
+#: config/obj-coff.c:1481 config/obj-coff.c:3774 config/tc-ppc.c:4211
 #, c-format
 msgid "unknown section attribute '%c'"
 msgstr ""
 
-#: config/obj-coff.c:1511 config/tc-ppc.c:4229 config/tc-tic54x.c:4130
+#: config/obj-coff.c:1511 config/tc-ppc.c:4229 config/tc-tic54x.c:4133
 #: read.c:2555
 #, c-format
 msgid "error setting flags for \"%s\": %s"
@@ -577,62 +577,62 @@ msgstr ""
 msgid "Out of step\n"
 msgstr ""
 
-#: config/obj-coff.c:2271
+#: config/obj-coff.c:2287
 msgid "bfd_coff_swap_scnhdr_out failed"
 msgstr ""
 
-#: config/obj-coff.c:2496
+#: config/obj-coff.c:2512
 msgid "`.bf' symbol without preceding function\n"
 msgstr ""
 
-#: config/obj-coff.c:3450 config/obj-ieee.c:507
+#: config/obj-coff.c:3466 config/obj-ieee.c:507
 #, c-format
 msgid "FATAL: Can't create %s"
 msgstr ""
 
-#: config/obj-coff.c:3632
+#: config/obj-coff.c:3648
 #, c-format
 msgid "Can't close %s: %s"
 msgstr ""
 
-#: config/obj-coff.c:3666
+#: config/obj-coff.c:3682
 #, c-format
 msgid "Too many new sections; can't add \"%s\""
 msgstr ""
 
-#: config/obj-coff.c:4073 config/tc-sparc.c:3537
+#: config/obj-coff.c:4089 config/tc-sparc.c:3537
 msgid "Expected comma after name"
 msgstr ""
 
-#: config/obj-coff.c:4079
+#: config/obj-coff.c:4095
 msgid "Missing size expression"
 msgstr ""
 
-#: config/obj-coff.c:4085
+#: config/obj-coff.c:4101
 #, c-format
 msgid "lcomm length (%d.) <0! Ignored."
 msgstr ""
 
-#: config/obj-coff.c:4113
+#: config/obj-coff.c:4129
 #, c-format
 msgid "Symbol %s already defined"
 msgstr ""
 
-#: config/obj-coff.c:4208 config/tc-i960.c:3206
+#: config/obj-coff.c:4224 config/tc-i960.c:3206
 #, c-format
 msgid "No 'bal' entry point for leafproc %s"
 msgstr ""
 
-#: config/obj-coff.c:4287
+#: config/obj-coff.c:4303
 #, c-format
 msgid "Negative of non-absolute symbol %s"
 msgstr ""
 
-#: config/obj-coff.c:4308
+#: config/obj-coff.c:4324
 msgid "callj to difference of 2 symbols"
 msgstr ""
 
-#: config/obj-coff.c:4354
+#: config/obj-coff.c:4370
 #, c-format
 msgid "Can't emit reloc {- %s-seg symbol \"%s\"} @ file address %ld."
 msgstr ""
@@ -640,16 +640,16 @@ msgstr ""
 #. This is a COBR instruction.  They have only a 13-bit
 #. displacement and are only to be used for local branches:
 #. flag as error, don't generate relocation.
-#: config/obj-coff.c:4443 config/tc-i960.c:3226 write.c:2826
+#: config/obj-coff.c:4459 config/tc-i960.c:3226 write.c:2826
 msgid "can't use COBR format with external label"
 msgstr ""
 
-#: config/obj-coff.c:4518
+#: config/obj-coff.c:4534
 #, c-format
 msgid "Value of %ld too large for field of %d bytes at 0x%lx"
 msgstr ""
 
-#: config/obj-coff.c:4532
+#: config/obj-coff.c:4548
 #, c-format
 msgid "Signed .word overflow; switch may be too large; %ld at 0x%lx"
 msgstr ""
@@ -817,17 +817,17 @@ msgstr ""
 msgid "can't create group: %s"
 msgstr ""
 
-#: config/obj-elf.c:2068
+#: config/obj-elf.c:2076
 #, c-format
 msgid "failed to set up debugging information: %s"
 msgstr ""
 
-#: config/obj-elf.c:2088
+#: config/obj-elf.c:2096
 #, c-format
 msgid "can't start writing .mdebug section: %s"
 msgstr ""
 
-#: config/obj-elf.c:2096
+#: config/obj-elf.c:2104
 #, c-format
 msgid "could not write .mdebug section: %s"
 msgstr ""
@@ -1011,16 +1011,17 @@ msgstr ""
 
 #. Probably a memory allocation problem?  Give up now.
 #: config/tc-a29k.c:330 config/tc-hppa.c:1462 config/tc-mips.c:1251
-#: config/tc-mips.c:1293 config/tc-sparc.c:847
+#: config/tc-mips.c:1293 config/tc-or32.c:230 config/tc-sparc.c:847
 msgid "Broken assembler.  No assembly attempted."
 msgstr ""
 
 #: config/tc-a29k.c:375 config/tc-avr.c:1131 config/tc-d10v.c:540
 #: config/tc-d30v.c:552 config/tc-h8300.c:313 config/tc-h8500.c:284
 #: config/tc-mcore.c:655 config/tc-mmix.c:468 config/tc-mn10200.c:940
-#: config/tc-mn10300.c:1311 config/tc-ppc.c:2106 config/tc-s390.c:1054
-#: config/tc-sh.c:869 config/tc-tic80.c:283 config/tc-v850.c:2073
-#: config/tc-w65.c:241 config/tc-z8k.c:343
+#: config/tc-mn10300.c:1311 config/tc-or32.c:336 config/tc-or32.c:392
+#: config/tc-ppc.c:2106 config/tc-s390.c:1054 config/tc-sh.c:870
+#: config/tc-tic80.c:283 config/tc-v850.c:2073 config/tc-w65.c:241
+#: config/tc-z8k.c:343
 msgid "missing operand"
 msgstr ""
 
@@ -1051,7 +1052,7 @@ msgstr ""
 msgid "failed sanity check."
 msgstr ""
 
-#: config/tc-a29k.c:889
+#: config/tc-a29k.c:889 config/tc-or32.c:1046 config/tc-or32.c:1180
 #, c-format
 msgid "bad relocation type: 0x%02x"
 msgstr ""
@@ -1069,12 +1070,12 @@ msgstr ""
 msgid "a29k_estimate_size_before_relax\n"
 msgstr ""
 
-#: config/tc-a29k.c:1092
+#: config/tc-a29k.c:1092 config/tc-or32.c:1375
 #, c-format
 msgid "label \"$%d\" redefined"
 msgstr ""
 
-#: config/tc-a29k.c:1165
+#: config/tc-a29k.c:1165 config/tc-or32.c:1470
 #, c-format
 msgid "Invalid expression after %%%%\n"
 msgstr ""
@@ -1097,10 +1098,10 @@ msgstr ""
 msgid "syntax error"
 msgstr ""
 
-#: config/tc-alpha.c:980 config/tc-h8300.c:1413 config/tc-h8500.c:1187
+#: config/tc-alpha.c:980 config/tc-h8300.c:1421 config/tc-h8500.c:1187
 #: config/tc-hppa.c:4017 config/tc-i860.c:931 config/tc-m68hc11.c:500
 #: config/tc-m68k.c:4201 config/tc-m88k.c:1011 config/tc-ns32k.c:1663
-#: config/tc-sparc.c:2831 config/tc-z8k.c:1321
+#: config/tc-or32.c:912 config/tc-sparc.c:2831 config/tc-z8k.c:1321
 msgid "Bad call to MD_ATOF()"
 msgstr ""
 
@@ -1432,7 +1433,7 @@ msgstr ""
 msgid "Bad .section directive: want a,s,w,x,M,S in string"
 msgstr ""
 
-#: config/tc-arc.c:1616 config/tc-arm.c:10246
+#: config/tc-arc.c:1616 config/tc-arm.c:10344
 msgid "md_estimate_size_before_relax\n"
 msgstr ""
 
@@ -1440,764 +1441,1060 @@ msgstr ""
 msgid "md_convert_frag\n"
 msgstr ""
 
-#: config/tc-arm.c:664
+#: config/tc-arm.c:681
 msgid "ARM register expected"
 msgstr ""
 
-#: config/tc-arm.c:665 config/tc-arm.c:2814
+#: config/tc-arm.c:682 config/tc-arm.c:2843
 msgid "bad or missing co-processor number"
 msgstr ""
 
 #. In the few cases where we might be able to accept something else
 #. this error can be overridden.
-#: config/tc-arm.c:666 config/tc-arm.c:2869
+#: config/tc-arm.c:683 config/tc-arm.c:2898
 msgid "co-processor register expected"
 msgstr ""
 
-#: config/tc-arm.c:667
+#: config/tc-arm.c:684
 msgid "FPA register expected"
 msgstr ""
 
-#: config/tc-arm.c:668
+#: config/tc-arm.c:685
 msgid "VFP single precision register expected"
 msgstr ""
 
-#: config/tc-arm.c:669
+#: config/tc-arm.c:686
 msgid "VFP double precision register expected"
 msgstr ""
 
-#: config/tc-arm.c:670
+#: config/tc-arm.c:687
 msgid "Maverick MVF register expected"
 msgstr ""
 
-#: config/tc-arm.c:671
+#: config/tc-arm.c:688
 msgid "Maverick MVD register expected"
 msgstr ""
 
-#: config/tc-arm.c:672 config/tc-arm.c:673
+#: config/tc-arm.c:689 config/tc-arm.c:690
 msgid "Maverick MVFX register expected"
 msgstr ""
 
-#: config/tc-arm.c:674
+#: config/tc-arm.c:691
 msgid "Maverick MVAX register expected"
 msgstr ""
 
-#: config/tc-arm.c:675
+#: config/tc-arm.c:692
 msgid "Maverick DSPSC register expected"
 msgstr ""
 
-#: config/tc-arm.c:2013
+#: config/tc-arm.c:2036
 msgid "bad arguments to instruction"
 msgstr ""
 
-#: config/tc-arm.c:2014
+#: config/tc-arm.c:2037
 msgid "r15 not allowed here"
 msgstr ""
 
-#: config/tc-arm.c:2015
+#: config/tc-arm.c:2038
 msgid "instruction is not conditional"
 msgstr ""
 
-#: config/tc-arm.c:2016
+#: config/tc-arm.c:2039
 msgid "acc0 expected"
 msgstr ""
 
-#: config/tc-arm.c:2155
+#: config/tc-arm.c:2184
 msgid "literal pool overflow"
 msgstr ""
 
-#: config/tc-arm.c:2297
+#: config/tc-arm.c:2326
 msgid "invalid syntax for .req directive"
 msgstr ""
 
-#: config/tc-arm.c:2372
+#: config/tc-arm.c:2401
 #, c-format
 msgid "alignment too large: %d assumed"
 msgstr ""
 
-#: config/tc-arm.c:2375
+#: config/tc-arm.c:2404
 msgid "alignment negative. 0 assumed."
 msgstr ""
 
-#: config/tc-arm.c:2459
+#: config/tc-arm.c:2488
 #, c-format
 msgid "expected comma after name \"%s\""
 msgstr ""
 
-#: config/tc-arm.c:2509 config/tc-m32r.c:418
+#: config/tc-arm.c:2538 config/tc-m32r.c:418
 #, c-format
 msgid "symbol `%s' already defined"
 msgstr ""
 
-#: config/tc-arm.c:2580
+#: config/tc-arm.c:2609
 msgid "selected processor does not support THUMB opcodes"
 msgstr ""
 
-#: config/tc-arm.c:2593
+#: config/tc-arm.c:2622
 msgid "selected processor does not support ARM opcodes"
 msgstr ""
 
-#: config/tc-arm.c:2605
+#: config/tc-arm.c:2634
 #, c-format
 msgid "invalid instruction size selected (%d)"
 msgstr ""
 
-#: config/tc-arm.c:2640
+#: config/tc-arm.c:2669
 #, c-format
 msgid "invalid operand to .code directive (%d) (expecting 16 or 32)"
 msgstr ""
 
-#: config/tc-arm.c:2651
+#: config/tc-arm.c:2680
 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:2701
+#: config/tc-arm.c:2730
 #, 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:2773
+#: config/tc-arm.c:2802
 msgid "flag for {c}psr instruction expected"
 msgstr ""
 
-#: config/tc-arm.c:2807
+#: config/tc-arm.c:2836
 msgid "illegal co-processor number"
 msgstr ""
 
-#: config/tc-arm.c:2839 config/tc-arm.c:3877 config/tc-arm.c:4059
+#: config/tc-arm.c:2868 config/tc-arm.c:3928 config/tc-arm.c:4110
 msgid "bad or missing expression"
 msgstr ""
 
-#: config/tc-arm.c:2845
+#: config/tc-arm.c:2874
 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:2892
+#: config/tc-arm.c:2921
 msgid "floating point register expected"
 msgstr ""
 
-#: config/tc-arm.c:2909
+#: config/tc-arm.c:2938
 msgid "immediate expression expected"
 msgstr ""
 
-#: config/tc-arm.c:2924
+#: config/tc-arm.c:2953
 msgid "co-processor address must be word aligned"
 msgstr ""
 
-#: config/tc-arm.c:2930
+#: config/tc-arm.c:2959
 msgid "offset too large"
 msgstr ""
 
-#: config/tc-arm.c:2979
+#: config/tc-arm.c:3008
 msgid "pc may not be used in post-increment"
 msgstr ""
 
-#: config/tc-arm.c:2995 config/tc-arm.c:3440 config/tc-arm.c:4228
-#: config/tc-arm.c:5095 config/tc-arm.c:5429
+#: config/tc-arm.c:3024 config/tc-arm.c:3469 config/tc-arm.c:4279
+#: config/tc-arm.c:5146 config/tc-arm.c:5480
 msgid "pre-indexed expression expected"
 msgstr ""
 
-#: config/tc-arm.c:3008 config/tc-arm.c:3453 config/tc-arm.c:4239
-#: config/tc-arm.c:5107 config/tc-arm.c:5441 config/tc-arm.c:5790
-#: config/tc-arm.c:8452 config/tc-arm.c:8467
+#: config/tc-arm.c:3037 config/tc-arm.c:3482 config/tc-arm.c:4290
+#: config/tc-arm.c:5158 config/tc-arm.c:5492 config/tc-arm.c:5841
+#: config/tc-arm.c:8503 config/tc-arm.c:8518
 msgid "missing ]"
 msgstr ""
 
-#: config/tc-arm.c:3018
+#: config/tc-arm.c:3047
 msgid "pc may not be used with write-back"
 msgstr ""
 
-#: config/tc-arm.c:3070
+#: config/tc-arm.c:3099
 msgid "comma expected after register name"
 msgstr ""
 
-#: config/tc-arm.c:3089
+#: config/tc-arm.c:3118
 msgid "CPSR or SPSR expected"
 msgstr ""
 
-#: config/tc-arm.c:3115
+#: config/tc-arm.c:3144
 msgid "comma missing after psr flags"
 msgstr ""
 
-#: config/tc-arm.c:3131 config/tc-arm.c:3141
+#: config/tc-arm.c:3160 config/tc-arm.c:3170
 msgid "only a register or immediate value can follow a psr flag"
 msgstr ""
 
-#: config/tc-arm.c:3152
+#: config/tc-arm.c:3181
 msgid "immediate value cannot be used to set this field"
 msgstr ""
 
-#: config/tc-arm.c:3170 config/tc-arm.c:4455 config/tc-arm.c:4735
-#: config/tc-arm.c:4755 config/tc-i960.c:1924
+#: config/tc-arm.c:3199 config/tc-arm.c:4506 config/tc-arm.c:4786
+#: config/tc-arm.c:4806 config/tc-i960.c:1924
 msgid "invalid constant"
 msgstr ""
 
-#: config/tc-arm.c:3218
+#: config/tc-arm.c:3247
 msgid "rdhi, rdlo and rm must all be different"
 msgstr ""
 
-#: config/tc-arm.c:3272
+#: config/tc-arm.c:3301
 msgid "rd and rm should be different in mul"
 msgstr ""
 
-#: config/tc-arm.c:3326
+#: config/tc-arm.c:3355
 msgid "rd and rm should be different in mla"
 msgstr ""
 
-#: config/tc-arm.c:3374
+#: config/tc-arm.c:3403
 #, c-format
 msgid "acc0 expected, not '%.100s'"
 msgstr ""
 
-#: config/tc-arm.c:3552
+#: config/tc-arm.c:3581
 msgid "rdhi and rdlo must be different"
 msgstr ""
 
-#: config/tc-arm.c:3660
+#: config/tc-arm.c:3689
 msgid "Warning: instruction unpredictable when using r15"
 msgstr ""
 
-#: config/tc-arm.c:3886 config/tc-arm.c:4068 config/tc-arm.c:7395
-#: config/tc-arm.c:7428 config/tc-arm.c:7438
+#: config/tc-arm.c:3904
+msgid "use of r15 in bxj is not really useful"
+msgstr ""
+
+#: config/tc-arm.c:3937 config/tc-arm.c:4119 config/tc-arm.c:7446
+#: config/tc-arm.c:7479 config/tc-arm.c:7489
 msgid "immediate value out of range"
 msgstr ""
 
-#: config/tc-arm.c:4191
+#: config/tc-arm.c:4242
 msgid "'[' expected after PLD mnemonic"
 msgstr ""
 
-#: config/tc-arm.c:4213
+#: config/tc-arm.c:4264
 msgid "post-indexed expression used in preload instruction"
 msgstr ""
 
-#: config/tc-arm.c:4218 config/tc-arm.c:4248
+#: config/tc-arm.c:4269 config/tc-arm.c:4299
 msgid "writeback used in preload instruction"
 msgstr ""
 
-#: config/tc-arm.c:4290
+#: config/tc-arm.c:4341
 msgid "destination register must be even"
 msgstr ""
 
-#: config/tc-arm.c:4296
+#: config/tc-arm.c:4347
 msgid "r14 not allowed here"
 msgstr ""
 
-#: config/tc-arm.c:4303
+#: config/tc-arm.c:4354
 msgid "pre/post-indexing used when modified address register is destination"
 msgstr ""
 
-#: config/tc-arm.c:4313
+#: config/tc-arm.c:4364
 msgid "ldrd destination registers must not overlap index register"
 msgstr ""
 
-#: config/tc-arm.c:4439
+#: config/tc-arm.c:4490
 msgid "bad_segment"
 msgstr ""
 
-#: config/tc-arm.c:4476 expr.c:1314 read.c:2198
+#: config/tc-arm.c:4527 expr.c:1314 read.c:2198
 msgid "bad expression"
 msgstr ""
 
-#: config/tc-arm.c:4499 config/tc-arm.c:4510
+#: config/tc-arm.c:4550 config/tc-arm.c:4561
 msgid "shift expression expected"
 msgstr ""
 
-#: config/tc-arm.c:4534
+#: config/tc-arm.c:4585
 msgid "shift requires register or #expression"
 msgstr ""
 
-#: config/tc-arm.c:4535
+#: config/tc-arm.c:4586
 msgid "shift requires #expression"
 msgstr ""
 
-#: config/tc-arm.c:4565
+#: config/tc-arm.c:4616
 msgid "shift of 0 ignored."
 msgstr ""
 
-#: config/tc-arm.c:4571
+#: config/tc-arm.c:4622
 msgid "invalid immediate shift"
 msgstr ""
 
-#: config/tc-arm.c:4726 config/tc-arm.c:5143 config/tc-arm.c:5478
-#: config/tc-arm.c:6087 config/tc-v850.c:1956 config/tc-v850.c:1977
+#: config/tc-arm.c:4777 config/tc-arm.c:5194 config/tc-arm.c:5529
+#: config/tc-arm.c:6138 config/tc-v850.c:1956 config/tc-v850.c:1977
 msgid "constant expression expected"
 msgstr ""
 
-#: config/tc-arm.c:4768
+#: config/tc-arm.c:4819
 msgid "register or shift expression expected"
 msgstr ""
 
-#: config/tc-arm.c:4821
+#: config/tc-arm.c:4872
 msgid "invalid floating point immediate expression"
 msgstr ""
 
-#: config/tc-arm.c:4825
+#: config/tc-arm.c:4876
 msgid "floating point register or immediate expression expected"
 msgstr ""
 
-#: config/tc-arm.c:4979 config/tc-arm.c:5309
+#: config/tc-arm.c:5030 config/tc-arm.c:5360
 msgid "address offset too large"
 msgstr ""
 
-#: config/tc-arm.c:5037 config/tc-arm.c:5227 config/tc-arm.c:5369
+#: config/tc-arm.c:5088 config/tc-arm.c:5278 config/tc-arm.c:5420
 msgid "address expected"
 msgstr ""
 
-#: config/tc-arm.c:5067 config/tc-arm.c:5079 config/tc-arm.c:5116
-#: config/tc-arm.c:5245 config/tc-arm.c:5399 config/tc-arm.c:5413
-#: config/tc-arm.c:5450
+#: config/tc-arm.c:5118 config/tc-arm.c:5130 config/tc-arm.c:5167
+#: config/tc-arm.c:5296 config/tc-arm.c:5450 config/tc-arm.c:5464
+#: config/tc-arm.c:5501
 #, c-format
 msgid "%s register same as write-back base"
 msgstr ""
 
-#: config/tc-arm.c:5069 config/tc-arm.c:5081 config/tc-arm.c:5118
-#: config/tc-arm.c:5247 config/tc-arm.c:5401 config/tc-arm.c:5415
-#: config/tc-arm.c:5452
+#: config/tc-arm.c:5120 config/tc-arm.c:5132 config/tc-arm.c:5169
+#: config/tc-arm.c:5298 config/tc-arm.c:5452 config/tc-arm.c:5466
+#: config/tc-arm.c:5503
 msgid "destination"
 msgstr ""
 
-#: config/tc-arm.c:5069 config/tc-arm.c:5081 config/tc-arm.c:5118
-#: config/tc-arm.c:5247 config/tc-arm.c:5401 config/tc-arm.c:5415
-#: config/tc-arm.c:5452
+#: config/tc-arm.c:5120 config/tc-arm.c:5132 config/tc-arm.c:5169
+#: config/tc-arm.c:5298 config/tc-arm.c:5452 config/tc-arm.c:5466
+#: config/tc-arm.c:5503
 msgid "source"
 msgstr ""
 
-#: config/tc-arm.c:5128 config/tc-arm.c:5462 config/tc-arm.c:7699
+#: config/tc-arm.c:5179 config/tc-arm.c:5513 config/tc-arm.c:7750
 msgid "invalid pseudo operation"
 msgstr ""
 
-#: config/tc-arm.c:5180 config/tc-arm.c:5513
+#: config/tc-arm.c:5231 config/tc-arm.c:5564
 msgid "literal pool insertion failed"
 msgstr ""
 
-#: config/tc-arm.c:5275 config/tc-arm.c:5281
+#: config/tc-arm.c:5326 config/tc-arm.c:5332
 msgid "post-indexed expression expected"
 msgstr ""
 
-#: config/tc-arm.c:5579
+#: config/tc-arm.c:5630
 msgid "bad range in register list"
 msgstr ""
 
-#: config/tc-arm.c:5587 config/tc-arm.c:5596 config/tc-arm.c:5638
+#: config/tc-arm.c:5638 config/tc-arm.c:5647 config/tc-arm.c:5689
 #, c-format
 msgid "Warning: duplicated register (r%d) in register list"
 msgstr ""
 
-#: config/tc-arm.c:5599
+#: config/tc-arm.c:5650
 msgid "Warning: register range not in ascending order"
 msgstr ""
 
-#: config/tc-arm.c:5611
+#: config/tc-arm.c:5662
 msgid "missing `}'"
 msgstr ""
 
-#: config/tc-arm.c:5627
+#: config/tc-arm.c:5678
 msgid "invalid register mask"
 msgstr ""
 
-#: config/tc-arm.c:5648 config/tc-arm.c:8709 config/tc-arm.c:8809
+#: config/tc-arm.c:5699 config/tc-arm.c:8760 config/tc-arm.c:8860
 #: config/tc-avr.c:860 config/tc-cris.c:3006 config/tc-d10v.c:1563
 #: config/tc-d30v.c:1863 config/tc-mips.c:3641 config/tc-mips.c:4630
 #: config/tc-mips.c:5486 config/tc-mips.c:6091 config/tc-ppc.c:5143
-#: config/tc-v850.c:2376
+#: config/tc-v850.c:2376 config/tc-xstormy16.c:479
 msgid "expression too complex"
 msgstr ""
 
-#: config/tc-arm.c:5686
+#: config/tc-arm.c:5737
 msgid "r15 not allowed as base register"
 msgstr ""
 
-#: config/tc-arm.c:5750 config/tc-arm.c:5764
+#: config/tc-arm.c:5801 config/tc-arm.c:5815
 msgid "r15 not allowed in swap"
 msgstr ""
 
-#: config/tc-arm.c:5859
+#: config/tc-arm.c:5910
 msgid "use of r15 in bx in ARM mode is not really useful"
 msgstr ""
 
-#: config/tc-arm.c:6093
+#: config/tc-arm.c:6144
 msgid "constant value required for number of registers"
 msgstr ""
 
-#: config/tc-arm.c:6101
+#: config/tc-arm.c:6152
 msgid "number of registers must be in the range [1:4]"
 msgstr ""
 
-#: config/tc-arm.c:6162
+#: config/tc-arm.c:6213
 msgid "r15 not allowed as base register with write-back"
 msgstr ""
 
-#: config/tc-arm.c:6544
+#: config/tc-arm.c:6595
 msgid "only two consecutive VFP SP registers allowed here"
 msgstr ""
 
-#: config/tc-arm.c:6712
+#: config/tc-arm.c:6763
 msgid "VFP system register expected"
 msgstr ""
 
-#: config/tc-arm.c:6850 config/tc-arm.c:6889 config/tc-arm.c:6902
-#: config/tc-arm.c:6963 config/tc-arm.c:7002 config/tc-arm.c:7015
+#: config/tc-arm.c:6901 config/tc-arm.c:6940 config/tc-arm.c:6953
+#: config/tc-arm.c:7014 config/tc-arm.c:7053 config/tc-arm.c:7066
 #: config/tc-mips.c:9060 config/tc-mips.c:9090
 msgid "invalid register list"
 msgstr ""
 
-#: config/tc-arm.c:6856 config/tc-arm.c:6969
+#: config/tc-arm.c:6907 config/tc-arm.c:7020
 msgid "register list not in ascending order"
 msgstr ""
 
-#: config/tc-arm.c:6881 config/tc-arm.c:6994
+#: config/tc-arm.c:6932 config/tc-arm.c:7045
 msgid "register range not in ascending order"
 msgstr ""
 
-#: config/tc-arm.c:6919 config/tc-arm.c:7032
+#: config/tc-arm.c:6970 config/tc-arm.c:7083
 msgid "non-contiguous register range"
 msgstr ""
 
-#: config/tc-arm.c:7062 config/tc-arm.c:7099
+#: config/tc-arm.c:7113 config/tc-arm.c:7150
 msgid "this addressing mode requires base-register writeback"
 msgstr ""
 
-#: config/tc-arm.c:7259
+#: config/tc-arm.c:7310
 msgid "lo register required"
 msgstr ""
 
-#: config/tc-arm.c:7267
+#: config/tc-arm.c:7318
 msgid "hi register required"
 msgstr ""
 
-#: config/tc-arm.c:7337 config/tc-arm.c:8541
+#: config/tc-arm.c:7388 config/tc-arm.c:8592
 msgid "dest and source1 must be the same register"
 msgstr ""
 
-#: config/tc-arm.c:7344
+#: config/tc-arm.c:7395
 msgid "subtract valid only on lo regs"
 msgstr ""
 
-#: config/tc-arm.c:7368
+#: config/tc-arm.c:7419
 msgid "invalid Hi register with immediate"
 msgstr ""
 
-#: config/tc-arm.c:7406
+#: config/tc-arm.c:7457
 msgid "invalid immediate value for stack adjust"
 msgstr ""
 
-#: config/tc-arm.c:7417
+#: config/tc-arm.c:7468
 msgid "invalid immediate for address calculation"
 msgstr ""
 
-#: config/tc-arm.c:7504
+#: config/tc-arm.c:7555
 msgid "source1 and dest must be same register"
 msgstr ""
 
-#: config/tc-arm.c:7538
+#: config/tc-arm.c:7589
 msgid "invalid immediate for shift"
 msgstr ""
 
-#: config/tc-arm.c:7617
+#: config/tc-arm.c:7668
 msgid "only lo regs allowed with immediate"
 msgstr ""
 
-#: config/tc-arm.c:7636
+#: config/tc-arm.c:7687
 msgid "invalid immediate"
 msgstr ""
 
-#: config/tc-arm.c:7690
+#: config/tc-arm.c:7741
 msgid "expected ']'"
 msgstr ""
 
-#: config/tc-arm.c:7763
+#: config/tc-arm.c:7814
 msgid "byte or halfword not valid for base register"
 msgstr ""
 
-#: config/tc-arm.c:7768
+#: config/tc-arm.c:7819
 msgid "r15 based store not allowed"
 msgstr ""
 
-#: config/tc-arm.c:7773
+#: config/tc-arm.c:7824
 msgid "invalid base register for register offset"
 msgstr ""
 
-#: config/tc-arm.c:7791 config/tc-arm.c:7826
+#: config/tc-arm.c:7842 config/tc-arm.c:7877
 msgid "invalid offset"
 msgstr ""
 
-#: config/tc-arm.c:7802
+#: config/tc-arm.c:7853
 msgid "invalid base register in load/store"
 msgstr ""
 
-#: config/tc-arm.c:8345
+#: config/tc-arm.c:8396
 msgid "expecting immediate, 7bit operand"
 msgstr ""
 
-#: config/tc-arm.c:8360
+#: config/tc-arm.c:8411
 msgid "immediate out of range"
 msgstr ""
 
-#: config/tc-arm.c:8403
+#: config/tc-arm.c:8454
 msgid "offset expected"
 msgstr ""
 
-#: config/tc-arm.c:8412 config/tc-pj.c:528 config/tc-sh.c:3030
+#: config/tc-arm.c:8463 config/tc-pj.c:528 config/tc-sh.c:3021
 msgid "offset out of range"
 msgstr ""
 
-#: config/tc-arm.c:8549
+#: config/tc-arm.c:8600
 msgid "Rs and Rd must be different in MUL"
 msgstr ""
 
-#: config/tc-arm.c:8693
+#: config/tc-arm.c:8744
 msgid ""
 "inserted missing '!': load/store multiple always writes back base register"
 msgstr ""
 
-#: config/tc-arm.c:8715
+#: config/tc-arm.c:8766
 msgid "only lo-regs valid in load/store multiple"
 msgstr ""
 
-#: config/tc-arm.c:8761
+#: config/tc-arm.c:8812
 msgid "syntax: ldrs[b] Rd, [Rb, Ro]"
 msgstr ""
 
-#: config/tc-arm.c:8825
+#: config/tc-arm.c:8876
 msgid "invalid register list to push/pop instruction"
 msgstr ""
 
-#: config/tc-arm.c:8937 config/tc-arm.c:9115
+#: config/tc-arm.c:8988 config/tc-arm.c:9166
 msgid "virtual memory exhausted"
 msgstr ""
 
-#: config/tc-arm.c:9018
+#: config/tc-arm.c:9069
 #, c-format
 msgid "register '%s' does not exist\n"
 msgstr ""
 
-#: config/tc-arm.c:9022
+#: config/tc-arm.c:9073
 #, c-format
 msgid ""
 "ignoring redefinition of register alias '%s' to non-existant register '%s'"
 msgstr ""
 
-#: config/tc-arm.c:9031
+#: config/tc-arm.c:9082
 #, c-format
 msgid "ignoring redefinition of register alias '%s'"
 msgstr ""
 
-#: config/tc-arm.c:9037
+#: config/tc-arm.c:9088
 msgid "ignoring incomplete .req pseuso op"
 msgstr ""
 
-#: config/tc-arm.c:9312
+#: config/tc-arm.c:9190
+msgid "use of old and new-style options to set CPU type"
+msgstr ""
+
+#: config/tc-arm.c:9200
+msgid "use of old and new-style options to set FPU type"
+msgstr ""
+
+#: config/tc-arm.c:9410
 msgid "bad call to MD_ATOF()"
 msgstr ""
 
-#: config/tc-arm.c:9542
+#: config/tc-arm.c:9640
 #, c-format
 msgid "invalid constant (%lx) after fixup"
 msgstr ""
 
-#: config/tc-arm.c:9578
+#: config/tc-arm.c:9676
 #, c-format
 msgid "unable to compute ADRL instructions for PC offset of 0x%lx"
 msgstr ""
 
-#: config/tc-arm.c:9608
+#: config/tc-arm.c:9706
 #, c-format
 msgid "bad immediate value for offset (%ld)"
 msgstr ""
 
-#: config/tc-arm.c:9630 config/tc-arm.c:9652
+#: config/tc-arm.c:9728 config/tc-arm.c:9750
 msgid "invalid literal constant: pool needs to be closer"
 msgstr ""
 
-#: config/tc-arm.c:9632
+#: config/tc-arm.c:9730
 #, c-format
 msgid "bad immediate value for half-word offset (%ld)"
 msgstr ""
 
-#: config/tc-arm.c:9669
+#: config/tc-arm.c:9767
 msgid "shift expression is too large"
 msgstr ""
 
-#: config/tc-arm.c:9688 config/tc-arm.c:9697
+#: config/tc-arm.c:9786 config/tc-arm.c:9795
 msgid "invalid swi expression"
 msgstr ""
 
-#: config/tc-arm.c:9707
+#: config/tc-arm.c:9805
 msgid "invalid expression in load/store multiple"
 msgstr ""
 
-#: config/tc-arm.c:9760
+#: config/tc-arm.c:9858
 msgid "GAS can't handle same-section branch dest >= 0x04000000"
 msgstr ""
 
-#: config/tc-arm.c:9769
+#: config/tc-arm.c:9867
 msgid "out of range branch"
 msgstr ""
 
-#: config/tc-arm.c:9802 config/tc-arm.c:9818
+#: config/tc-arm.c:9900 config/tc-arm.c:9916
 msgid "branch out of range"
 msgstr ""
 
-#: config/tc-arm.c:9841
+#: config/tc-arm.c:9939
 msgid "branch with link out of range"
 msgstr ""
 
-#: config/tc-arm.c:9917
+#: config/tc-arm.c:10015
 msgid "illegal value for co-processor offset"
 msgstr ""
 
-#: config/tc-arm.c:9941
+#: config/tc-arm.c:10039
 #, c-format
 msgid "invalid offset, target not word aligned (0x%08X)"
 msgstr ""
 
-#: config/tc-arm.c:9947 config/tc-arm.c:9956 config/tc-arm.c:9963
-#: config/tc-arm.c:9970 config/tc-arm.c:9977
+#: config/tc-arm.c:10045 config/tc-arm.c:10054 config/tc-arm.c:10061
+#: config/tc-arm.c:10068 config/tc-arm.c:10075
 #, c-format
 msgid "invalid offset, value too big (0x%08lX)"
 msgstr ""
 
-#: config/tc-arm.c:10016
+#: config/tc-arm.c:10114
 msgid "invalid immediate for stack address calculation"
 msgstr ""
 
-#: config/tc-arm.c:10025
+#: config/tc-arm.c:10123
 #, c-format
 msgid "invalid immediate for address calculation (value = 0x%08lX)"
 msgstr ""
 
-#: config/tc-arm.c:10035
+#: config/tc-arm.c:10133
 msgid "invalid 8bit immediate"
 msgstr ""
 
-#: config/tc-arm.c:10043
+#: config/tc-arm.c:10141
 msgid "invalid 3bit immediate"
 msgstr ""
 
-#: config/tc-arm.c:10059
+#: config/tc-arm.c:10157
 #, c-format
 msgid "invalid immediate: %ld is too large"
 msgstr ""
 
-#: config/tc-arm.c:10074
+#: config/tc-arm.c:10172
 #, c-format
 msgid "illegal Thumb shift value: %ld"
 msgstr ""
 
-#: config/tc-arm.c:10088
+#: config/tc-arm.c:10186
 #, c-format
 msgid "bad relocation fixup type (%d)"
 msgstr ""
 
-#: config/tc-arm.c:10159
+#: config/tc-arm.c:10257
 msgid "literal referenced across section boundary (Implicit dump?)"
 msgstr ""
 
-#: config/tc-arm.c:10172
+#: config/tc-arm.c:10270
 #, c-format
 msgid "internal relocation (type %d) not fixed up (IMMEDIATE)"
 msgstr ""
 
-#: config/tc-arm.c:10178
+#: config/tc-arm.c:10276
 msgid "ADRL used for a symbol not defined in the same file"
 msgstr ""
 
-#: config/tc-arm.c:10183
+#: config/tc-arm.c:10281
 #, c-format
 msgid "internal_relocation (type %d) not fixed up (OFFSET_IMM)"
 msgstr ""
 
-#: config/tc-arm.c:10204 config/tc-cris.c:2940 config/tc-mcore.c:2104
+#: config/tc-arm.c:10302 config/tc-cris.c:2940 config/tc-mcore.c:2104
 #: config/tc-mmix.c:2840 config/tc-ns32k.c:2350
 msgid "<unknown>"
 msgstr ""
 
-#: config/tc-arm.c:10207 config/tc-arm.c:10228
+#: config/tc-arm.c:10305 config/tc-arm.c:10326
 #, c-format
 msgid "cannot represent %s relocation in this object file format"
 msgstr ""
 
-#: config/tc-arm.c:10325
+#: config/tc-arm.c:10423
 #, c-format
 msgid "no operator -- statement `%s'\n"
 msgstr ""
 
-#: config/tc-arm.c:10343 config/tc-arm.c:10368
+#: config/tc-arm.c:10441 config/tc-arm.c:10466
 #, c-format
 msgid "selected processor does not support `%s'"
 msgstr ""
 
-#: config/tc-arm.c:10385
+#: config/tc-arm.c:10483
 #, c-format
 msgid "bad instruction `%s'"
 msgstr ""
 
-#: config/tc-arm.c:10583
+#: config/tc-arm.c:10584
+msgid "generate PIC code"
+msgstr ""
+
+#: config/tc-arm.c:10585
+msgid "assemble Thumb code"
+msgstr ""
+
+#: config/tc-arm.c:10586
+msgid "support ARM/Thumb interworking"
+msgstr ""
+
+#: config/tc-arm.c:10588
+msgid "use old ABI (ELF only)"
+msgstr ""
+
+#: config/tc-arm.c:10589
+msgid "code uses 32-bit program counter"
+msgstr ""
+
+#: config/tc-arm.c:10590
+msgid "code uses 26-bit program counter"
+msgstr ""
+
+#: config/tc-arm.c:10591
+msgid "floating point args are in fp regs"
+msgstr ""
+
+#: config/tc-arm.c:10593
+msgid "re-entrant code"
+msgstr ""
+
+#: config/tc-arm.c:10594
+msgid "code is ATPCS conformant"
+msgstr ""
+
+#: config/tc-arm.c:10595
+msgid "assemble for big-endian"
+msgstr ""
+
+#: config/tc-arm.c:10596
+msgid "assemble for little-endian"
+msgstr ""
+
+#. These are recognized by the assembler, but have no affect on code.
+#: config/tc-arm.c:10600
+msgid "use frame pointer"
+msgstr ""
+
+#: config/tc-arm.c:10601
+msgid "use stack size checking"
+msgstr ""
+
+#. DON'T add any new processors to this list -- we want the whole list
+#. to go away...  Add them to the processors table instead.
+#: config/tc-arm.c:10605 config/tc-arm.c:10606
+msgid "use -mcpu=arm1"
+msgstr ""
+
+#: config/tc-arm.c:10607 config/tc-arm.c:10608
+msgid "use -mcpu=arm2"
+msgstr ""
+
+#: config/tc-arm.c:10609 config/tc-arm.c:10610
+msgid "use -mcpu=arm250"
+msgstr ""
+
+#: config/tc-arm.c:10611 config/tc-arm.c:10612
+msgid "use -mcpu=arm3"
+msgstr ""
+
+#: config/tc-arm.c:10613 config/tc-arm.c:10614
+msgid "use -mcpu=arm6"
+msgstr ""
+
+#: config/tc-arm.c:10615 config/tc-arm.c:10616
+msgid "use -mcpu=arm600"
+msgstr ""
+
+#: config/tc-arm.c:10617 config/tc-arm.c:10618
+msgid "use -mcpu=arm610"
+msgstr ""
+
+#: config/tc-arm.c:10619 config/tc-arm.c:10620
+msgid "use -mcpu=arm620"
+msgstr ""
+
+#: config/tc-arm.c:10621 config/tc-arm.c:10622
+msgid "use -mcpu=arm7"
+msgstr ""
+
+#: config/tc-arm.c:10623 config/tc-arm.c:10624
+msgid "use -mcpu=arm70"
+msgstr ""
+
+#: config/tc-arm.c:10625 config/tc-arm.c:10626
+msgid "use -mcpu=arm700"
+msgstr ""
+
+#: config/tc-arm.c:10627 config/tc-arm.c:10628
+msgid "use -mcpu=arm700i"
+msgstr ""
+
+#: config/tc-arm.c:10629 config/tc-arm.c:10630
+msgid "use -mcpu=arm710"
+msgstr ""
+
+#: config/tc-arm.c:10631 config/tc-arm.c:10632
+msgid "use -mcpu=arm710c"
+msgstr ""
+
+#: config/tc-arm.c:10633 config/tc-arm.c:10634
+msgid "use -mcpu=arm720"
+msgstr ""
+
+#: config/tc-arm.c:10635 config/tc-arm.c:10636
+msgid "use -mcpu=arm7d"
+msgstr ""
+
+#: config/tc-arm.c:10637 config/tc-arm.c:10638
+msgid "use -mcpu=arm7di"
+msgstr ""
+
+#: config/tc-arm.c:10639 config/tc-arm.c:10640
+msgid "use -mcpu=arm7m"
+msgstr ""
+
+#: config/tc-arm.c:10641 config/tc-arm.c:10642
+msgid "use -mcpu=arm7dm"
+msgstr ""
+
+#: config/tc-arm.c:10643 config/tc-arm.c:10644
+msgid "use -mcpu=arm7dmi"
+msgstr ""
+
+#: config/tc-arm.c:10645 config/tc-arm.c:10646
+msgid "use -mcpu=arm7100"
+msgstr ""
+
+#: config/tc-arm.c:10647 config/tc-arm.c:10648
+msgid "use -mcpu=arm7500"
+msgstr ""
+
+#: config/tc-arm.c:10649 config/tc-arm.c:10650
+msgid "use -mcpu=arm7500fe"
+msgstr ""
+
+#: config/tc-arm.c:10651 config/tc-arm.c:10652 config/tc-arm.c:10653
+#: config/tc-arm.c:10654
+msgid "use -mcpu=arm7tdmi"
+msgstr ""
+
+#: config/tc-arm.c:10655 config/tc-arm.c:10656
+msgid "use -mcpu=arm710t"
+msgstr ""
+
+#: config/tc-arm.c:10657 config/tc-arm.c:10658
+msgid "use -mcpu=arm720t"
+msgstr ""
+
+#: config/tc-arm.c:10659 config/tc-arm.c:10660
+msgid "use -mcpu=arm740t"
+msgstr ""
+
+#: config/tc-arm.c:10661 config/tc-arm.c:10662
+msgid "use -mcpu=arm8"
+msgstr ""
+
+#: config/tc-arm.c:10663 config/tc-arm.c:10664
+msgid "use -mcpu=arm810"
+msgstr ""
+
+#: config/tc-arm.c:10665 config/tc-arm.c:10666
+msgid "use -mcpu=arm9"
+msgstr ""
+
+#: config/tc-arm.c:10667 config/tc-arm.c:10668
+msgid "use -mcpu=arm9tdmi"
+msgstr ""
+
+#: config/tc-arm.c:10669 config/tc-arm.c:10670
+msgid "use -mcpu=arm920"
+msgstr ""
+
+#: config/tc-arm.c:10671 config/tc-arm.c:10672
+msgid "use -mcpu=arm940"
+msgstr ""
+
+#: config/tc-arm.c:10673
+msgid "use -mcpu=strongarm"
+msgstr ""
+
+#: config/tc-arm.c:10675
+msgid "use -mcpu=strongarm110"
+msgstr ""
+
+#: config/tc-arm.c:10677
+msgid "use -mcpu=strongarm1100"
+msgstr ""
+
+#: config/tc-arm.c:10679
+msgid "use -mcpu=strongarm1110"
+msgstr ""
+
+#: config/tc-arm.c:10680
+msgid "use -mcpu=xscale"
+msgstr ""
+
+#: config/tc-arm.c:10681
+msgid "use -mcpu=all"
+msgstr ""
+
+#. Architecture variants -- don't add any more to this list either.
+#: config/tc-arm.c:10684 config/tc-arm.c:10685
+msgid "use -march=armv2"
+msgstr ""
+
+#: config/tc-arm.c:10686 config/tc-arm.c:10687
+msgid "use -march=armv2a"
+msgstr ""
+
+#: config/tc-arm.c:10688 config/tc-arm.c:10689
+msgid "use -march=armv3"
+msgstr ""
+
+#: config/tc-arm.c:10690 config/tc-arm.c:10691
+msgid "use -march=armv3m"
+msgstr ""
+
+#: config/tc-arm.c:10692 config/tc-arm.c:10693
+msgid "use -march=armv4"
+msgstr ""
+
+#: config/tc-arm.c:10694 config/tc-arm.c:10695
+msgid "use -march=armv4t"
+msgstr ""
+
+#: config/tc-arm.c:10696 config/tc-arm.c:10697
+msgid "use -march=armv5"
+msgstr ""
+
+#: config/tc-arm.c:10698 config/tc-arm.c:10699
+msgid "use -march=armv5t"
+msgstr ""
+
+#: config/tc-arm.c:10700 config/tc-arm.c:10701
+msgid "use -march=armv5te"
+msgstr ""
+
+#. Floating point variants -- don't add any more to this list either.
+#: config/tc-arm.c:10704
+msgid "use -mfpu=fpe"
+msgstr ""
+
+#: config/tc-arm.c:10705
+msgid "use -mfpu=fpa10"
+msgstr ""
+
+#: config/tc-arm.c:10706
+msgid "use -mfpu=fpa11"
+msgstr ""
+
+#: config/tc-arm.c:10708
+msgid "use either -mfpu=softfpa or -mfpu=softvfp"
+msgstr ""
+
+#: config/tc-arm.c:10888
+msgid "invalid architectural extension"
+msgstr ""
+
+#: config/tc-arm.c:10902
+msgid "missing architectural extension"
+msgstr ""
+
+#: config/tc-arm.c:10915
 #, c-format
-msgid "unrecognised APCS switch -m%s"
+msgid "unknown architectural extnsion `%s'"
 msgstr ""
 
-#: config/tc-arm.c:10738 config/tc-arm.c:10751 config/tc-arm.c:10764
-#: config/tc-arm.c:10777 config/tc-arm.c:10783
+#: config/tc-arm.c:10940
 #, c-format
-msgid "invalid architecture variant -m%s"
+msgid "missing cpu name `%s'"
 msgstr ""
 
-#: config/tc-arm.c:10790
+#: config/tc-arm.c:10956
 #, c-format
-msgid "invalid processor variant -m%s"
+msgid "unknown cpu `%s'"
 msgstr ""
 
-#: config/tc-arm.c:10813
-msgid ""
-" ARM Specific Assembler Options:\n"
-"  -m[arm][<processor name>] select processor variant\n"
-"  -m[arm]v[2|2a|3|3m|4|4t|5[t][e]] select architecture variant\n"
-"  -marm9e                   allow Cirrus/DSP instructions\n"
-"  -mthumb                   only allow Thumb instructions\n"
-"  -mthumb-interwork         mark the assembled code as supporting "
-"interworking\n"
-"  -mall                     allow any instruction\n"
-"  -mfpa10, -mfpa11          select floating point architecture\n"
-"  -mfpe-old                 don't allow floating-point multiple "
-"instructions\n"
-"  -mvfpxd                   allow vfp single-precision instructions\n"
-"  -mvfp                     allow all vfp instructions\n"
-"  -mno-fpu                  don't allow any floating-point instructions.\n"
-"  -k                        generate PIC code.\n"
-msgstr ""
-
-#: config/tc-arm.c:10828
-msgid ""
-"  -mapcs-32, -mapcs-26      specify which ARM Procedure Calling Standard to "
-"use\n"
-"  -matpcs                   use ARM/Thumb Procedure Calling Standard\n"
-"  -mapcs-float              floating point args are passed in FP regs\n"
-"  -mapcs-reentrant          the code is position independent/reentrant\n"
+#: config/tc-arm.c:10975
+#, c-format
+msgid "missing architecture name `%s'"
 msgstr ""
 
-#: config/tc-arm.c:10835
-msgid "  -moabi                    support the old ELF ABI\n"
+#: config/tc-arm.c:10992
+#, c-format
+msgid "unknown architecture `%s'\n"
 msgstr ""
 
-#: config/tc-arm.c:10839
-msgid ""
-"  -EB                       assemble code for a big endian cpu\n"
-"  -EL                       assemble code for a little endian cpu\n"
+#: config/tc-arm.c:11009
+#, c-format
+msgid "unknown floating point format `%s'\n"
+msgstr ""
+
+#: config/tc-arm.c:11015
+msgid "<cpu name>\t  assemble for CPU <cpu name>"
+msgstr ""
+
+#: config/tc-arm.c:11017
+msgid "<arch name>\t  assemble for architecture <arch name>"
+msgstr ""
+
+#: config/tc-arm.c:11019
+msgid "<fpu name>\t  assemble for FPU architecture <fpu name>"
+msgstr ""
+
+#: config/tc-arm.c:11061 config/tc-arm.c:11083
+#, c-format
+msgid "option `-%c%s' is deprecated: %s"
+msgstr ""
+
+#: config/tc-arm.c:11092
+#, c-format
+msgid "unrecognized option `-%c%s'"
+msgstr ""
+
+#: config/tc-arm.c:11106
+msgid " ARM-specific assembler options:\n"
+msgstr ""
+
+#: config/tc-arm.c:11117
+msgid "  -EB                     assemble code for a big-endian cpu\n"
 msgstr ""
 
-#: config/tc-arm.c:11023
+#: config/tc-arm.c:11122
+msgid "  -EL                     assemble code for a little-endian cpu\n"
+msgstr ""
+
+#: config/tc-arm.c:11305
 #, c-format
 msgid "%s: unexpected function type: %d"
 msgstr ""
 
-#: config/tc-arm.c:11389
+#: config/tc-arm.c:11671
 msgid "alignments greater than 32 bytes not supported in .text sections."
 msgstr ""
 
@@ -2243,7 +2540,7 @@ msgstr ""
 
 #: config/tc-avr.c:384 config/tc-d10v.c:314 config/tc-d30v.c:366
 #: config/tc-mips.c:9586 config/tc-mmix.c:2233 config/tc-mn10200.c:361
-#: config/tc-pj.c:357 config/tc-ppc.c:4803 config/tc-sh.c:2090
+#: config/tc-pj.c:357 config/tc-ppc.c:4803 config/tc-sh.c:2079
 #: config/tc-v850.c:1292
 msgid "bad call to md_atof"
 msgstr ""
@@ -2338,15 +2635,15 @@ msgid "only constant expression allowed"
 msgstr ""
 
 #: config/tc-avr.c:1067 config/tc-d10v.c:1498 config/tc-d30v.c:1807
-#: config/tc-mn10200.c:1240 config/tc-mn10300.c:1774 config/tc-ppc.c:5534
-#: config/tc-v850.c:2296
+#: config/tc-mn10200.c:1240 config/tc-mn10300.c:1774 config/tc-or32.c:1622
+#: config/tc-ppc.c:5534 config/tc-v850.c:2296
 #, c-format
 msgid "reloc %d not supported by object file format"
 msgstr ""
 
 #: config/tc-avr.c:1091 config/tc-d10v.c:1100 config/tc-d10v.c:1114
-#: config/tc-h8300.c:1275 config/tc-h8500.c:1088 config/tc-mcore.c:988
-#: config/tc-pj.c:266 config/tc-sh.c:1670 config/tc-z8k.c:1192
+#: config/tc-h8300.c:1283 config/tc-h8500.c:1088 config/tc-mcore.c:988
+#: config/tc-pj.c:266 config/tc-sh.c:1677 config/tc-z8k.c:1192
 msgid "can't find opcode "
 msgstr ""
 
@@ -2841,7 +3138,7 @@ msgid "Addend to unresolved symbol not on word boundary."
 msgstr ""
 
 #: config/tc-fr30.c:540 config/tc-i960.c:773 config/tc-m32r.c:1867
-#: config/tc-openrisc.c:468
+#: config/tc-openrisc.c:468 config/tc-xstormy16.c:635
 msgid "Bad call to md_atof()"
 msgstr ""
 
@@ -2873,93 +3170,94 @@ msgstr ""
 msgid "expect :8 or :16 here"
 msgstr ""
 
-#: config/tc-h8300.c:818
+#: config/tc-h8300.c:826
 #, c-format
 msgid "operand %s0x%lx out of range."
 msgstr ""
 
-#: config/tc-h8300.c:906
+#: config/tc-h8300.c:914
 msgid "Can't work out size of operand.\n"
 msgstr ""
 
-#: config/tc-h8300.c:954
+#: config/tc-h8300.c:962
 #, c-format
 msgid "Opcode `%s' with these operand types not available in H8/300 mode"
 msgstr ""
 
-#: config/tc-h8300.c:1005 config/tc-h8300.c:1025
+#: config/tc-h8300.c:1013 config/tc-h8300.c:1033
 msgid "Need #1 or #2 here"
 msgstr ""
 
-#: config/tc-h8300.c:1020
+#: config/tc-h8300.c:1028
 msgid "#4 not valid on H8/300."
 msgstr ""
 
-#: config/tc-h8300.c:1107 config/tc-h8300.c:1157
+#: config/tc-h8300.c:1115 config/tc-h8300.c:1165
 #, c-format
 msgid "branch operand has odd offset (%lx)\n"
 msgstr ""
 
-#: config/tc-h8300.c:1195
+#: config/tc-h8300.c:1203
 msgid "destination operand must be 16 bit register"
 msgstr ""
 
-#: config/tc-h8300.c:1204
+#: config/tc-h8300.c:1212
 msgid "source operand must be 8 bit register"
 msgstr ""
 
-#: config/tc-h8300.c:1212
+#: config/tc-h8300.c:1220
 msgid "destination operand must be 16bit absolute address"
 msgstr ""
 
-#: config/tc-h8300.c:1219
+#: config/tc-h8300.c:1227
 msgid "destination operand must be 8 bit register"
 msgstr ""
 
-#: config/tc-h8300.c:1227
+#: config/tc-h8300.c:1235
 msgid "source operand must be 16bit absolute address"
 msgstr ""
 
 #. This seems more sane than saying "too many operands".  We'll
 #. get here only if the trailing trash starts with a comma.
-#: config/tc-h8300.c:1235 config/tc-mmix.c:452 config/tc-mmix.c:464
+#: config/tc-h8300.c:1243 config/tc-mmix.c:452 config/tc-mmix.c:464
 #: config/tc-mmix.c:2485 config/tc-mmix.c:2509 config/tc-mmix.c:2774
+#: config/tc-or32.c:642 config/tc-or32.c:856
 msgid "invalid operands"
 msgstr ""
 
-#: config/tc-h8300.c:1286 config/tc-h8500.c:1094 config/tc-mips.c:8649
-#: config/tc-sh.c:1907 config/tc-w65.c:733 config/tc-z8k.c:1202
+#: config/tc-h8300.c:1294 config/tc-h8500.c:1094 config/tc-mips.c:8649
+#: config/tc-sh.c:1914 config/tc-w65.c:733 config/tc-z8k.c:1202
 msgid "unknown opcode"
 msgstr ""
 
-#: config/tc-h8300.c:1332
+#: config/tc-h8300.c:1340
 msgid "mismatch between opcode size and operand size"
 msgstr ""
 
-#: config/tc-h8300.c:1344 config/tc-h8500.c:1121 config/tc-sh.c:2045
+#: config/tc-h8300.c:1352 config/tc-h8500.c:1121 config/tc-sh.c:2034
 #: config/tc-w65.c:763 config/tc-z8k.c:1255
 msgid "call to tc_crawl_symbol_chain \n"
 msgstr ""
 
-#: config/tc-h8300.c:1360 config/tc-h8500.c:1135 config/tc-sh.c:2052
+#: config/tc-h8300.c:1368 config/tc-h8500.c:1135 config/tc-sh.c:2041
 #: config/tc-w65.c:777 config/tc-z8k.c:1269
 msgid "call to tc_headers_hook \n"
 msgstr ""
 
-#: config/tc-h8300.c:1452 config/tc-h8500.c:1225 config/tc-z8k.c:1383
+#: config/tc-h8300.c:1460 config/tc-h8500.c:1225 config/tc-z8k.c:1383
 msgid "call to tc_aout_fix_to_chars \n"
 msgstr ""
 
-#: config/tc-h8300.c:1466 config/tc-z8k.c:1393
+#: config/tc-h8300.c:1474 config/tc-z8k.c:1393
 msgid "call to md_convert_frag \n"
 msgstr ""
 
-#: config/tc-h8300.c:1528 config/tc-z8k.c:1479
+#: config/tc-h8300.c:1536 config/tc-z8k.c:1479
 msgid "call tomd_estimate_size_before_relax \n"
 msgstr ""
 
-#: config/tc-h8300.c:1649 config/tc-mcore.c:2413 config/tc-pj.c:572
-#: config/tc-sh.c:3367
+#: config/tc-h8300.c:1657 config/tc-mcore.c:2413 config/tc-pj.c:572
+#: config/tc-sh.c:3365
 #, c-format
 msgid "Cannot represent relocation type %s"
 msgstr ""
@@ -2992,7 +3290,7 @@ msgstr ""
 msgid "@Rn needs word register"
 msgstr ""
 
-#: config/tc-h8500.c:828 config/tc-sh.c:1403
+#: config/tc-h8500.c:828 config/tc-sh.c:1410
 #, c-format
 msgid "unhandled %d\n"
 msgstr ""
@@ -3002,12 +3300,12 @@ msgstr ""
 msgid "operand must be absolute in range %d..%d"
 msgstr ""
 
-#: config/tc-h8500.c:945 config/tc-sh.c:1610
+#: config/tc-h8500.c:945 config/tc-sh.c:1617
 #, c-format
 msgid "failed for %d\n"
 msgstr ""
 
-#: config/tc-h8500.c:1110 config/tc-sh.c:1711 config/tc-sh.c:1956
+#: config/tc-h8500.c:1110 config/tc-sh.c:1718 config/tc-sh.c:1963
 #: config/tc-w65.c:752
 msgid "invalid operands for opcode"
 msgstr ""
@@ -3425,362 +3723,362 @@ msgstr ""
 msgid "No memory for symbol name."
 msgstr ""
 
-#: config/tc-i386.c:594
+#: config/tc-i386.c:598
 #, c-format
 msgid "%s shortened to %s"
 msgstr ""
 
-#: config/tc-i386.c:649
+#: config/tc-i386.c:653
 msgid "same type of prefix used twice"
 msgstr ""
 
-#: config/tc-i386.c:667
+#: config/tc-i386.c:671
 msgid "64bit mode not supported on this CPU."
 msgstr ""
 
-#: config/tc-i386.c:671
+#: config/tc-i386.c:675
 msgid "32bit mode not supported on this CPU."
 msgstr ""
 
-#: config/tc-i386.c:704
+#: config/tc-i386.c:708
 msgid "bad argument to syntax directive."
 msgstr ""
 
-#: config/tc-i386.c:748
+#: config/tc-i386.c:752
 #, c-format
 msgid "no such architecture: `%s'"
 msgstr ""
 
-#: config/tc-i386.c:753
+#: config/tc-i386.c:757
 msgid "missing cpu architecture"
 msgstr ""
 
-#: config/tc-i386.c:767
+#: config/tc-i386.c:771
 #, c-format
 msgid "no such architecture modifier: `%s'"
 msgstr ""
 
-#: config/tc-i386.c:821 config/tc-i386.c:4628
+#: config/tc-i386.c:825 config/tc-i386.c:4632
 msgid "Unknown architecture"
 msgstr ""
 
-#: config/tc-i386.c:856 config/tc-i386.c:879 config/tc-m68k.c:3826
+#: config/tc-i386.c:860 config/tc-i386.c:883 config/tc-m68k.c:3826
 #, c-format
 msgid "Internal Error:  Can't hash %s: %s"
 msgstr ""
 
-#: config/tc-i386.c:1132
+#: config/tc-i386.c:1136
 msgid "There are no unsigned pc-relative relocations"
 msgstr ""
 
-#: config/tc-i386.c:1139 config/tc-i386.c:4827
+#: config/tc-i386.c:1143 config/tc-i386.c:4831
 #, c-format
 msgid "can not do %d byte pc-relative relocation"
 msgstr ""
 
-#: config/tc-i386.c:1156
+#: config/tc-i386.c:1160
 #, c-format
 msgid "can not do %s %d byte relocation"
 msgstr ""
 
-#: config/tc-i386.c:1263 config/tc-i386.c:1357
+#: config/tc-i386.c:1267 config/tc-i386.c:1361
 #, c-format
 msgid "no such instruction: `%s'"
 msgstr ""
 
-#: config/tc-i386.c:1273 config/tc-i386.c:1389
+#: config/tc-i386.c:1277 config/tc-i386.c:1393
 #, c-format
 msgid "invalid character %s in mnemonic"
 msgstr ""
 
-#: config/tc-i386.c:1280
+#: config/tc-i386.c:1284
 msgid "expecting prefix; got nothing"
 msgstr ""
 
-#: config/tc-i386.c:1282
+#: config/tc-i386.c:1286
 msgid "expecting mnemonic; got nothing"
 msgstr ""
 
-#: config/tc-i386.c:1300
+#: config/tc-i386.c:1304
 #, c-format
 msgid "redundant %s prefix"
 msgstr ""
 
-#: config/tc-i386.c:1398
+#: config/tc-i386.c:1402
 #, c-format
 msgid "`%s' is not supported on `%s'"
 msgstr ""
 
-#: config/tc-i386.c:1403
+#: config/tc-i386.c:1407
 msgid "use .code16 to ensure correct addressing mode"
 msgstr ""
 
-#: config/tc-i386.c:1410
+#: config/tc-i386.c:1414
 #, c-format
 msgid "expecting string instruction after `%s'"
 msgstr ""
 
-#: config/tc-i386.c:1431
+#: config/tc-i386.c:1435
 #, c-format
 msgid "invalid character %s before operand %d"
 msgstr ""
 
-#: config/tc-i386.c:1445
+#: config/tc-i386.c:1449
 #, c-format
 msgid "unbalanced parenthesis in operand %d."
 msgstr ""
 
-#: config/tc-i386.c:1448
+#: config/tc-i386.c:1452
 #, c-format
 msgid "unbalanced brackets in operand %d."
 msgstr ""
 
-#: config/tc-i386.c:1457
+#: config/tc-i386.c:1461
 #, c-format
 msgid "invalid character %s in operand %d"
 msgstr ""
 
-#: config/tc-i386.c:1484
+#: config/tc-i386.c:1488
 #, c-format
 msgid "spurious operands; (%d operands/instruction max)"
 msgstr ""
 
-#: config/tc-i386.c:1507
+#: config/tc-i386.c:1511
 msgid "expecting operand after ','; got nothing"
 msgstr ""
 
-#: config/tc-i386.c:1512
+#: config/tc-i386.c:1516
 msgid "expecting operand before ','; got nothing"
 msgstr ""
 
 #. We found no match.
-#: config/tc-i386.c:1856
+#: config/tc-i386.c:1860
 #, c-format
 msgid "suffix or operands invalid for `%s'"
 msgstr ""
 
-#: config/tc-i386.c:1867
+#: config/tc-i386.c:1871
 #, 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:1875
+#: config/tc-i386.c:1879
 #, c-format
 msgid "stand-alone `%s' prefix"
 msgstr ""
 
-#: config/tc-i386.c:1911 config/tc-i386.c:1926
+#: config/tc-i386.c:1915 config/tc-i386.c:1930
 #, c-format
 msgid "`%s' operand %d must use `%%es' segment"
 msgstr ""
 
 #. Prohibit these changes in the 64bit mode, since
 #. the lowering is more complicated.
-#: config/tc-i386.c:1999 config/tc-i386.c:2053 config/tc-i386.c:2068
-#: config/tc-i386.c:2096 config/tc-i386.c:2124
+#: config/tc-i386.c:2003 config/tc-i386.c:2057 config/tc-i386.c:2072
+#: config/tc-i386.c:2100 config/tc-i386.c:2128
 #, c-format
 msgid "Incorrect register `%%%s' used with`%c' suffix"
 msgstr ""
 
-#: config/tc-i386.c:2005 config/tc-i386.c:2058 config/tc-i386.c:2129
+#: config/tc-i386.c:2009 config/tc-i386.c:2062 config/tc-i386.c:2133
 #, c-format
 msgid "using `%%%s' instead of `%%%s' due to `%c' suffix"
 msgstr ""
 
-#: config/tc-i386.c:2021 config/tc-i386.c:2039 config/tc-i386.c:2083
-#: config/tc-i386.c:2110
+#: config/tc-i386.c:2025 config/tc-i386.c:2043 config/tc-i386.c:2087
+#: config/tc-i386.c:2114
 #, c-format
 msgid "`%%%s' not allowed with `%s%c'"
 msgstr ""
 
-#: config/tc-i386.c:2170
+#: config/tc-i386.c:2174
 msgid "no instruction mnemonic suffix given; can't determine immediate size"
 msgstr ""
 
-#: config/tc-i386.c:2196
+#: config/tc-i386.c:2200
 #, c-format
 msgid ""
 "no instruction mnemonic suffix given; can't determine immediate size %x %c"
 msgstr ""
 
-#: config/tc-i386.c:2221
+#: config/tc-i386.c:2225
 msgid ""
 "no instruction mnemonic suffix given and no register operands; can't size "
 "instruction"
 msgstr ""
 
-#: config/tc-i386.c:2269
+#: config/tc-i386.c:2273
 msgid "64bit operations available only in 64bit modes."
 msgstr ""
 
 #. Reversed arguments on faddp, fsubp, etc.
-#: config/tc-i386.c:2337
+#: config/tc-i386.c:2341
 #, c-format
 msgid "translating to `%s %%%s,%%%s'"
 msgstr ""
 
 #. Extraneous `l' suffix on fp insn.
-#: config/tc-i386.c:2344
+#: config/tc-i386.c:2348
 #, c-format
 msgid "translating to `%s %%%s'"
 msgstr ""
 
-#: config/tc-i386.c:2617
+#: config/tc-i386.c:2621
 #, c-format
 msgid "you can't `pop %%cs'"
 msgstr ""
 
 #. UnixWare fsub no args is alias for fsubp, fadd -> faddp, etc.
-#: config/tc-i386.c:2650
+#: config/tc-i386.c:2654
 #, c-format
 msgid "translating to `%sp'"
 msgstr ""
 
-#: config/tc-i386.c:2693
+#: config/tc-i386.c:2697
 #, c-format
 msgid ""
 "Can't encode registers '%%%s' in the instruction requiring REX prefix.\n"
 msgstr ""
 
-#: config/tc-i386.c:2755 config/tc-i386.c:2845 config/tc-i386.c:2881
+#: config/tc-i386.c:2759 config/tc-i386.c:2849 config/tc-i386.c:2885
 msgid "skipping prefixes on this instruction"
 msgstr ""
 
-#: config/tc-i386.c:2901
+#: config/tc-i386.c:2905
 msgid "16-bit jump out of range"
 msgstr ""
 
-#: config/tc-i386.c:2910
+#: config/tc-i386.c:2914
 #, c-format
 msgid "can't handle non absolute segment in `%s'"
 msgstr ""
 
-#: config/tc-i386.c:3217
+#: config/tc-i386.c:3221
 #, c-format
 msgid "@%s reloc is not supported in %s bit mode"
 msgstr ""
 
-#: config/tc-i386.c:3293
+#: config/tc-i386.c:3297
 msgid "only 1 or 2 immediate operands are allowed"
 msgstr ""
 
-#: config/tc-i386.c:3316 config/tc-i386.c:3504
+#: config/tc-i386.c:3320 config/tc-i386.c:3508
 #, c-format
 msgid "junk `%s' after expression"
 msgstr ""
 
 #. Missing or bad expr becomes absolute 0.
-#: config/tc-i386.c:3327
+#: config/tc-i386.c:3331
 #, c-format
 msgid "missing or invalid immediate expression `%s' taken as 0"
 msgstr ""
 
-#: config/tc-i386.c:3358 config/tc-i386.c:3565
+#: config/tc-i386.c:3362 config/tc-i386.c:3569
 #, c-format
 msgid "unimplemented segment %s in operand"
 msgstr ""
 
-#: config/tc-i386.c:3360 config/tc-i386.c:3567
+#: config/tc-i386.c:3364 config/tc-i386.c:3571
 #, c-format
 msgid "unimplemented segment type %d in operand"
 msgstr ""
 
-#: config/tc-i386.c:3404 config/tc-i386.c:5588
+#: config/tc-i386.c:3408 config/tc-i386.c:5592
 #, c-format
 msgid "expecting scale factor of 1, 2, 4, or 8: got `%s'"
 msgstr ""
 
-#: config/tc-i386.c:3411
+#: config/tc-i386.c:3415
 #, c-format
 msgid "scale factor of %d without an index register"
 msgstr ""
 
-#: config/tc-i386.c:3524
+#: config/tc-i386.c:3528
 #, c-format
 msgid "bad expression used with @%s"
 msgstr ""
 
 #. Missing or bad expr becomes absolute 0.
-#: config/tc-i386.c:3546
+#: config/tc-i386.c:3550
 #, c-format
 msgid "missing or invalid displacement expression `%s' taken as 0"
 msgstr ""
 
-#: config/tc-i386.c:3652
+#: config/tc-i386.c:3656
 #, c-format
 msgid "`%s' is not a valid base/index expression"
 msgstr ""
 
-#: config/tc-i386.c:3656
+#: config/tc-i386.c:3660
 #, c-format
 msgid "`%s' is not a valid %s bit base/index expression"
 msgstr ""
 
-#: config/tc-i386.c:3731
+#: config/tc-i386.c:3735
 #, c-format
 msgid "bad memory operand `%s'"
 msgstr ""
 
-#: config/tc-i386.c:3746
+#: config/tc-i386.c:3750
 #, c-format
 msgid "junk `%s' after register"
 msgstr ""
 
-#: config/tc-i386.c:3755 config/tc-i386.c:3870 config/tc-i386.c:3908
+#: config/tc-i386.c:3759 config/tc-i386.c:3874 config/tc-i386.c:3912
 #, c-format
 msgid "bad register name `%s'"
 msgstr ""
 
-#: config/tc-i386.c:3763
+#: config/tc-i386.c:3767
 msgid "immediate operand illegal with absolute jump"
 msgstr ""
 
-#: config/tc-i386.c:3785
+#: config/tc-i386.c:3789
 #, c-format
 msgid "too many memory references for `%s'"
 msgstr ""
 
-#: config/tc-i386.c:3863
+#: config/tc-i386.c:3867
 #, c-format
 msgid "expecting `,' or `)' after index register in `%s'"
 msgstr ""
 
-#: config/tc-i386.c:3887
+#: config/tc-i386.c:3891
 #, c-format
 msgid "expecting `)' after scale factor in `%s'"
 msgstr ""
 
-#: config/tc-i386.c:3894
+#: config/tc-i386.c:3898
 #, c-format
 msgid "expecting index register or scale factor after `,'; got '%c'"
 msgstr ""
 
-#: config/tc-i386.c:3901
+#: config/tc-i386.c:3905
 #, c-format
 msgid "expecting `,' or `)' after base register in `%s'"
 msgstr ""
 
 #. It's not a memory operand; argh!
-#: config/tc-i386.c:3942
+#: config/tc-i386.c:3946
 #, c-format
 msgid "invalid char %s beginning operand %d `%s'"
 msgstr ""
 
-#: config/tc-i386.c:4117
+#: config/tc-i386.c:4121
 msgid "long jump required"
 msgstr ""
 
-#: config/tc-i386.c:4417
+#: config/tc-i386.c:4421
 msgid "Bad call to md_atof ()"
 msgstr ""
 
-#: config/tc-i386.c:4581
+#: config/tc-i386.c:4585
 msgid "No compiled in support for x86_64"
 msgstr ""
 
-#: config/tc-i386.c:4602
+#: config/tc-i386.c:4606
 msgid ""
 "  -Q                      ignored\n"
 "  -V                      print assembler version number\n"
@@ -3789,63 +4087,63 @@ msgid ""
 "  -s                      ignored\n"
 msgstr ""
 
-#: config/tc-i386.c:4609
+#: config/tc-i386.c:4613
 msgid "  -q                      quieten some warnings\n"
 msgstr ""
 
-#: config/tc-i386.c:4710 config/tc-s390.c:1592
+#: config/tc-i386.c:4714 config/tc-s390.c:1592
 msgid "GOT already in symbol table"
 msgstr ""
 
-#: config/tc-i386.c:4842
+#: config/tc-i386.c:4846
 #, c-format
 msgid "can not do %d byte relocation"
 msgstr ""
 
-#: config/tc-i386.c:4894 config/tc-s390.c:1957
+#: config/tc-i386.c:4898 config/tc-s390.c:1957
 #, c-format
 msgid "cannot represent relocation type %s"
 msgstr ""
 
-#: config/tc-i386.c:5190
+#: config/tc-i386.c:5194
 #, c-format
 msgid "too many memory references for '%s'"
 msgstr ""
 
-#: config/tc-i386.c:5353
+#: config/tc-i386.c:5357
 #, c-format
 msgid "Unknown operand modifier `%s'\n"
 msgstr ""
 
-#: config/tc-i386.c:5560
+#: config/tc-i386.c:5564
 #, c-format
 msgid "`%s' is not a valid segment register"
 msgstr ""
 
-#: config/tc-i386.c:5570 config/tc-i386.c:5691
+#: config/tc-i386.c:5574 config/tc-i386.c:5695
 msgid "Register scaling only allowed in memory operands."
 msgstr ""
 
-#: config/tc-i386.c:5601
+#: config/tc-i386.c:5605
 msgid "Too many register references in memory operand.\n"
 msgstr ""
 
-#: config/tc-i386.c:5670
+#: config/tc-i386.c:5674
 #, c-format
 msgid "Syntax error. Expecting a constant. Got `%s'.\n"
 msgstr ""
 
-#: config/tc-i386.c:5740
+#: config/tc-i386.c:5744
 #, c-format
 msgid "Unrecognized token '%s'"
 msgstr ""
 
-#: config/tc-i386.c:5757
+#: config/tc-i386.c:5761
 #, c-format
 msgid "Unexpected token `%s'\n"
 msgstr ""
 
-#: config/tc-i386.c:5901
+#: config/tc-i386.c:5905
 #, c-format
 msgid "Unrecognized token `%s'\n"
 msgstr ""
@@ -4753,7 +5051,7 @@ msgstr ""
 msgid "Unable to produce reloc against symbol '%s'"
 msgstr ""
 
-#: config/tc-m68k.c:948 config/tc-mips.c:12429
+#: config/tc-m68k.c:948 config/tc-mips.c:12440
 #, c-format
 msgid "Cannot make %s relocation PC relative"
 msgstr ""
@@ -5435,7 +5733,7 @@ msgstr ""
 msgid "returned from mips_ip(%s) insn_opcode = 0x%x\n"
 msgstr ""
 
-#: config/tc-mips.c:2012 config/tc-mips.c:12574
+#: config/tc-mips.c:2012 config/tc-mips.c:12585
 msgid "extended instruction in delay slot"
 msgstr ""
 
@@ -5979,65 +6277,65 @@ msgstr ""
 msgid "Double check fx_r_type in tc-mips.c:tc_gen_reloc"
 msgstr ""
 
-#: config/tc-mips.c:12461 config/tc-sh.c:3218
+#: config/tc-mips.c:12472 config/tc-sh.c:3209
 #, c-format
 msgid "Can not represent %s relocation in this object file format"
 msgstr ""
 
-#: config/tc-mips.c:12800
+#: config/tc-mips.c:12811
 msgid "missing .end at end of assembly"
 msgstr ""
 
-#: config/tc-mips.c:12815
+#: config/tc-mips.c:12826
 msgid "expected simple number"
 msgstr ""
 
-#: config/tc-mips.c:12841
+#: config/tc-mips.c:12852
 #, c-format
 msgid " *input_line_pointer == '%c' 0x%02x\n"
 msgstr ""
 
-#: config/tc-mips.c:12843
+#: config/tc-mips.c:12854
 msgid "invalid number"
 msgstr ""
 
-#: config/tc-mips.c:12901
+#: config/tc-mips.c:12912
 msgid ".end not in text section"
 msgstr ""
 
-#: config/tc-mips.c:12905
+#: config/tc-mips.c:12916
 msgid ".end directive without a preceding .ent directive."
 msgstr ""
 
-#: config/tc-mips.c:12914
+#: config/tc-mips.c:12925
 msgid ".end symbol does not match .ent symbol."
 msgstr ""
 
-#: config/tc-mips.c:12917
+#: config/tc-mips.c:12928
 msgid ".end directive missing or unknown symbol"
 msgstr ""
 
-#: config/tc-mips.c:12990
+#: config/tc-mips.c:13001
 msgid ".ent or .aent not in text section."
 msgstr ""
 
-#: config/tc-mips.c:12993
+#: config/tc-mips.c:13004
 msgid "missing .end"
 msgstr ""
 
-#: config/tc-mips.c:13030 ecoff.c:3202
+#: config/tc-mips.c:13041 ecoff.c:3202
 msgid ".frame outside of .ent"
 msgstr ""
 
-#: config/tc-mips.c:13041
+#: config/tc-mips.c:13052
 msgid "Bad .frame directive"
 msgstr ""
 
-#: config/tc-mips.c:13071
+#: config/tc-mips.c:13082
 msgid ".mask/.fmask outside of .ent"
 msgstr ""
 
-#: config/tc-mips.c:13078
+#: config/tc-mips.c:13089
 msgid "Bad .mask/.fmask directive"
 msgstr ""
 
@@ -6486,6 +6784,46 @@ msgstr ""
 msgid "Cannot find relocation type for symbol %s, code %d"
 msgstr ""
 
+#: config/tc-or32.c:467 config/tc-or32.c:682
+#, c-format
+msgid "unknown opcode1: `%s'"
+msgstr ""
+
+#: config/tc-or32.c:473 config/tc-or32.c:688
+#, c-format
+msgid "unknown opcode2 `%s'."
+msgstr ""
+
+#: config/tc-or32.c:512 config/tc-or32.c:727
+#, c-format
+msgid "instruction not allowed: %s"
+msgstr ""
+
+#: config/tc-or32.c:515 config/tc-or32.c:730
+#, c-format
+msgid "too many operands: %s"
+msgstr ""
+
+#: config/tc-or32.c:605 config/tc-or32.c:821
+msgid "call/jmp target out of range (1)"
+msgstr ""
+
+#: config/tc-or32.c:1018 config/tc-or32.c:1135
+msgid "the linker will not handle this relocation correctly (1)"
+msgstr ""
+
+#: config/tc-or32.c:1027 config/tc-or32.c:1144
+msgid "call/jmp target out of range (2)"
+msgstr ""
+
+#: config/tc-or32.c:1437
+msgid "register out of range"
+msgstr ""
+
+#: config/tc-or32.c:1482
+msgid "invalid register in & expression"
+msgstr ""
+
 #: config/tc-pj.c:67 config/tc-pj.c:75
 msgid "confusing relocation expressions"
 msgstr ""
@@ -6506,8 +6844,8 @@ msgid ""
 "-big\t\t\tgenerate big endian code\n"
 msgstr ""
 
-#: config/tc-pj.c:460 config/tc-sh.c:2922 config/tc-sh.c:2929
-#: config/tc-sh.c:2936 config/tc-sh.c:2943
+#: config/tc-pj.c:460 config/tc-sh.c:2910 config/tc-sh.c:2917
+#: config/tc-sh.c:2924 config/tc-sh.c:2931
 msgid "pcrel too far"
 msgstr ""
 
@@ -6584,7 +6922,7 @@ msgstr ""
 msgid "identifier+constant@got means identifier@got+constant"
 msgstr ""
 
-#: config/tc-ppc.c:1505 config/tc-sh.c:388 config/tc-sh.c:416
+#: config/tc-ppc.c:1505
 #, c-format
 msgid "%s relocations do not fit in %d bytes\n"
 msgstr ""
@@ -6742,6 +7080,7 @@ msgid "symbol in .toc does not match any .tc"
 msgstr ""
 
 #: config/tc-ppc.c:5246 config/tc-s390.c:1797 config/tc-v850.c:2420
+#: config/tc-xstormy16.c:536
 msgid "unresolved expression that must be resolved"
 msgstr ""
 
@@ -6864,117 +7203,130 @@ msgstr ""
 msgid "unsupported relocation type"
 msgstr ""
 
-#: config/tc-sh.c:89
+#: config/tc-sh.c:91
 msgid "directive .big encountered when option -big required"
 msgstr ""
 
-#: config/tc-sh.c:100
+#: config/tc-sh.c:102
 msgid "directive .little encountered when option -little required"
 msgstr ""
 
-#: config/tc-sh.c:909
+#: config/tc-sh.c:383
+msgid "Invalid PIC expression."
+msgstr ""
+
+#: config/tc-sh.c:406 read.c:3749
+#, c-format
+msgid "unsupported BFD relocation size %u"
+msgstr ""
+
+#: config/tc-sh.c:875
+msgid "misplaced PIC operand"
+msgstr ""
+
+#: config/tc-sh.c:916
 msgid "illegal register after @-"
 msgstr ""
 
-#: config/tc-sh.c:925
+#: config/tc-sh.c:932
 msgid "must be @(r0,...)"
 msgstr ""
 
-#: config/tc-sh.c:949
+#: config/tc-sh.c:956
 msgid "syntax error in @(r0,...)"
 msgstr ""
 
-#: config/tc-sh.c:954
+#: config/tc-sh.c:961
 msgid "syntax error in @(r0...)"
 msgstr ""
 
-#: config/tc-sh.c:987 config/tc-sh.c:992
+#: config/tc-sh.c:994 config/tc-sh.c:999
 msgid "syntax error in @(disp,[Rn, gbr, pc])"
 msgstr ""
 
-#: config/tc-sh.c:997
+#: config/tc-sh.c:1004
 msgid "expecting )"
 msgstr ""
 
-#: config/tc-sh.c:1005
+#: config/tc-sh.c:1012
 msgid "illegal register after @"
 msgstr ""
 
-#: config/tc-sh.c:1553
+#: config/tc-sh.c:1560
 #, c-format
 msgid "Invalid register: 'r%d'"
 msgstr ""
 
-#: config/tc-sh.c:1716
+#: config/tc-sh.c:1723
 msgid "insn can't be combined with parallel processing insn"
 msgstr ""
 
-#: config/tc-sh.c:1723 config/tc-sh.c:1734
+#: config/tc-sh.c:1730 config/tc-sh.c:1741
 msgid "multiple movx specifications"
 msgstr ""
 
-#: config/tc-sh.c:1728 config/tc-sh.c:1755
+#: config/tc-sh.c:1735 config/tc-sh.c:1762
 msgid "multiple movy specifications"
 msgstr ""
 
-#: config/tc-sh.c:1736
+#: config/tc-sh.c:1743
 msgid "invalid movx address register"
 msgstr ""
 
-#: config/tc-sh.c:1742 config/tc-sh.c:1747
+#: config/tc-sh.c:1749 config/tc-sh.c:1754
 msgid "invalid movx dsp register"
 msgstr ""
 
-#: config/tc-sh.c:1764 config/tc-sh.c:1769
+#: config/tc-sh.c:1771 config/tc-sh.c:1776
 msgid "invalid movy dsp register"
 msgstr ""
 
-#: config/tc-sh.c:1773
+#: config/tc-sh.c:1780
 msgid "invalid movy address register"
 msgstr ""
 
-#: config/tc-sh.c:1779
+#: config/tc-sh.c:1786
 msgid "dsp immediate shift value not constant"
 msgstr ""
 
-#: config/tc-sh.c:1786 config/tc-sh.c:1799
+#: config/tc-sh.c:1793 config/tc-sh.c:1806
 msgid "multiple parallel processing specifications"
 msgstr ""
 
-#: config/tc-sh.c:1792
+#: config/tc-sh.c:1799
 msgid "multiple condition specifications"
 msgstr ""
 
-#: config/tc-sh.c:1808
+#: config/tc-sh.c:1815
 msgid "insn cannot be combined with pmuls"
 msgstr ""
 
-#: config/tc-sh.c:1825
+#: config/tc-sh.c:1832
 msgid "bad padd / psub pmuls output operand"
 msgstr ""
 
-#: config/tc-sh.c:1835
+#: config/tc-sh.c:1842
 msgid "condition not followed by conditionalizable insn"
 msgstr ""
 
-#: config/tc-sh.c:1845
+#: config/tc-sh.c:1852
 msgid "unrecognized characters at end of parallel processing insn"
 msgstr ""
 
-#: config/tc-sh.c:1961
+#: config/tc-sh.c:1968
 #, c-format
 msgid "excess operands: '%s'"
 msgstr ""
 
-#: config/tc-sh.c:2131
+#: config/tc-sh.c:2120
 msgid ".uses pseudo-op seen when not relaxing"
 msgstr ""
 
-#: config/tc-sh.c:2137
+#: config/tc-sh.c:2126
 msgid "bad .uses format"
 msgstr ""
 
-#: config/tc-sh.c:2203
+#: config/tc-sh.c:2192
 msgid ""
 "SH options:\n"
 "-little\t\t\tgenerate little endian code\n"
@@ -6984,57 +7336,57 @@ msgid ""
 "-dsp\t\t\tenable sh-dsp insns, and disable sh3e / sh4 insns.\n"
 msgstr ""
 
-#: config/tc-sh.c:2292
+#: config/tc-sh.c:2281
 msgid ".uses does not refer to a local symbol in the same section"
 msgstr ""
 
-#: config/tc-sh.c:2311
+#: config/tc-sh.c:2300
 msgid "can't find fixup pointed to by .uses"
 msgstr ""
 
-#: config/tc-sh.c:2334
+#: config/tc-sh.c:2323
 msgid ".uses target does not refer to a local symbol in the same section"
 msgstr ""
 
-#: config/tc-sh.c:2432
+#: config/tc-sh.c:2421
 msgid "displacement overflows 12-bit field"
 msgstr ""
 
-#: config/tc-sh.c:2435
+#: config/tc-sh.c:2424
 #, c-format
 msgid "displacement to defined symbol %s overflows 12-bit field"
 msgstr ""
 
-#: config/tc-sh.c:2439
+#: config/tc-sh.c:2428
 #, c-format
 msgid "displacement to undefined symbol %s overflows 12-bit field"
 msgstr ""
 
-#: config/tc-sh.c:2517
+#: config/tc-sh.c:2506
 msgid "displacement overflows 8-bit field"
 msgstr ""
 
-#: config/tc-sh.c:2520
+#: config/tc-sh.c:2509
 #, c-format
 msgid "displacement to defined symbol %s overflows 8-bit field"
 msgstr ""
 
-#: config/tc-sh.c:2524
+#: config/tc-sh.c:2513
 #, c-format
 msgid "displacement to undefined symbol %s overflows 8-bit field "
 msgstr ""
 
-#: config/tc-sh.c:2537
+#: config/tc-sh.c:2526
 #, c-format
 msgid "overflow in branch to %s; converted into longer instruction sequence"
 msgstr ""
 
-#: config/tc-sh.c:2612 config/tc-sh.c:2660 config/tc-sparc.c:4093
+#: config/tc-sh.c:2601 config/tc-sh.c:2649 config/tc-sparc.c:4093
 #: config/tc-sparc.c:4118
 msgid "misaligned data"
 msgstr ""
 
-#: config/tc-sh.c:3022
+#: config/tc-sh.c:3013
 msgid "misaligned offset"
 msgstr ""
 
@@ -7845,243 +8197,249 @@ msgstr ""
 msgid "Invalid dmad syntax '%s'"
 msgstr ""
 
-#: config/tc-tic54x.c:3707
+#: config/tc-tic54x.c:3658
+#, c-format
+msgid ""
+"Use the .mmregs directive to use memory-mapped register names such as '%s'"
+msgstr ""
+
+#: config/tc-tic54x.c:3710
 msgid "Address mode *+ARx is write-only. Results of reading are undefined."
 msgstr ""
 
-#: config/tc-tic54x.c:3727
+#: config/tc-tic54x.c:3730
 #, c-format
 msgid "Unrecognized indirect address format \"%s\""
 msgstr ""
 
-#: config/tc-tic54x.c:3762
+#: config/tc-tic54x.c:3765
 #, c-format
 msgid "Operand '%s' out of range (%d <= x <= %d)"
 msgstr ""
 
-#: config/tc-tic54x.c:3782
+#: config/tc-tic54x.c:3785
 msgid "Error in relocation handling"
 msgstr ""
 
-#: config/tc-tic54x.c:3801 config/tc-tic54x.c:3863 config/tc-tic54x.c:3889
+#: config/tc-tic54x.c:3804 config/tc-tic54x.c:3866 config/tc-tic54x.c:3892
 #, c-format
 msgid "Unrecognized condition code \"%s\""
 msgstr ""
 
-#: config/tc-tic54x.c:3818
+#: config/tc-tic54x.c:3821
 #, c-format
 msgid "Condition \"%s\" does not match preceding group"
 msgstr ""
 
-#: config/tc-tic54x.c:3826
+#: config/tc-tic54x.c:3829
 #, c-format
 msgid ""
 "Condition \"%s\" uses a different accumulator from a preceding condition"
 msgstr ""
 
-#: config/tc-tic54x.c:3833
+#: config/tc-tic54x.c:3836
 msgid "Only one comparison conditional allowed"
 msgstr ""
 
-#: config/tc-tic54x.c:3838
+#: config/tc-tic54x.c:3841
 msgid "Only one overflow conditional allowed"
 msgstr ""
 
-#: config/tc-tic54x.c:3846
+#: config/tc-tic54x.c:3849
 #, c-format
 msgid "Duplicate %s conditional"
 msgstr ""
 
-#: config/tc-tic54x.c:3876
+#: config/tc-tic54x.c:3879
 msgid "Invalid auxiliary register (use AR0-AR7)"
 msgstr ""
 
-#: config/tc-tic54x.c:3909
+#: config/tc-tic54x.c:3912
 msgid "lk addressing modes are invalid for memory-mapped register addressing"
 msgstr ""
 
-#: config/tc-tic54x.c:3917
+#: config/tc-tic54x.c:3920
 msgid ""
 "Address mode *+ARx is not allowed in memory-mapped register addressing.  "
 "Resulting behavior is undefined."
 msgstr ""
 
-#: config/tc-tic54x.c:3943
+#: config/tc-tic54x.c:3946
 msgid ""
 "Destination accumulator for each part of this parallel instruction must be "
 "different"
 msgstr ""
 
-#: config/tc-tic54x.c:3992
+#: config/tc-tic54x.c:3995
 #, c-format
 msgid "Memory mapped register \"%s\" out of range"
 msgstr ""
 
-#: config/tc-tic54x.c:4031
+#: config/tc-tic54x.c:4034
 msgid "Invalid operand (use 1, 2, or 3)"
 msgstr ""
 
-#: config/tc-tic54x.c:4056
+#: config/tc-tic54x.c:4059
 msgid "A status register or status bit name is required"
 msgstr ""
 
-#: config/tc-tic54x.c:4066
+#: config/tc-tic54x.c:4069
 #, c-format
 msgid "Unrecognized status bit \"%s\""
 msgstr ""
 
-#: config/tc-tic54x.c:4089
+#: config/tc-tic54x.c:4092
 #, c-format
 msgid "Invalid status register \"%s\""
 msgstr ""
 
-#: config/tc-tic54x.c:4101
+#: config/tc-tic54x.c:4104
 #, c-format
 msgid "Operand \"%s\" out of range (use 1 or 2)"
 msgstr ""
 
-#: config/tc-tic54x.c:4302
+#: config/tc-tic54x.c:4305
 #, c-format
 msgid "Unrecognized instruction \"%s\""
 msgstr ""
 
-#: config/tc-tic54x.c:4331
+#: config/tc-tic54x.c:4334
 #, c-format
 msgid "Unrecognized operand list '%s' for instruction '%s'"
 msgstr ""
 
-#: config/tc-tic54x.c:4360
+#: config/tc-tic54x.c:4363
 #, c-format
 msgid "Unrecognized parallel instruction \"%s\""
 msgstr ""
 
-#: config/tc-tic54x.c:4410
+#: config/tc-tic54x.c:4413
 #, c-format
 msgid "Invalid operand (s) for parallel instruction \"%s\""
 msgstr ""
 
-#: config/tc-tic54x.c:4413
+#: config/tc-tic54x.c:4416
 #, c-format
 msgid "Unrecognized parallel instruction combination \"%s || %s\""
 msgstr ""
 
-#: config/tc-tic54x.c:4645
+#: config/tc-tic54x.c:4648
 #, c-format
 msgid "%s symbol recursion stopped at second appearance of '%s'"
 msgstr ""
 
-#: config/tc-tic54x.c:4684
+#: config/tc-tic54x.c:4687
 msgid "Unrecognized substitution symbol function"
 msgstr ""
 
-#: config/tc-tic54x.c:4689
+#: config/tc-tic54x.c:4692
 msgid "Missing '(' after substitution symbol function"
 msgstr ""
 
-#: config/tc-tic54x.c:4703
+#: config/tc-tic54x.c:4706
 msgid "Expecting second argument"
 msgstr ""
 
-#: config/tc-tic54x.c:4716 config/tc-tic54x.c:4765
+#: config/tc-tic54x.c:4719 config/tc-tic54x.c:4768
 msgid "Extra junk in function call, expecting ')'"
 msgstr ""
 
-#: config/tc-tic54x.c:4741
+#: config/tc-tic54x.c:4744
 msgid "Function expects two arguments"
 msgstr ""
 
-#: config/tc-tic54x.c:4754
+#: config/tc-tic54x.c:4757
 msgid "Expecting character constant argument"
 msgstr ""
 
-#: config/tc-tic54x.c:4760
+#: config/tc-tic54x.c:4763
 msgid "Both arguments must be substitution symbols"
 msgstr ""
 
-#: config/tc-tic54x.c:4813
+#: config/tc-tic54x.c:4816
 #, c-format
 msgid "Invalid subscript (use 1 to %d)"
 msgstr ""
 
-#: config/tc-tic54x.c:4823
+#: config/tc-tic54x.c:4826
 #, c-format
 msgid "Invalid length (use 0 to %d"
 msgstr ""
 
-#: config/tc-tic54x.c:4833
+#: config/tc-tic54x.c:4836
 msgid "Missing ')' in subscripted substitution symbol expression"
 msgstr ""
 
-#: config/tc-tic54x.c:4853
+#: config/tc-tic54x.c:4856
 msgid "Missing forced substitution terminator ':'"
 msgstr ""
 
-#: config/tc-tic54x.c:5026
+#: config/tc-tic54x.c:5029
 #, c-format
 msgid ""
 "Instruction does not fit in available delay slots (%d-word insn, %d slots "
 "left)"
 msgstr ""
 
-#: config/tc-tic54x.c:5067
+#: config/tc-tic54x.c:5070
 #, c-format
 msgid "Unrecognized parallel instruction '%s'"
 msgstr ""
 
-#: config/tc-tic54x.c:5079
+#: config/tc-tic54x.c:5082
 #, c-format
 msgid "Instruction '%s' requires an LP cpu version"
 msgstr ""
 
-#: config/tc-tic54x.c:5086
+#: config/tc-tic54x.c:5089
 #, c-format
 msgid "Instruction '%s' requires far mode addressing"
 msgstr ""
 
-#: config/tc-tic54x.c:5098
+#: config/tc-tic54x.c:5101
 #, 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:5108
+#: config/tc-tic54x.c:5111
 msgid ""
 "Instructions which cause PC discontinuity are not allowed in a delay slot. "
 "Resulting behavior is undefined."
 msgstr ""
 
-#: config/tc-tic54x.c:5119
+#: config/tc-tic54x.c:5122
 #, c-format
 msgid "'%s' is not repeatable. Resulting behavior is undefined."
 msgstr ""
 
-#: config/tc-tic54x.c:5123
+#: config/tc-tic54x.c:5126
 msgid ""
 "Instructions using long offset modifiers or absolute addresses are not "
 "repeatable. Resulting behavior is undefined."
 msgstr ""
 
-#: config/tc-tic54x.c:5314
+#: config/tc-tic54x.c:5317
 #, c-format
 msgid "Unsupported relocation size %d"
 msgstr ""
 
-#: config/tc-tic54x.c:5468
+#: config/tc-tic54x.c:5471
 msgid "non-absolute value used with .space/.bes"
 msgstr ""
 
-#: config/tc-tic54x.c:5472
+#: config/tc-tic54x.c:5475
 #, c-format
 msgid "negative value ignored in %s"
 msgstr ""
 
-#: config/tc-tic54x.c:5559
+#: config/tc-tic54x.c:5562
 #, c-format
 msgid "attempt to .space/.bes backwards? (%ld)"
 msgstr ""
 
-#: config/tc-tic54x.c:5592
+#: config/tc-tic54x.c:5595
 #, c-format
 msgid "Invalid label '%s'"
 msgstr ""
@@ -8525,6 +8883,15 @@ msgstr ""
 msgid "call to tc_Nout_fix_to_chars \n"
 msgstr ""
 
+#: config/tc-xstormy16.c:80
+msgid " XSTORMY16 specific command line options:\n"
+msgstr ""
+
+#: config/tc-xstormy16.c:561
+#, c-format
+msgid "internal error: can't install fix for reloc type %d (`%s')"
+msgstr ""
+
 #: config/tc-z8k.c:285
 #, c-format
 msgid "register rr%d, out of range."
@@ -9681,11 +10048,6 @@ msgstr ""
 msgid "bignum truncated to %d bytes"
 msgstr ""
 
-#: read.c:3749
-#, c-format
-msgid "unsupported BFD relocation size %u"
-msgstr ""
-
 #: read.c:3839
 msgid "using a bit field width of zero"
 msgstr ""